From eeb2c0454a5de477af1403bd5a506aa411c9e562 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 17 Mar 2016 15:51:36 +0100 Subject: [PATCH 01/89] Build volume now uses linecount for disallowed areas CURA-1152 --- cura/BuildVolume.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/BuildVolume.py b/cura/BuildVolume.py index e9b90e3a61..8750cbe03f 100644 --- a/cura/BuildVolume.py +++ b/cura/BuildVolume.py @@ -259,7 +259,7 @@ class BuildVolume(SceneNode): skirt_line_count = profile.getSettingValue("skirt_line_count") skirt_size = skirt_distance + (skirt_line_count * profile.getSettingValue("skirt_line_width")) elif adhesion_type == "brim": - skirt_size = profile.getSettingValue("brim_width") + skirt_size = profile.getSettingValue("brim_line_count") * profile.getSettingValue("skirt_line_width") elif adhesion_type == "raft": skirt_size = profile.getSettingValue("raft_margin") From 745bc8051a07230a6999f7d34d49487c2d866cc1 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Thu, 17 Mar 2016 16:29:19 +0100 Subject: [PATCH 02/89] Fix generic material profiles Makes sure that the generic PLA material profile has all the same settings as the ABS and CPE settings, so a printer that uses the non-printer-specific material profiles can switch back to the proper settings for PLA when they are merged into the current settings. CURA-1188 --- resources/profiles/materials/abs.cfg | 2 +- resources/profiles/materials/cpe.cfg | 2 +- resources/profiles/materials/pla.cfg | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/resources/profiles/materials/abs.cfg b/resources/profiles/materials/abs.cfg index 89095c0024..9b797a4da5 100644 --- a/resources/profiles/materials/abs.cfg +++ b/resources/profiles/materials/abs.cfg @@ -5,7 +5,7 @@ name = ABS [settings] material_bed_temperature = 100 -platform_adhesion = brim +adhesion_type = brim material_flow = 107 material_print_temperature = 250 cool_fan_speed = 50 diff --git a/resources/profiles/materials/cpe.cfg b/resources/profiles/materials/cpe.cfg index 431a6d38d7..fc0293b64e 100644 --- a/resources/profiles/materials/cpe.cfg +++ b/resources/profiles/materials/cpe.cfg @@ -5,7 +5,7 @@ name = CPE [settings] material_bed_temperature = 60 -platform_adhesion = brim +adhesion_type = brim material_flow = 100 material_print_temperature = 250 cool_fan_speed = 50 diff --git a/resources/profiles/materials/pla.cfg b/resources/profiles/materials/pla.cfg index 86fc696741..e490b05bbe 100644 --- a/resources/profiles/materials/pla.cfg +++ b/resources/profiles/materials/pla.cfg @@ -5,5 +5,8 @@ name = PLA [settings] material_bed_temperature = 60 +adhesion_type = skirt material_flow = 100 -material_print_temperature = 210 \ No newline at end of file +material_print_temperature = 210 +cool_fan_speed = 100 +cool_fan_speed_max = 100 From 46bf7e440e99112879c44302e68ce1584fa66122 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 18 Mar 2016 12:00:10 +0100 Subject: [PATCH 03/89] Added more logging & removed duplicate slicing canceled signals CURA-1133 --- plugins/CuraEngineBackend/CuraEngineBackend.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/CuraEngineBackend/CuraEngineBackend.py b/plugins/CuraEngineBackend/CuraEngineBackend.py index 38c2576704..ed73f0ad93 100644 --- a/plugins/CuraEngineBackend/CuraEngineBackend.py +++ b/plugins/CuraEngineBackend/CuraEngineBackend.py @@ -110,6 +110,7 @@ class CuraEngineBackend(Backend): ## Perform a slice of the scene. def slice(self): + if not self._enabled: return @@ -120,7 +121,6 @@ class CuraEngineBackend(Backend): self._message.hide() self._message = None - self.slicingCancelled.emit() return if self._process_layers_job: @@ -156,6 +156,7 @@ class CuraEngineBackend(Backend): self._slicing = False self._restart = True self.slicingCancelled.emit() + Logger.log("d", "Attempting to kill the engine process") if self._process is not None: Logger.log("d", "Killing engine process") try: @@ -283,9 +284,9 @@ class CuraEngineBackend(Backend): def _onInstanceChanged(self): self._terminate() - self.slicingCancelled.emit() def _onBackendQuit(self): if not self._restart and self._process: + Logger.log("d", "Backend quitted. Resetting process and socket.") self._process = None self._createSocket() From 834e2148d2f70530fab795df1eb0e6fd4e4d1e6c Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 18 Mar 2016 14:18:19 +0100 Subject: [PATCH 04/89] Major cleanup for profiles This removes a bunch of settings that override default values from machine defaults (or inheritance) --- resources/machines/fdmprinter.json | 3 +-- resources/profiles/general/High+Quality.cfg | 1 - resources/profiles/general/Normal+Quality.cfg | 4 +--- resources/profiles/general/Ulti+Quality.cfg | 4 +--- resources/profiles/materials/abs.cfg | 2 -- resources/profiles/materials/cpe.cfg | 4 ---- resources/profiles/materials/pla.cfg | 6 ------ resources/profiles/ultimaker2+/abs_0.25_normal.curaprofile | 1 - resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile | 2 -- resources/profiles/ultimaker2+/abs_0.4_high.curaprofile | 2 -- resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile | 2 -- resources/profiles/ultimaker2+/abs_0.6_normal.curaprofile | 1 - resources/profiles/ultimaker2+/abs_0.8_normal.curaprofile | 1 - resources/profiles/ultimaker2+/cpe_0.25_normal.curaprofile | 1 - resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile | 1 - resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile | 1 - resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile | 1 - resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile | 1 - resources/profiles/ultimaker2+/cpe_0.8_normal.curaprofile | 1 - resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile | 3 --- resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile | 5 ----- resources/profiles/ultimaker2+/pla_0.4_high.curaprofile | 6 +----- resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile | 5 ----- resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile | 4 ---- resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile | 4 ---- resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile | 4 ---- .../profiles/ultimaker2_olsson/0.25_normal.curaprofile | 3 --- resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile | 5 ----- resources/profiles/ultimaker2_olsson/0.4_high.curaprofile | 4 ---- .../profiles/ultimaker2_olsson/0.4_normal.curaprofile | 7 +------ resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile | 4 ---- .../profiles/ultimaker2_olsson/0.6_normal.curaprofile | 6 +----- .../profiles/ultimaker2_olsson/0.8_normal.curaprofile | 3 --- 33 files changed, 6 insertions(+), 96 deletions(-) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index 367b2c9aa0..7a150864f1 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -1552,8 +1552,7 @@ "brim": "Brim", "raft": "Raft" }, - "default": "skirt", - "inherit_function": "\"skirt\" if machine_heated_bed else \"brim\"", + "default": "brim", "global_only": "True" }, "skirt_line_count": { diff --git a/resources/profiles/general/High+Quality.cfg b/resources/profiles/general/High+Quality.cfg index d3545b04cf..a006c7a995 100644 --- a/resources/profiles/general/High+Quality.cfg +++ b/resources/profiles/general/High+Quality.cfg @@ -5,7 +5,6 @@ weight = -3 [settings] layer_height = 0.06 -speed_wall_0 = 30 speed_topbottom = 15 speed_infill = 80 diff --git a/resources/profiles/general/Normal+Quality.cfg b/resources/profiles/general/Normal+Quality.cfg index 695eb77b91..575c3343e2 100644 --- a/resources/profiles/general/Normal+Quality.cfg +++ b/resources/profiles/general/Normal+Quality.cfg @@ -4,7 +4,5 @@ name = Normal Quality weight = -2 [settings] -speed_wall_0 = 30 speed_topbottom = 15 -speed_infill = 80 - +speed_infill = 80 \ No newline at end of file diff --git a/resources/profiles/general/Ulti+Quality.cfg b/resources/profiles/general/Ulti+Quality.cfg index d0c17514c6..1fa9b6085c 100644 --- a/resources/profiles/general/Ulti+Quality.cfg +++ b/resources/profiles/general/Ulti+Quality.cfg @@ -5,7 +5,5 @@ weight = -4 [settings] layer_height = 0.04 -speed_wall_0 = 30 speed_topbottom = 15 -speed_infill = 80 - +speed_infill = 80 \ No newline at end of file diff --git a/resources/profiles/materials/abs.cfg b/resources/profiles/materials/abs.cfg index 9b797a4da5..3d05d7003a 100644 --- a/resources/profiles/materials/abs.cfg +++ b/resources/profiles/materials/abs.cfg @@ -5,8 +5,6 @@ name = ABS [settings] material_bed_temperature = 100 -adhesion_type = brim material_flow = 107 material_print_temperature = 250 cool_fan_speed = 50 -cool_fan_speed_max = 50 diff --git a/resources/profiles/materials/cpe.cfg b/resources/profiles/materials/cpe.cfg index fc0293b64e..3f1b33d74a 100644 --- a/resources/profiles/materials/cpe.cfg +++ b/resources/profiles/materials/cpe.cfg @@ -4,9 +4,5 @@ type = material name = CPE [settings] -material_bed_temperature = 60 -adhesion_type = brim -material_flow = 100 material_print_temperature = 250 cool_fan_speed = 50 -cool_fan_speed_max = 50 diff --git a/resources/profiles/materials/pla.cfg b/resources/profiles/materials/pla.cfg index e490b05bbe..8aead264d8 100644 --- a/resources/profiles/materials/pla.cfg +++ b/resources/profiles/materials/pla.cfg @@ -4,9 +4,3 @@ type = material name = PLA [settings] -material_bed_temperature = 60 -adhesion_type = skirt -material_flow = 100 -material_print_temperature = 210 -cool_fan_speed = 100 -cool_fan_speed_max = 100 diff --git a/resources/profiles/ultimaker2+/abs_0.25_normal.curaprofile b/resources/profiles/ultimaker2+/abs_0.25_normal.curaprofile index f866a78955..e248b71b98 100644 --- a/resources/profiles/ultimaker2+/abs_0.25_normal.curaprofile +++ b/resources/profiles/ultimaker2+/abs_0.25_normal.curaprofile @@ -14,7 +14,6 @@ speed_wall_x = 25 wall_thickness = 0.88 speed_infill = 30 speed_topbottom = 20 -adhesion_type = brim speed_print = 20 cool_min_speed = 25 line_width = 0.22 diff --git a/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile b/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile index 63c6986b1e..ad2e1fce75 100644 --- a/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile +++ b/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile @@ -11,7 +11,6 @@ layer_height = 0.15 top_bottom_thickness = 0.75 layer_height_0 = 0.26 speed_print = 40 -speed_wall_x = 40 wall_thickness = 0.7 speed_infill = 55 speed_topbottom = 30 @@ -21,7 +20,6 @@ line_width = 0.35 infill_sparse_density = 18 speed_travel = 150 speed_wall_0 = 30 -adhesion_type = brim cool_lift_head = True cool_fan_speed_min = 50 diff --git a/resources/profiles/ultimaker2+/abs_0.4_high.curaprofile b/resources/profiles/ultimaker2+/abs_0.4_high.curaprofile index 1702f31bae..e76ca76b51 100644 --- a/resources/profiles/ultimaker2+/abs_0.4_high.curaprofile +++ b/resources/profiles/ultimaker2+/abs_0.4_high.curaprofile @@ -11,11 +11,9 @@ layer_height = 0.06 top_bottom_thickness = 0.72 layer_height_0 = 0.26 speed_print = 30 -speed_wall_x = 30 wall_thickness = 1.05 speed_infill = 45 speed_topbottom = 20 -adhesion_type = brim cool_min_speed = 20 line_width = 0.35 infill_sparse_density = 22 diff --git a/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile b/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile index fbe21d3d03..9fc4ab5be0 100644 --- a/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile +++ b/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile @@ -9,7 +9,6 @@ weight = -2 [settings] layer_height_0 = 0.26 speed_print = 30 -speed_wall_x = 30 wall_thickness = 1.05 speed_infill = 45 speed_topbottom = 20 @@ -17,7 +16,6 @@ cool_min_layer_time = 3 cool_min_speed = 20 line_width = 0.35 speed_wall_0 = 20 -adhesion_type = brim cool_lift_head = True cool_fan_speed_min = 50 diff --git a/resources/profiles/ultimaker2+/abs_0.6_normal.curaprofile b/resources/profiles/ultimaker2+/abs_0.6_normal.curaprofile index 577c9fa2cd..182f4484c2 100644 --- a/resources/profiles/ultimaker2+/abs_0.6_normal.curaprofile +++ b/resources/profiles/ultimaker2+/abs_0.6_normal.curaprofile @@ -15,7 +15,6 @@ speed_wall_x = 30 wall_thickness = 1.59 speed_infill = 55 speed_topbottom = 20 -adhesion_type = brim cool_min_speed = 20 line_width = 0.53 speed_wall_0 = 20 diff --git a/resources/profiles/ultimaker2+/abs_0.8_normal.curaprofile b/resources/profiles/ultimaker2+/abs_0.8_normal.curaprofile index c080959bac..4bb0fd6ad8 100644 --- a/resources/profiles/ultimaker2+/abs_0.8_normal.curaprofile +++ b/resources/profiles/ultimaker2+/abs_0.8_normal.curaprofile @@ -15,7 +15,6 @@ speed_wall_x = 30 wall_thickness = 2.1 speed_infill = 40 speed_topbottom = 20 -adhesion_type = brim cool_min_speed = 15 line_width = 0.7 speed_wall_0 = 20 diff --git a/resources/profiles/ultimaker2+/cpe_0.25_normal.curaprofile b/resources/profiles/ultimaker2+/cpe_0.25_normal.curaprofile index caa93fd12d..1e597f0720 100644 --- a/resources/profiles/ultimaker2+/cpe_0.25_normal.curaprofile +++ b/resources/profiles/ultimaker2+/cpe_0.25_normal.curaprofile @@ -20,7 +20,6 @@ speed_print = 20 line_width = 0.22 infill_sparse_density = 22 speed_wall_0 = 20 -adhesion_type = brim cool_lift_head = True cool_fan_speed_min = 50 diff --git a/resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile b/resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile index 3888f94f2d..950c0040f1 100644 --- a/resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile +++ b/resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile @@ -21,7 +21,6 @@ speed_travel = 150 line_width = 0.35 infill_sparse_density = 18 speed_wall_0 = 30 -adhesion_type = brim cool_lift_head = True cool_fan_speed_min = 50 diff --git a/resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile b/resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile index b198012a62..de2fb2bf2d 100644 --- a/resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile +++ b/resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile @@ -15,7 +15,6 @@ speed_wall_x = 30 wall_thickness = 1.05 speed_infill = 45 speed_topbottom = 20 -adhesion_type = brim line_width = 0.35 infill_sparse_density = 22 speed_wall_0 = 20 diff --git a/resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile b/resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile index d220adde83..2b93010a90 100644 --- a/resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile +++ b/resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile @@ -16,7 +16,6 @@ speed_topbottom = 20 cool_min_layer_time = 3 line_width = 0.35 speed_wall_0 = 20 -adhesion_type = brim cool_lift_head = True cool_fan_speed_min = 50 diff --git a/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile b/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile index bb395b3715..27f72e5d1c 100644 --- a/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile +++ b/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile @@ -19,7 +19,6 @@ cool_min_layer_time = 3 speed_print = 20 line_width = 0.53 speed_wall_0 = 20 -adhesion_type = brim cool_lift_head = True cool_fan_speed_min = 50 diff --git a/resources/profiles/ultimaker2+/cpe_0.8_normal.curaprofile b/resources/profiles/ultimaker2+/cpe_0.8_normal.curaprofile index 583b2a65b9..a043d9270b 100644 --- a/resources/profiles/ultimaker2+/cpe_0.8_normal.curaprofile +++ b/resources/profiles/ultimaker2+/cpe_0.8_normal.curaprofile @@ -19,7 +19,6 @@ cool_min_layer_time = 3 speed_print = 20 line_width = 0.7 speed_wall_0 = 20 -adhesion_type = brim cool_lift_head = True cool_fan_speed_min = 50 diff --git a/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile index ae42cea8d9..13790826e9 100644 --- a/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile @@ -12,7 +12,6 @@ layer_height = 0.06 layer_height_0 = 0.15 shell_thickness = 0.88 top_bottom_thickness = 0.72 -top_bottom_pattern = lines infill_sparse_density = 22 infill_wipe_dist = 0.1 retraction_amount = 6 @@ -23,9 +22,7 @@ speed_wall_0 = 20 speed_wall_x = 25 speed_topbottom = 20 speed_layer_0 = 25 -skirt_speed = 25 speed_slowdown_layers = 2 travel_avoid_distance = 1 cool_fan_full_layer = 2 cool_min_layer_time_fan_speed_max = 15 -adhesion_type = brim diff --git a/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile index 53882bc066..8360656d0e 100644 --- a/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile @@ -12,21 +12,16 @@ layer_height = 0.15 layer_height_0 = 0.26 shell_thickness = 0.7 top_bottom_thickness = 0.6 -top_bottom_pattern = lines infill_sparse_density = 18 infill_wipe_dist = 0.2 retraction_amount = 5.5 retraction_min_travel = 0.5 retraction_count_max = 30 -speed_infill = 60 speed_wall_0 = 40 speed_wall_x = 50 -speed_topbottom = 30 speed_travel = 150 speed_layer_0 = 25 -skirt_speed = 25 speed_slowdown_layers = 2 travel_avoid_distance = 1 cool_fan_full_layer = 2 cool_min_layer_time_fan_speed_max = 15 -adhesion_type = brim diff --git a/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile index 9b01eafac6..24f0a98c13 100644 --- a/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile @@ -12,20 +12,16 @@ layer_height = 0.06 layer_height_0 = 0.26 shell_thickness = 1.05 top_bottom_thickness = 0.84 -top_bottom_pattern = lines infill_sparse_density = 22 infill_wipe_dist = 0.2 retraction_amount = 5.5 retraction_min_travel = 0.5 retraction_count_max = 30 speed_infill = 50 -speed_wall_0 = 30 speed_wall_x = 40 speed_topbottom = 20 speed_layer_0 = 25 -skirt_speed = 25 speed_slowdown_layers = 2 travel_avoid_distance = 1 cool_fan_full_layer = 2 -cool_min_layer_time_fan_speed_max = 15 -adhesion_type = brim \ No newline at end of file +cool_min_layer_time_fan_speed_max = 15 \ No newline at end of file diff --git a/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile index 40dd7f734e..70027b68b0 100644 --- a/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile @@ -12,20 +12,15 @@ layer_height = 0.1 layer_height_0 = 0.26 shell_thickness = 1.05 top_bottom_thickness = 0.8 -top_bottom_pattern = lines -infill_sparse_density = 20 infill_wipe_dist = 0.2 retraction_amount = 5.5 retraction_min_travel = 0.5 retraction_count_max = 30 speed_infill = 50 -speed_wall_0 = 30 speed_wall_x = 40 speed_topbottom = 20 speed_layer_0 = 25 -skirt_speed = 25 speed_slowdown_layers = 2 travel_avoid_distance = 1 cool_fan_full_layer = 2 cool_min_layer_time_fan_speed_max = 15 -adhesion_type = brim diff --git a/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile index 74b4bc0194..416b85f798 100644 --- a/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile @@ -12,7 +12,6 @@ layer_height = 0.04 layer_height_0 = 0.26 shell_thickness = 1.4 top_bottom_thickness = 1.12 -top_bottom_pattern = lines infill_sparse_density = 25 infill_wipe_dist = 0.2 retraction_amount = 5.5 @@ -20,13 +19,10 @@ retraction_min_travel = 0.5 retraction_count_max = 30 retraction_extrusion_window = 6 speed_infill = 50 -speed_wall_0 = 30 speed_wall_x = 40 speed_topbottom = 20 speed_layer_0 = 25 -skirt_speed = 25 speed_slowdown_layers = 2 travel_avoid_distance = 1 cool_fan_full_layer = 2 cool_min_layer_time_fan_speed_max = 15 -adhesion_type = brim diff --git a/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile index 2ad0960d5f..5edaffb80e 100644 --- a/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile @@ -12,8 +12,6 @@ layer_height = 0.15 layer_height_0 = 0.4 shell_thickness = 1.59 top_bottom_thickness = 1.2 -top_bottom_pattern = lines -infill_sparse_density = 20 infill_wipe_dist = 0.3 retraction_amount = 6 retraction_min_travel = 0.5 @@ -23,9 +21,7 @@ speed_wall_0 = 25 speed_wall_x = 40 speed_topbottom = 20 speed_layer_0 = 25 -skirt_speed = 25 speed_slowdown_layers = 2 travel_avoid_distance = 1.2 cool_fan_full_layer = 2 cool_min_layer_time_fan_speed_max = 20 -adhesion_type = brim diff --git a/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile index 7ea019917d..068c11713c 100644 --- a/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile @@ -12,8 +12,6 @@ layer_height = 0.2 layer_height_0 = 0.5 shell_thickness = 2.1 top_bottom_thickness = 1.6 -top_bottom_pattern = lines -infill_sparse_density = 20 infill_wipe_dist = 0.4 retraction_amount = 6 retraction_min_travel = 0.5 @@ -23,9 +21,7 @@ speed_wall_0 = 20 speed_wall_x = 30 speed_topbottom = 20 speed_layer_0 = 25 -skirt_speed = 25 speed_slowdown_layers = 2 travel_avoid_distance = 1.6 cool_fan_full_layer = 2 cool_min_layer_time_fan_speed_max = 25 -adhesion_type = brim diff --git a/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile index a26b2b8ff1..83aa6b2f4b 100644 --- a/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile @@ -11,7 +11,6 @@ layer_height = 0.06 layer_height_0 = 0.15 shell_thickness = 0.88 top_bottom_thickness = 0.72 -top_bottom_pattern = lines infill_sparse_density = 22 infill_overlap = 0.022 infill_wipe_dist = 0.1 @@ -24,9 +23,7 @@ speed_wall_0 = 20 speed_wall_x = 25 speed_topbottom = 20 speed_layer_0 = 25 -skirt_speed = 25 speed_slowdown_layers = 2 travel_avoid_distance = 1 cool_fan_full_layer = 2 cool_min_layer_time_fan_speed_max = 15 -adhesion_type = brim diff --git a/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile index 10cbcfd81c..e98cb44a55 100644 --- a/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile @@ -11,7 +11,6 @@ layer_height = 0.15 layer_height_0 = 0.26 shell_thickness = 0.7 top_bottom_thickness = 0.6 -top_bottom_pattern = lines infill_sparse_density = 18 infill_overlap = 0.035 infill_wipe_dist = 0.2 @@ -19,15 +18,11 @@ retraction_amount = 5.5 retraction_min_travel = 0.5 retraction_count_max = 30 retraction_extrusion_window = 6 -speed_infill = 60 speed_wall_0 = 40 speed_wall_x = 50 -speed_topbottom = 30 speed_travel = 150 speed_layer_0 = 25 -skirt_speed = 25 speed_slowdown_layers = 2 travel_avoid_distance = 1 cool_fan_full_layer = 2 cool_min_layer_time_fan_speed_max = 15 -adhesion_type = brim diff --git a/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile index cf9bead793..07266a20e6 100644 --- a/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile @@ -11,7 +11,6 @@ layer_height = 0.06 layer_height_0 = 0.26 shell_thickness = 1.05 top_bottom_thickness = 0.84 -top_bottom_pattern = lines infill_sparse_density = 22 infill_overlap = 0.035 infill_wipe_dist = 0.2 @@ -20,13 +19,10 @@ retraction_min_travel = 0.5 retraction_count_max = 30 retraction_extrusion_window = 6 speed_infill = 50 -speed_wall_0 = 30 speed_wall_x = 40 speed_topbottom = 20 speed_layer_0 = 25 -skirt_speed = 25 speed_slowdown_layers = 2 travel_avoid_distance = 1 cool_fan_full_layer = 2 cool_min_layer_time_fan_speed_max = 15 -adhesion_type = brim diff --git a/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile index 8e0d93fb6a..b57fa02fb7 100644 --- a/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile @@ -11,8 +11,6 @@ layer_height = 0.1 layer_height_0 = 0.26 shell_thickness = 1.05 top_bottom_thickness = 0.8 -top_bottom_pattern = lines -infill_sparse_density = 20 infill_overlap = 0.035 infill_wipe_dist = 0.2 retraction_amount = 5.5 @@ -20,13 +18,10 @@ retraction_min_travel = 0.5 retraction_count_max = 30 retraction_extrusion_window = 6 speed_infill = 50 -speed_wall_0 = 30 speed_wall_x = 40 speed_topbottom = 20 speed_layer_0 = 25 -skirt_speed = 25 speed_slowdown_layers = 2 travel_avoid_distance = 1 cool_fan_full_layer = 2 -cool_min_layer_time_fan_speed_max = 15 -adhesion_type = brim +cool_min_layer_time_fan_speed_max = 15 \ No newline at end of file diff --git a/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile index 4f30644b3b..825869e547 100644 --- a/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile @@ -11,7 +11,6 @@ layer_height = 0.04 layer_height_0 = 0.26 shell_thickness = 1.4 top_bottom_thickness = 1.12 -top_bottom_pattern = lines infill_sparse_density = 25 infill_overlap = 0.035 infill_wipe_dist = 0.2 @@ -20,13 +19,10 @@ retraction_min_travel = 0.5 retraction_count_max = 30 retraction_extrusion_window = 6 speed_infill = 50 -speed_wall_0 = 30 speed_wall_x = 40 speed_topbottom = 20 speed_layer_0 = 25 -skirt_speed = 25 speed_slowdown_layers = 2 travel_avoid_distance = 1 cool_fan_full_layer = 2 cool_min_layer_time_fan_speed_max = 15 -adhesion_type = brim diff --git a/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile index b07dcf0847..406994fb3d 100644 --- a/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile @@ -11,8 +11,6 @@ layer_height = 0.15 layer_height_0 = 0.4 shell_thickness = 1.59 top_bottom_thickness = 1.2 -top_bottom_pattern = lines -infill_sparse_density = 20 infill_overlap = 0.053 infill_wipe_dist = 0.3 retraction_amount = 6 @@ -24,9 +22,7 @@ speed_wall_0 = 25 speed_wall_x = 40 speed_topbottom = 20 speed_layer_0 = 25 -skirt_speed = 25 speed_slowdown_layers = 2 travel_avoid_distance = 1.2 cool_fan_full_layer = 2 -cool_min_layer_time_fan_speed_max = 20 -adhesion_type = brim +cool_min_layer_time_fan_speed_max = 20 \ No newline at end of file diff --git a/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile index 54f7c960b5..32dc0f48e4 100644 --- a/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile @@ -11,7 +11,6 @@ layer_height = 0.2 layer_height_0 = 0.5 shell_thickness = 2.1 top_bottom_thickness = 1.6 -top_bottom_pattern = lines infill_sparse_density = 20 infill_overlap = 0.07 infill_wipe_dist = 0.4 @@ -24,9 +23,7 @@ speed_wall_0 = 20 speed_wall_x = 30 speed_topbottom = 20 speed_layer_0 = 25 -skirt_speed = 25 speed_slowdown_layers = 2 travel_avoid_distance = 1.6 cool_fan_full_layer = 2 cool_min_layer_time_fan_speed_max = 25 -adhesion_type = brim From 235f324d566d2eff206e6f9d02b0dd93642924f0 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 21 Mar 2016 11:12:00 +0100 Subject: [PATCH 05/89] Added missing enabled parameters --- resources/machines/fdmprinter.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index 7a150864f1..bea07c07fe 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -1336,7 +1336,7 @@ "max_value_warning": "100.0", "type": "float", "visible": false, - "enabled": "support_enable" + "enabled": "support_conical_enabled and support_enable" }, "support_bottom_stair_step_height": { "label": "Stair Step Height", @@ -1483,7 +1483,7 @@ "max_value": "90", "default": 65, "visible": false, - "enabled": "support_enable" + "enabled": "support_enable and support_use_towers" }, "support_pattern": { "label": "Pattern", From ec062269070bc3b25d813dc51f682672712739da Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Mon, 21 Mar 2016 14:16:37 +0100 Subject: [PATCH 06/89] quickfix for fan full at height --- resources/machines/fdmprinter.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index bea07c07fe..93b66694bd 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -1132,7 +1132,7 @@ "min_value": "0", "max_value_warning": "100", "visible": false, - "inherit_function": "int((parent_value - layer_height_0 + 0.001) / layer_height)", + "inherit_function": "int((parent_value - layer_height_0 + 0.001) / layer_height) + 1", "global_only": "True" } } From 3ecd746f21cf340956180897ce08d5edcf1e965d Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 21 Mar 2016 15:36:07 +0100 Subject: [PATCH 07/89] Added even more logging CURA-1133 --- plugins/CuraEngineBackend/CuraEngineBackend.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/CuraEngineBackend/CuraEngineBackend.py b/plugins/CuraEngineBackend/CuraEngineBackend.py index ed73f0ad93..b3ea28e62f 100644 --- a/plugins/CuraEngineBackend/CuraEngineBackend.py +++ b/plugins/CuraEngineBackend/CuraEngineBackend.py @@ -162,8 +162,8 @@ class CuraEngineBackend(Backend): try: self._process.terminate() self._process = None - except: # terminating a process that is already terminating causes an exception, silently ignore this. - pass + except Exception as e: # terminating a process that is already terminating causes an exception, silently ignore this. + Logger.log("d", "Exception occured while trying to kill the engine %s", str(e)) Logger.log("d", "Engine process is killed") def _onStartSliceCompleted(self, job): From 174f150eadb657cf5c21a2d4e5e3dd0f64ecc7e2 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 21 Mar 2016 15:44:27 +0100 Subject: [PATCH 08/89] Error now also causes terminate to be called CURA-1133 --- plugins/CuraEngineBackend/CuraEngineBackend.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/CuraEngineBackend/CuraEngineBackend.py b/plugins/CuraEngineBackend/CuraEngineBackend.py index b3ea28e62f..60c8cdacc8 100644 --- a/plugins/CuraEngineBackend/CuraEngineBackend.py +++ b/plugins/CuraEngineBackend/CuraEngineBackend.py @@ -156,6 +156,7 @@ class CuraEngineBackend(Backend): self._slicing = False self._restart = True self.slicingCancelled.emit() + self.processingProgress.emit(0) Logger.log("d", "Attempting to kill the engine process") if self._process is not None: Logger.log("d", "Killing engine process") @@ -191,8 +192,7 @@ class CuraEngineBackend(Backend): def _onSocketError(self, error): super()._onSocketError(error) - self._slicing = False - self.processingProgress.emit(0) + self._terminate() if error.getErrorCode() not in [Arcus.ErrorCode.BindFailedError, Arcus.ErrorCode.ConnectionResetError, Arcus.ErrorCode.Debug]: Logger.log("e", "A socket error caused the connection to be reset") From dce4fa94791c8cdd449337190475c8085208f234 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 21 Mar 2016 16:32:10 +0100 Subject: [PATCH 09/89] Added forced re-creation of socket CURA-1133 --- plugins/CuraEngineBackend/CuraEngineBackend.py | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/CuraEngineBackend/CuraEngineBackend.py b/plugins/CuraEngineBackend/CuraEngineBackend.py index 60c8cdacc8..ad3c859c20 100644 --- a/plugins/CuraEngineBackend/CuraEngineBackend.py +++ b/plugins/CuraEngineBackend/CuraEngineBackend.py @@ -163,6 +163,7 @@ class CuraEngineBackend(Backend): try: self._process.terminate() self._process = None + self._createSocket() # Re create the socket except Exception as e: # terminating a process that is already terminating causes an exception, silently ignore this. Logger.log("d", "Exception occured while trying to kill the engine %s", str(e)) Logger.log("d", "Engine process is killed") From 8f9210af6b3686eaeaa5f46c5168ffc235af5fbf Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 22 Mar 2016 11:29:16 +0100 Subject: [PATCH 10/89] Socket is now re-created regardless of process state The previous fix for this could cause an infinate slice loop on windows. CURA-1133 --- plugins/CuraEngineBackend/CuraEngineBackend.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/CuraEngineBackend/CuraEngineBackend.py b/plugins/CuraEngineBackend/CuraEngineBackend.py index ad3c859c20..867b9d927d 100644 --- a/plugins/CuraEngineBackend/CuraEngineBackend.py +++ b/plugins/CuraEngineBackend/CuraEngineBackend.py @@ -163,7 +163,7 @@ class CuraEngineBackend(Backend): try: self._process.terminate() self._process = None - self._createSocket() # Re create the socket + #self._createSocket() # Re create the socket except Exception as e: # terminating a process that is already terminating causes an exception, silently ignore this. Logger.log("d", "Exception occured while trying to kill the engine %s", str(e)) Logger.log("d", "Engine process is killed") @@ -287,7 +287,7 @@ class CuraEngineBackend(Backend): self._terminate() def _onBackendQuit(self): - if not self._restart and self._process: + if not self._restart: Logger.log("d", "Backend quitted. Resetting process and socket.") self._process = None self._createSocket() From 6525e4637e1bd04ca834d48d44440f06b7f062d8 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 22 Mar 2016 13:03:41 +0100 Subject: [PATCH 11/89] Fix some of the translations In particular, I removed some fuzziness and uncommented some outcommented translations. Contributes to issue CURA-1190. --- resources/i18n/de/cura.po | 172 ++++--------- resources/i18n/de/fdmprinter.json.po | 188 -------------- resources/i18n/fi/cura.po | 193 ++++----------- resources/i18n/fi/fdmprinter.json.po | 351 +++++++++------------------ resources/i18n/fr/cura.po | 116 +-------- resources/i18n/fr/fdmprinter.json.po | 188 -------------- 6 files changed, 221 insertions(+), 987 deletions(-) diff --git a/resources/i18n/de/cura.po b/resources/i18n/de/cura.po index 35e5569831..67a8ae0bcf 100644 --- a/resources/i18n/de/cura.po +++ b/resources/i18n/de/cura.po @@ -33,7 +33,6 @@ msgid "Open Web Page" msgstr "Webseite öffnen" #: /home/tamara/2.1/Cura/cura/CuraApplication.py:158 -#, fuzzy msgctxt "@info:progress" msgid "Setting up scene..." msgstr "Die Szene wird eingerichtet..." @@ -55,14 +54,12 @@ msgid "Cura Profile Reader" msgstr "Cura-Profil-Reader" #: /home/tamara/2.1/Cura/plugins/CuraProfileReader/__init__.py:15 -#, fuzzy msgctxt "@info:whatsthis" msgid "Provides support for importing Cura profiles." msgstr "Ermöglicht das Importieren von Cura-Profilen." #: /home/tamara/2.1/Cura/plugins/CuraProfileReader/__init__.py:21 #: /home/tamara/2.1/Cura/plugins/CuraProfileWriter/__init__.py:21 -#, fuzzy msgctxt "@item:inlistbox" msgid "Cura Profile" msgstr "Cura-Profil" @@ -196,37 +193,31 @@ msgid "CuraEngine Backend" msgstr "CuraEngine Backend" #: /home/tamara/2.1/Cura/plugins/CuraEngineBackend/__init__.py:15 -#, fuzzy msgctxt "@info:whatsthis" msgid "Provides the link to the CuraEngine slicing backend" msgstr "Stellt die Verbindung zum Slicing-Backend der CuraEngine her" #: /home/tamara/2.1/Cura/plugins/GCodeWriter/__init__.py:12 -#, fuzzy msgctxt "@label" msgid "GCode Writer" msgstr "G-Code-Writer" #: /home/tamara/2.1/Cura/plugins/GCodeWriter/__init__.py:15 -#, fuzzy msgctxt "@info:whatsthis" msgid "Writes GCode to a file" msgstr "Schreibt G-Code in eine Datei" #: /home/tamara/2.1/Cura/plugins/GCodeWriter/__init__.py:22 -#, fuzzy msgctxt "@item:inlistbox" msgid "GCode File" msgstr "G-Code-Datei" #: /home/tamara/2.1/Cura/plugins/USBPrinting/USBPrinterManager.py:49 -#, fuzzy msgctxt "@title:menu" msgid "Firmware" msgstr "Firmware" #: /home/tamara/2.1/Cura/plugins/USBPrinting/USBPrinterManager.py:50 -#, fuzzy msgctxt "@item:inmenu" msgid "Update Firmware" msgstr "Firmware aktualisieren" @@ -257,7 +248,6 @@ msgid "USB printing" msgstr "USB-Drucken" #: /home/tamara/2.1/Cura/plugins/USBPrinting/__init__.py:17 -#, fuzzy msgctxt "@info:whatsthis" msgid "Accepts G-Code and sends them to a printer. Plugin can also update firmware." msgstr "Akzeptiert den G-Code und sendet diesen an einen Drucker. Das Plugin kann auch die Firmware aktualisieren." @@ -283,19 +273,16 @@ msgid "Submits anonymous slice info. Can be disabled through preferences." msgstr "Sendet anonymisierte Slice-Informationen. Kann in den Einstellungen deaktiviert werden." #: /home/tamara/2.1/Cura/plugins/CuraProfileWriter/__init__.py:12 -#, fuzzy msgctxt "@label" msgid "Cura Profile Writer" msgstr "Cura-Profil-Writer" #: /home/tamara/2.1/Cura/plugins/CuraProfileWriter/__init__.py:15 -#, fuzzy msgctxt "@info:whatsthis" msgid "Provides support for exporting Cura profiles." msgstr "Ermöglicht das Exportieren von Cura-Profilen." #: /home/tamara/2.1/Cura/plugins/ImageReader/__init__.py:12 -#, fuzzy msgctxt "@label" msgid "Image Reader" msgstr "Bild-Reader" @@ -331,13 +318,11 @@ msgid "GIF Image" msgstr "GIF-Bilddatei" #: /home/tamara/2.1/Cura/plugins/GCodeProfileReader/__init__.py:12 -#, fuzzy msgctxt "@label" msgid "GCode Profile Reader" msgstr "G-Code-Writer" #: /home/tamara/2.1/Cura/plugins/GCodeProfileReader/__init__.py:15 -#, fuzzy msgctxt "@info:whatsthis" msgid "Provides support for importing profiles from g-code files." msgstr "Ermöglicht das Importieren von Profilen aus G-Code-Dateien." @@ -368,13 +353,11 @@ msgid "Layer View" msgstr "Schichtenansicht" #: /home/tamara/2.1/Cura/plugins/LayerView/__init__.py:16 -#, fuzzy msgctxt "@info:whatsthis" msgid "Provides the Layer view." msgstr "Bietet eine Schichtenansicht." #: /home/tamara/2.1/Cura/plugins/LayerView/__init__.py:20 -#, fuzzy msgctxt "@item:inlistbox" msgid "Layers" msgstr "Schichten" @@ -395,13 +378,11 @@ msgid "Per Object Settings Tool" msgstr "Einstellungstool pro Objekt" #: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/__init__.py:15 -#, fuzzy msgctxt "@info:whatsthis" msgid "Provides the Per Object Settings." msgstr "Bietet die Einstellungen pro Objekt" #: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/__init__.py:19 -#, fuzzy msgctxt "@label" msgid "Per Object Settings" msgstr "Einstellungen pro Objekt" @@ -417,7 +398,6 @@ msgid "Legacy Cura Profile Reader" msgstr "Cura-Vorgängerprofil-Reader" #: /home/tamara/2.1/Cura/plugins/LegacyProfileReader/__init__.py:15 -#, fuzzy msgctxt "@info:whatsthis" msgid "Provides support for importing profiles from legacy Cura versions." msgstr "Bietet Unterstützung für den Import von Profilen der Vorgängerversionen von Cura." @@ -679,139 +659,116 @@ msgid "Toggle Fu&ll Screen" msgstr "Umschalten auf Vo&llbild-Modus" #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:57 -#, fuzzy msgctxt "@action:inmenu menubar:edit" msgid "&Undo" msgstr "&Rückgängig machen" #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:65 -#, fuzzy msgctxt "@action:inmenu menubar:edit" msgid "&Redo" msgstr "&Wiederholen" #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:73 -#, fuzzy msgctxt "@action:inmenu menubar:file" msgid "&Quit" msgstr "&Beenden" #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:81 -#, fuzzy msgctxt "@action:inmenu menubar:settings" msgid "&Preferences..." msgstr "&Einstellungen..." #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:88 -#, fuzzy msgctxt "@action:inmenu menubar:printer" msgid "&Add Printer..." msgstr "&Drucker hinzufügen..." #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:94 -#, fuzzy msgctxt "@action:inmenu menubar:printer" msgid "Manage Pr&inters..." msgstr "Dr&ucker verwalten..." #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:101 -#, fuzzy msgctxt "@action:inmenu menubar:profile" msgid "Manage Profiles..." msgstr "Profile verwalten..." #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:108 -#, fuzzy msgctxt "@action:inmenu menubar:help" msgid "Show Online &Documentation" msgstr "Online-&Dokumentation anzeigen" #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:115 -#, fuzzy msgctxt "@action:inmenu menubar:help" msgid "Report a &Bug" msgstr "&Fehler melden" #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:122 -#, fuzzy msgctxt "@action:inmenu menubar:help" msgid "&About..." msgstr "&Über..." #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:129 -#, fuzzy msgctxt "@action:inmenu menubar:edit" msgid "Delete &Selection" msgstr "&Auswahl löschen" #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:137 -#, fuzzy msgctxt "@action:inmenu" msgid "Delete Object" msgstr "Objekt löschen" #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:144 -#, fuzzy msgctxt "@action:inmenu" msgid "Ce&nter Object on Platform" msgstr "Objekt auf Druckplatte ze&ntrieren" #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:150 -#, fuzzy msgctxt "@action:inmenu menubar:edit" msgid "&Group Objects" msgstr "Objekte &gruppieren" #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:158 -#, fuzzy msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Objects" msgstr "Gruppierung für Objekte aufheben" #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:166 -#, fuzzy msgctxt "@action:inmenu menubar:edit" msgid "&Merge Objects" msgstr "Objekt &zusammenführen" #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:174 -#, fuzzy msgctxt "@action:inmenu" msgid "&Duplicate Object" msgstr "Objekt &duplizieren" #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:181 -#, fuzzy msgctxt "@action:inmenu menubar:edit" msgid "&Clear Build Platform" msgstr "Druckplatte &reinigen" #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:189 -#, fuzzy msgctxt "@action:inmenu menubar:file" msgid "Re&load All Objects" msgstr "Alle Objekte neu &laden" #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:196 -#, fuzzy msgctxt "@action:inmenu menubar:edit" msgid "Reset All Object Positions" msgstr "Alle Objektpositionen zurücksetzen" #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:202 -#, fuzzy msgctxt "@action:inmenu menubar:edit" msgid "Reset All Object &Transformations" msgstr "Alle Objekt&transformationen zurücksetzen" #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:208 -#, fuzzy msgctxt "@action:inmenu menubar:file" msgid "&Open File..." msgstr "&Datei öffnen..." #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:216 -#, fuzzy msgctxt "@action:inmenu menubar:help" msgid "Show Engine &Log..." msgstr "Engine-&Protokoll anzeigen..." @@ -827,7 +784,6 @@ msgid "Hollow" msgstr "Hohl" #: /home/tamara/2.1/Cura/resources/qml/SidebarSimple.qml:239 -#, fuzzy msgctxt "@label" msgid "No (0%) infill will leave your model hollow at the cost of low strength" msgstr "Bei keiner (0 %) Füllung bleibt Ihr Modell hohl, was allerdings eine niedrige Festigkeit zur Folge hat" @@ -838,7 +794,6 @@ msgid "Light" msgstr "Dünn" #: /home/tamara/2.1/Cura/resources/qml/SidebarSimple.qml:245 -#, fuzzy msgctxt "@label" msgid "Light (20%) infill will give your model an average strength" msgstr "Eine dünne (20 %) Füllung gibt Ihrem Modell eine durchschnittliche Festigkeit" @@ -864,7 +819,6 @@ msgid "Solid (100%) infill will make your model completely solid" msgstr "Eine solide (100 %) Füllung macht Ihr Modell vollständig massiv" #: /home/tamara/2.1/Cura/resources/qml/SidebarSimple.qml:276 -#, fuzzy msgctxt "@label:listbox" msgid "Helpers:" msgstr "Helfer:" @@ -941,7 +895,6 @@ msgid "Ensure objects are kept apart" msgstr "Stellen Sie sicher, dass die Objekte getrennt gehalten werden" #: /home/tamara/2.1/Cura/resources/qml/GeneralPage.qml:131 -#, fuzzy msgctxt "@info:tooltip" msgid "Should opened files be scaled to the build volume if they are too large?" msgstr "Sollen offene Dateien an das Erstellungsvolumen angepasst werden, wenn Sie zu groß sind?" @@ -972,7 +925,6 @@ msgid "Highlight unsupported areas of the model in red. Without support these ar msgstr "Nicht gestützte Bereiche des Modells in rot hervorheben. Ohne Stützstruktur werden diese Bereiche nicht korrekt gedruckt." #: /home/tamara/2.1/Cura/resources/qml/ViewPage.qml:42 -#, fuzzy msgctxt "@option:check" msgid "Display overhang" msgstr "Überhang anzeigen" @@ -1095,13 +1047,11 @@ msgid "To assist you in having better default settings for your Ultimaker. Cura msgstr "Um Ihnen dabei zu helfen, bessere Standardeinstellungen für Ihren Ultimaker festzulegen, würde Cura gerne erfahren, welche Upgrades auf Ihrem Gerät vorhanden sind:" #: /home/tamara/2.1/Cura/resources/qml/WizardPages/SelectUpgradedParts.qml:57 -#, fuzzy msgctxt "@option:check" msgid "Extruder driver ugrades" msgstr "Upgrades für Extruder-Driver" #: /home/tamara/2.1/Cura/resources/qml/WizardPages/SelectUpgradedParts.qml:63 -#, fuzzy msgctxt "@option:check" msgid "Heated printer bed" msgstr "Heizbares Druckbett" @@ -1188,7 +1138,6 @@ msgid "Cura requires these new features and thus your firmware will most likely msgstr "Cura benötigt diese neuen Funktionen und daher ist es sehr wahrscheinlich, dass Ihre Firmware aktualisiert werden muss. Sie können dies jetzt erledigen." #: /home/tamara/2.1/Cura/resources/qml/WizardPages/UpgradeFirmware.qml:64 -#, fuzzy msgctxt "@action:button" msgid "Upgrade to Marlin Firmware" msgstr "Auf Marlin-Firmware aktualisieren" @@ -1224,183 +1173,164 @@ msgid "Select the active output device" msgstr "Wählen Sie das aktive Ausgabegerät" #: /home/tamara/2.1/Cura/resources/qml/AboutDialog.qml:15 -#, fuzzy msgctxt "@title:window" msgid "About Cura" msgstr "Über Cura" #: /home/tamara/2.1/Cura/resources/qml/AboutDialog.qml:54 -#, fuzzy msgctxt "@label" msgid "End-to-end solution for fused filament 3D printing." msgstr "Komplettlösung für den 3D-Druck mit geschmolzenem Filament." #: /home/tamara/2.1/Cura/resources/qml/AboutDialog.qml:66 -#, fuzzy msgctxt "@info:credit" msgid "Cura has been developed by Ultimaker B.V. in cooperation with the community." msgstr "Cura wurde von Ultimaker B.V. in Zusammenarbeit mit der Community entwickelt." #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:16 -#, fuzzy msgctxt "@title:window" msgid "Cura" msgstr "Cura" #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:53 -#, fuzzy msgctxt "@title:menu menubar:toplevel" msgid "&File" msgstr "&Datei" #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:62 -#, fuzzy msgctxt "@title:menu menubar:file" msgid "Open &Recent" msgstr "&Zuletzt geöffnet" #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:92 -#, fuzzy msgctxt "@action:inmenu menubar:file" msgid "&Save Selection to File" msgstr "Auswahl als Datei &speichern" #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:100 -#, fuzzy msgctxt "@title:menu menubar:file" msgid "Save &All" msgstr "&Alles speichern" #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:128 -#, fuzzy msgctxt "@title:menu menubar:toplevel" msgid "&Edit" msgstr "&Bearbeiten" #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:145 -#, fuzzy msgctxt "@title:menu menubar:toplevel" msgid "&View" msgstr "&Ansicht" #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:167 -#, fuzzy msgctxt "@title:menu menubar:toplevel" msgid "&Printer" msgstr "Dr&ucker" #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:213 -#, fuzzy msgctxt "@title:menu menubar:toplevel" msgid "P&rofile" msgstr "&Profil" #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:240 -#, fuzzy msgctxt "@title:menu menubar:toplevel" msgid "E&xtensions" msgstr "Er&weiterungen" #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:273 -#, fuzzy msgctxt "@title:menu menubar:toplevel" msgid "&Settings" msgstr "&Einstellungen" #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:281 -#, fuzzy msgctxt "@title:menu menubar:toplevel" msgid "&Help" msgstr "&Hilfe" #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:366 -#, fuzzy msgctxt "@action:button" msgid "Open File" msgstr "Datei öffnen" #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:410 -#, fuzzy msgctxt "@action:button" msgid "View Mode" msgstr "Ansichtsmodus" #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:495 -#, fuzzy msgctxt "@title:tab" msgid "View" msgstr "Ansicht" #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:644 -#, fuzzy msgctxt "@title:window" msgid "Open file" msgstr "Datei öffnen" -#~ msgctxt "@label" -#~ msgid "Variant:" -#~ msgstr "Variante:" +msgctxt "@label" +msgid "Variant:" +msgstr "Variante:" -#~ msgctxt "@label" -#~ msgid "Global Profile:" -#~ msgstr "Globales Profil:" +msgctxt "@label" +msgid "Global Profile:" +msgstr "Globales Profil:" -#~ msgctxt "@option:check" -#~ msgid "Heated printer bed (standard kit)" -#~ msgstr "Heizbares Druckbett (Standard-Kit)" +msgctxt "@option:check" +msgid "Heated printer bed (standard kit)" +msgstr "Heizbares Druckbett (Standard-Kit)" -#~ msgctxt "@option:check" -#~ msgid "Dual extrusion (experimental)" -#~ msgstr "Dual-Extruder (experimental)" +msgctxt "@option:check" +msgid "Dual extrusion (experimental)" +msgstr "Dual-Extruder (experimental)" -#~ msgctxt "@item:inlistbox" -#~ msgid "Bulgarian" -#~ msgstr "Bulgarisch" +msgctxt "@item:inlistbox" +msgid "Bulgarian" +msgstr "Bulgarisch" -#~ msgctxt "@item:inlistbox" -#~ msgid "Czech" -#~ msgstr "Tschechisch" +msgctxt "@item:inlistbox" +msgid "Czech" +msgstr "Tschechisch" -#~ msgctxt "@item:inlistbox" -#~ msgid "Italian" -#~ msgstr "Italienisch" +msgctxt "@item:inlistbox" +msgid "Italian" +msgstr "Italienisch" -#~ msgctxt "@item:inlistbox" -#~ msgid "Russian" -#~ msgstr "Russisch" +msgctxt "@item:inlistbox" +msgid "Russian" +msgstr "Russisch" -#~ msgctxt "@item:inlistbox" -#~ msgid "Spanish" -#~ msgstr "Spanisch" +msgctxt "@item:inlistbox" +msgid "Spanish" +msgstr "Spanisch" -#~ msgctxt "@label:textbox" -#~ msgid "Printjob Name" -#~ msgstr "Name des Druckauftrags" +msgctxt "@label:textbox" +msgid "Printjob Name" +msgstr "Name des Druckauftrags" -#~ msgctxt "@label" -#~ msgid "Sparse" -#~ msgstr "Dünn" +msgctxt "@label" +msgid "Sparse" +msgstr "Dünn" -#~ msgctxt "@option:check" -#~ msgid "Enable Skirt Adhesion" -#~ msgstr "Adhäsion der Unterlage aktivieren" +msgctxt "@option:check" +msgid "Enable Skirt Adhesion" +msgstr "Adhäsion der Unterlage aktivieren" -#~ msgctxt "@option:check" -#~ msgid "Enable Support" -#~ msgstr "Stützstruktur aktivieren" +msgctxt "@option:check" +msgid "Enable Support" +msgstr "Stützstruktur aktivieren" -#~ msgctxt "@label:listbox" -#~ msgid "Machine:" -#~ msgstr "Gerät:" +msgctxt "@label:listbox" +msgid "Machine:" +msgstr "Gerät:" -#~ msgctxt "@title:menu" -#~ msgid "&Machine" -#~ msgstr "&Gerät" +msgctxt "@title:menu" +msgid "&Machine" +msgstr "&Gerät" -#~ msgctxt "Save button tooltip" -#~ msgid "Save to Disk" -#~ msgstr "Auf Datenträger speichern" +msgctxt "Save button tooltip" +msgid "Save to Disk" +msgstr "Auf Datenträger speichern" -#~ msgctxt "Message action tooltip, {0} is sdcard" -#~ msgid "Eject SD Card {0}" -#~ msgstr "SD-Karte auswerfen {0}" +msgctxt "Message action tooltip, {0} is sdcard" +msgid "Eject SD Card {0}" +msgstr "SD-Karte auswerfen {0}" diff --git a/resources/i18n/de/fdmprinter.json.po b/resources/i18n/de/fdmprinter.json.po index 99d53e5b62..ec5100bdc9 100644 --- a/resources/i18n/de/fdmprinter.json.po +++ b/resources/i18n/de/fdmprinter.json.po @@ -1,4 +1,3 @@ -#, fuzzy msgid "" msgstr "" "Project-Id-Version: Cura 2.1 json setting files\n" @@ -18,13 +17,11 @@ msgid "Machine" msgstr "Gerät" #: fdmprinter.json -#, fuzzy msgctxt "machine_nozzle_size label" msgid "Nozzle Diameter" msgstr "Düsendurchmesser" #: fdmprinter.json -#, fuzzy msgctxt "machine_nozzle_size description" msgid "The inner diameter of the nozzle." msgstr "Der Innendurchmesser der Düse." @@ -49,13 +46,11 @@ msgid "" msgstr "Die Dicke der einzelnen Schichten in mm. Beim Druck mit normaler Qualität beträgt diese 0,1 mm, bei hoher Qualität 0,06 mm. Für besonders schnelles Drucken mit niedriger Qualität kann Ultimaker mit bis zu 0,25 mm arbeiten. Für die meisten Verwendungszwecke sind Dicken zwischen 0,1 und 0,2 mm ein guter Kompromiss zwischen Geschwindigkeit und Oberflächenqualität." #: fdmprinter.json -#, fuzzy msgctxt "layer_height_0 label" msgid "Initial Layer Height" msgstr "Dicke der ersten Schicht" #: fdmprinter.json -#, fuzzy msgctxt "layer_height_0 description" msgid "" "The layer height of the bottom layer. A thicker bottom layer makes sticking " @@ -63,7 +58,6 @@ msgid "" msgstr "Die Höhe der untersten Schicht. Eine dicke Basisschicht haftet leichter an der Druckplatte." #: fdmprinter.json -#, fuzzy msgctxt "line_width label" msgid "Line Width" msgstr "Linienbreite" @@ -83,7 +77,6 @@ msgid "Wall Line Width" msgstr "Breite der Wandlinien" #: fdmprinter.json -#, fuzzy msgctxt "wall_line_width description" msgid "" "Width of a single shell line. Each line of the shell will be printed with " @@ -91,7 +84,6 @@ msgid "" msgstr "Breite einer einzelnen Gehäuselinie. Jede Linie des Gehäuses wird unter Berücksichtigung dieser Breite gedruckt." #: fdmprinter.json -#, fuzzy msgctxt "wall_line_width_0 label" msgid "Outer Wall Line Width" msgstr "Breite der äußeren Wandlinien" @@ -130,7 +122,6 @@ msgid "Top/bottom line width" msgstr "Obere/untere Linienbreite" #: fdmprinter.json -#, fuzzy msgctxt "skin_line_width description" msgid "" "Width of a single top/bottom printed line, used to fill up the top/bottom " @@ -158,20 +149,17 @@ msgid "Width of the printed support structures lines." msgstr "Breite der gedruckten Stützstrukturlinien." #: fdmprinter.json -#, fuzzy msgctxt "support_roof_line_width label" msgid "Support Roof line width" msgstr "Breite der Stützdachlinie" #: fdmprinter.json -#, fuzzy msgctxt "support_roof_line_width description" msgid "" "Width of a single support roof line, used to fill the top of the support." msgstr "Breite einer einzelnen Stützdachlinie, die benutzt wird, um die Oberseite der Stützstruktur zu füllen." #: fdmprinter.json -#, fuzzy msgctxt "shell label" msgid "Shell" msgstr "Gehäuse" @@ -209,7 +197,6 @@ msgid "Wall Line Count" msgstr "Anzahl der Wandlinien" #: fdmprinter.json -#, fuzzy msgctxt "wall_line_count description" msgid "" "Number of shell lines. These lines are called perimeter lines in other tools " @@ -235,7 +222,6 @@ msgid "Bottom/Top Thickness" msgstr "Untere/obere Dicke " #: fdmprinter.json -#, fuzzy msgctxt "top_bottom_thickness description" msgid "" "This controls the thickness of the bottom and top layers. The number of " @@ -250,7 +236,6 @@ msgid "Top Thickness" msgstr "Obere Dicke" #: fdmprinter.json -#, fuzzy msgctxt "top_thickness description" msgid "" "This controls the thickness of the top layers. The number of solid layers " @@ -265,7 +250,6 @@ msgid "Top Layers" msgstr "Obere Schichten" #: fdmprinter.json -#, fuzzy msgctxt "top_layers description" msgid "This controls the number of top layers." msgstr "Dies bestimmt die Anzahl der oberen Schichten." @@ -295,13 +279,11 @@ msgid "This controls the amount of bottom layers." msgstr "Dies bestimmt die Anzahl der unteren Schichten." #: fdmprinter.json -#, fuzzy msgctxt "remove_overlapping_walls_enabled label" msgid "Remove Overlapping Wall Parts" msgstr "Überlappende Wandteile entfernen" #: fdmprinter.json -#, fuzzy msgctxt "remove_overlapping_walls_enabled description" msgid "" "Remove parts of a wall which share an overlap which would result in " @@ -310,13 +292,11 @@ msgid "" msgstr "Dient zum Entfernen von überlappenden Teilen einer Wand, was an manchen Stellen zu einer exzessiven Extrusion führen würde. Diese Überlappungen kommen bei einem Modell bei sehr kleinen Stücken und scharfen Kanten vor." #: fdmprinter.json -#, fuzzy msgctxt "remove_overlapping_walls_0_enabled label" msgid "Remove Overlapping Outer Wall Parts" msgstr "Überlappende Teile äußere Wände entfernen" #: fdmprinter.json -#, fuzzy msgctxt "remove_overlapping_walls_0_enabled description" msgid "" "Remove parts of an outer wall which share an overlap which would result in " @@ -325,13 +305,11 @@ msgid "" msgstr "Dient zum Entfernen von überlappenden Teilen einer äußeren Wand, was an manchen Stellen zu einer exzessiven Extrusion führen würde. Diese Überlappungen kommen bei einem Modell bei sehr kleinen Stücken und scharfen Kanten vor." #: fdmprinter.json -#, fuzzy msgctxt "remove_overlapping_walls_x_enabled label" msgid "Remove Overlapping Other Wall Parts" msgstr "Überlappende Teile anderer Wände entfernen" #: fdmprinter.json -#, fuzzy msgctxt "remove_overlapping_walls_x_enabled description" msgid "" "Remove parts of an inner wall which share an overlap which would result in " @@ -386,7 +364,6 @@ msgid "Bottom/Top Pattern" msgstr "Oberes/unteres Muster" #: fdmprinter.json -#, fuzzy msgctxt "top_bottom_pattern description" msgid "" "Pattern of the top/bottom solid fill. This is normally done with lines to " @@ -410,13 +387,11 @@ msgid "Zig Zag" msgstr "Zickzack" #: fdmprinter.json -#, fuzzy msgctxt "skin_no_small_gaps_heuristic label" msgid "Ignore small Z gaps" msgstr "Schmale Z-Lücken ignorieren" #: fdmprinter.json -#, fuzzy msgctxt "skin_no_small_gaps_heuristic description" msgid "" "When the model has small vertical gaps, about 5% extra computation time can " @@ -430,7 +405,6 @@ msgid "Alternate Skin Rotation" msgstr "Wechselnde Rotation der Außenhaut" #: fdmprinter.json -#, fuzzy msgctxt "skin_alternate_rotation description" msgid "" "Alternate between diagonal skin fill and horizontal + vertical skin fill. " @@ -444,7 +418,6 @@ msgid "Extra Skin Wall Count" msgstr "Linienanzahl der zusätzlichen Außenhaut" #: fdmprinter.json -#, fuzzy msgctxt "skin_outline_count description" msgid "" "Number of lines around skin regions. Using one or two skin perimeter lines " @@ -457,7 +430,6 @@ msgid "Horizontal expansion" msgstr "Horizontale Erweiterung" #: fdmprinter.json -#, fuzzy msgctxt "xy_offset description" msgid "" "Amount of offset applied to all polygons in each layer. Positive values can " @@ -471,7 +443,6 @@ msgid "Z Seam Alignment" msgstr "Justierung der Z-Naht" #: fdmprinter.json -#, fuzzy msgctxt "z_seam_type description" msgid "" "Starting point of each path in a layer. When paths in consecutive layers " @@ -502,13 +473,11 @@ msgid "Infill" msgstr "Füllung" #: fdmprinter.json -#, fuzzy msgctxt "infill_sparse_density label" msgid "Infill Density" msgstr "Fülldichte" #: fdmprinter.json -#, fuzzy msgctxt "infill_sparse_density description" msgid "" "This controls how densely filled the insides of your print will be. For a " @@ -528,13 +497,11 @@ msgid "Distance between the printed infill lines." msgstr "Abstand zwischen den gedruckten Fülllinien." #: fdmprinter.json -#, fuzzy msgctxt "infill_pattern label" msgid "Infill Pattern" msgstr "Füllmuster" #: fdmprinter.json -#, fuzzy msgctxt "infill_pattern description" msgid "" "Cura defaults to switching between grid and line infill, but with this " @@ -554,7 +521,6 @@ msgid "Lines" msgstr "Linien" #: fdmprinter.json -#, fuzzy msgctxt "infill_pattern option triangles" msgid "Triangles" msgstr "Dreiecke" @@ -570,13 +536,11 @@ msgid "Zig Zag" msgstr "Zickzack" #: fdmprinter.json -#, fuzzy msgctxt "infill_overlap label" msgid "Infill Overlap" msgstr "Füllung überlappen" #: fdmprinter.json -#, fuzzy msgctxt "infill_overlap description" msgid "" "The amount of overlap between the infill and the walls. A slight overlap " @@ -584,13 +548,11 @@ msgid "" msgstr "Das Ausmaß des Überlappens zwischen der Füllung und den Wänden. Ein leichtes Überlappen ermöglicht es den Wänden, eine solide Verbindung mit der Füllung herzustellen." #: fdmprinter.json -#, fuzzy msgctxt "infill_wipe_dist label" msgid "Infill Wipe Distance" msgstr "Wipe-Abstand der Füllung" #: fdmprinter.json -#, fuzzy msgctxt "infill_wipe_dist description" msgid "" "Distance of a travel move inserted after every infill line, to make the " @@ -599,13 +561,11 @@ msgid "" msgstr "Abstand, der nach jeder Fülllinie zurückgelegt wird, damit die Füllung besser an den Wänden haftet. Diese Option ähnelt Füllung überlappen, aber ohne Extrusion und nur an einem Ende der Fülllinie." #: fdmprinter.json -#, fuzzy msgctxt "infill_sparse_thickness label" msgid "Infill Thickness" msgstr "Fülldichte" #: fdmprinter.json -#, fuzzy msgctxt "infill_sparse_thickness description" msgid "" "The thickness of the sparse infill. This is rounded to a multiple of the " @@ -614,7 +574,6 @@ msgid "" msgstr "Die Dichte der dünnen Füllung. Dieser Wert wird auf ein Mehrfaches der Schichtdicke abgerundet und dazu verwendet, die dünne Füllung mit weniger, aber dickeren Schichten zu drucken, um die Zeit für den Druck zu verkürzen." #: fdmprinter.json -#, fuzzy msgctxt "infill_before_walls label" msgid "Infill Before Walls" msgstr "Füllung vor Wänden" @@ -634,7 +593,6 @@ msgid "Material" msgstr "Material" #: fdmprinter.json -#, fuzzy msgctxt "material_flow_dependent_temperature label" msgid "Auto Temperature" msgstr "Automatische Temperatur" @@ -660,7 +618,6 @@ msgid "" msgstr "Die für das Drucken verwendete Temperatur. Wählen Sie hier 0, um das Vorheizen selbst durchzuführen. Für PLA wird normalerweise 210 °C verwendet.\nFür ABS ist ein Wert von mindestens 230 °C erforderlich." #: fdmprinter.json -#, fuzzy msgctxt "material_flow_temp_graph label" msgid "Flow Temperature Graph" msgstr "Fließtemperaturgraf" @@ -673,7 +630,6 @@ msgid "" msgstr "Der Materialfluss (in mm3 pro Sekunde) in Bezug zur Temperatur (Grad Celsius)." #: fdmprinter.json -#, fuzzy msgctxt "material_standby_temperature label" msgid "Standby Temperature" msgstr "Standby-Temperatur" @@ -715,7 +671,6 @@ msgid "Diameter" msgstr "Durchmesser" #: fdmprinter.json -#, fuzzy msgctxt "material_diameter description" msgid "" "The diameter of your filament needs to be measured as accurately as " @@ -754,7 +709,6 @@ msgid "Retraction Distance" msgstr "Einzugsabstand" #: fdmprinter.json -#, fuzzy msgctxt "retraction_amount description" msgid "" "The amount of retraction: Set at 0 for no retraction at all. A value of " @@ -797,13 +751,11 @@ msgid "The speed at which the filament is pushed back after retraction." msgstr "Die Geschwindigkeit, mit der das Filament nach dem Einzug zurück geschoben wird." #: fdmprinter.json -#, fuzzy msgctxt "retraction_extra_prime_amount label" msgid "Retraction Extra Prime Amount" msgstr "Zusätzliche Zurückschiebemenge nach Einzug" #: fdmprinter.json -#, fuzzy msgctxt "retraction_extra_prime_amount description" msgid "" "The amount of material extruded after a retraction. During a travel move, " @@ -816,7 +768,6 @@ msgid "Retraction Minimum Travel" msgstr "Mindestbewegung für Einzug" #: fdmprinter.json -#, fuzzy msgctxt "retraction_min_travel description" msgid "" "The minimum distance of travel needed for a retraction to happen at all. " @@ -824,13 +775,11 @@ msgid "" msgstr "Der Mindestbewegungsabstand, damit ein Einzug erfolgt. Dadurch kommt es zu weniger Einzügen in einem kleinen Gebiet." #: fdmprinter.json -#, fuzzy msgctxt "retraction_count_max label" msgid "Maximum Retraction Count" msgstr "Maximale Anzahl von Einzügen" #: fdmprinter.json -#, fuzzy msgctxt "retraction_count_max description" msgid "" "This setting limits the number of retractions occurring within the Minimum " @@ -840,13 +789,11 @@ msgid "" msgstr "Diese Einstellung limitiert die Anzahl an Einzügen, die innerhalb des Fensters „Minimaler Extrusionsabstand“ auftritt. Weitere Einzüge innerhalb dieses Fensters werden ignoriert. Durch diese Funktion wird es vermieden, dass das gleiche Stück Filament wiederholt eingezogen wird, da es in diesem Fall abgeflacht werden kann oder es zu Schleifen kommen kann." #: fdmprinter.json -#, fuzzy msgctxt "retraction_extrusion_window label" msgid "Minimum Extrusion Distance Window" msgstr "Fenster „Minimaler Extrusionsabstand“" #: fdmprinter.json -#, fuzzy msgctxt "retraction_extrusion_window description" msgid "" "The window in which the Maximum Retraction Count is enforced. This value " @@ -861,7 +808,6 @@ msgid "Z Hop when Retracting" msgstr "Z-Sprung beim Einzug" #: fdmprinter.json -#, fuzzy msgctxt "retraction_hop description" msgid "" "Whenever a retraction is done, the head is lifted by this amount to travel " @@ -906,7 +852,6 @@ msgid "Shell Speed" msgstr "Gehäusegeschwindigkeit" #: fdmprinter.json -#, fuzzy msgctxt "speed_wall description" msgid "" "The speed at which the shell is printed. Printing the outer shell at a lower " @@ -919,7 +864,6 @@ msgid "Outer Shell Speed" msgstr "Äußere Gehäusegeschwindigkeit" #: fdmprinter.json -#, fuzzy msgctxt "speed_wall_0 description" msgid "" "The speed at which the outer shell is printed. Printing the outer shell at a " @@ -934,7 +878,6 @@ msgid "Inner Shell Speed" msgstr "Innere Gehäusegeschwindigkeit" #: fdmprinter.json -#, fuzzy msgctxt "speed_wall_x description" msgid "" "The speed at which all inner shells are printed. Printing the inner shell " @@ -961,7 +904,6 @@ msgid "Support Speed" msgstr "Stützstrukturgeschwindigkeit" #: fdmprinter.json -#, fuzzy msgctxt "speed_support description" msgid "" "The speed at which exterior support is printed. Printing exterior supports " @@ -971,13 +913,11 @@ msgid "" msgstr "Die Geschwindigkeit, mit der die äußere Stützstruktur gedruckt wird. Durch das Drucken der äußeren Stützstruktur mit höheren Geschwindigkeiten kann die Gesamtdruckzeit deutlich verringert werden. Da die Oberflächenqualität der äußeren Stützstrukturen normalerweise nicht wichtig ist, können hier höhere Geschwindigkeiten verwendet werden." #: fdmprinter.json -#, fuzzy msgctxt "speed_support_lines label" msgid "Support Wall Speed" msgstr "Stützwandgeschwindigkeit" #: fdmprinter.json -#, fuzzy msgctxt "speed_support_lines description" msgid "" "The speed at which the walls of exterior support are printed. Printing the " @@ -985,13 +925,11 @@ msgid "" msgstr "Die Geschwindigkeit, mit der die Wände der äußeren Stützstruktur gedruckt werden. Durch das Drucken der Wände mit höheren Geschwindigkeiten kann die Gesamtdauer verringert werden." #: fdmprinter.json -#, fuzzy msgctxt "speed_support_roof label" msgid "Support Roof Speed" msgstr "Stützdachgeschwindigkeit" #: fdmprinter.json -#, fuzzy msgctxt "speed_support_roof description" msgid "" "The speed at which the roofs of exterior support are printed. Printing the " @@ -1004,7 +942,6 @@ msgid "Travel Speed" msgstr "Bewegungsgeschwindigkeit" #: fdmprinter.json -#, fuzzy msgctxt "speed_travel description" msgid "" "The speed at which travel moves are done. A well-built Ultimaker can reach " @@ -1017,7 +954,6 @@ msgid "Bottom Layer Speed" msgstr "Geschwindigkeit für untere Schicht" #: fdmprinter.json -#, fuzzy msgctxt "speed_layer_0 description" msgid "" "The print speed for the bottom layer: You want to print the first layer " @@ -1030,7 +966,6 @@ msgid "Skirt Speed" msgstr "Skirt-Geschwindigkeit" #: fdmprinter.json -#, fuzzy msgctxt "skirt_speed description" msgid "" "The speed at which the skirt and brim are printed. Normally this is done at " @@ -1039,13 +974,11 @@ msgid "" msgstr "Die Geschwindigkeit, mit der die Skirt- und Brim-Elemente gedruckt werden. Normalerweise wird dafür die Geschwindigkeit der Basisschicht verwendet. In machen Fällen kann es jedoch vorteilhaft sein, das Skirt-Element mit einer anderen Geschwindigkeit zu drucken." #: fdmprinter.json -#, fuzzy msgctxt "speed_slowdown_layers label" msgid "Number of Slower Layers" msgstr "Anzahl der langsamen Schichten" #: fdmprinter.json -#, fuzzy msgctxt "speed_slowdown_layers description" msgid "" "The first few layers are printed slower than the rest of the object, this to " @@ -1055,7 +988,6 @@ msgid "" msgstr "Die ersten Schichten werden langsamer als der Rest des Objekts gedruckt, damit sie besser am Druckbett haften, wodurch die Wahrscheinlichkeit eines erfolgreichen Drucks erhöht wird. Die Geschwindigkeit während des Druckens dieser Schichten schrittweise erhöht. Bei den meisten Materialien und Druckern ist eine 4-stufige Geschwindigkeitserhöhung gut geeignet." #: fdmprinter.json -#, fuzzy msgctxt "travel label" msgid "Travel" msgstr "Bewegungen" @@ -1066,7 +998,6 @@ msgid "Enable Combing" msgstr "Combing aktivieren" #: fdmprinter.json -#, fuzzy msgctxt "retraction_combing description" msgid "" "Combing keeps the head within the interior of the print whenever possible " @@ -1086,7 +1017,6 @@ msgid "Avoid other parts when traveling between parts." msgstr "Bei der Bewegung zwischen Teilen werden andere Teile umgangen." #: fdmprinter.json -#, fuzzy msgctxt "travel_avoid_distance label" msgid "Avoid Distance" msgstr "Umgehungsabstand" @@ -1097,7 +1027,6 @@ msgid "The distance to stay clear of parts which are avoided during travel." msgstr "Der Abstand, der von Teilen eingehalten wird, die während der Bewegung umgangen werden." #: fdmprinter.json -#, fuzzy msgctxt "coasting_enable label" msgid "Enable Coasting" msgstr "Coasting aktivieren" @@ -1123,13 +1052,11 @@ msgid "" msgstr "Die Menge, die anderweitig abgesondert wird. Dieser Wert sollte im Allgemeinen in der Nähe vom Düsendurchmesser hoch drei liegen." #: fdmprinter.json -#, fuzzy msgctxt "coasting_min_volume label" msgid "Minimal Volume Before Coasting" msgstr "Mindestvolumen vor Coasting" #: fdmprinter.json -#, fuzzy msgctxt "coasting_min_volume description" msgid "" "The least volume an extrusion path should have to coast the full amount. For " @@ -1139,13 +1066,11 @@ msgid "" msgstr "Das geringste Volumen, das ein Extrusionsweg haben sollte, um die volle Menge coasten zu können. Bei kleineren Extrusionswegen wurde weniger Druck in den Bowden-Rohren aufgebaut und daher ist das Coasting-Volumen linear skalierbar. Dieser Werst sollte immer größer sein als das Coasting-Volumen." #: fdmprinter.json -#, fuzzy msgctxt "coasting_speed label" msgid "Coasting Speed" msgstr "Coasting-Geschwindigkeit" #: fdmprinter.json -#, fuzzy msgctxt "coasting_speed description" msgid "" "The speed by which to move during coasting, relative to the speed of the " @@ -1232,7 +1157,6 @@ msgid "" msgstr "Die Schichtanzahl, ab der Lüfter komplett eingeschaltet wird. Bei den darunter liegenden Schichten wird die Lüfterdrehzahl linear erhöht. Bei der ersten Schicht ist dieser komplett abgeschaltet." #: fdmprinter.json -#, fuzzy msgctxt "cool_min_layer_time label" msgid "Minimum Layer Time" msgstr "Mindestzeit für Schicht" @@ -1247,13 +1171,11 @@ msgid "" msgstr "Die mindestens für eine Schicht aufgewendete Zeit: Diese Einstellung gibt der Schicht Zeit, sich abzukühlen, bis die nächste Schicht darauf angebracht wird. Wenn eine Schicht in einer kürzeren Zeit fertiggestellt würde, wird der Druck verlangsamt, damit die Mindestzeit für die Schicht erreicht wird." #: fdmprinter.json -#, fuzzy msgctxt "cool_min_layer_time_fan_speed_max label" msgid "Minimum Layer Time Full Fan Speed" msgstr "Mindestzeit für Schicht für volle Lüfterdrehzahl" #: fdmprinter.json -#, fuzzy msgctxt "cool_min_layer_time_fan_speed_max description" msgid "" "The minimum time spent in a layer which will cause the fan to be at maximum " @@ -1311,7 +1233,6 @@ msgid "Placement" msgstr "Platzierung" #: fdmprinter.json -#, fuzzy msgctxt "support_type description" msgid "" "Where to place support structures. The placement can be restricted so that " @@ -1335,7 +1256,6 @@ msgid "Overhang Angle" msgstr "Winkel für Überhänge" #: fdmprinter.json -#, fuzzy msgctxt "support_angle description" msgid "" "The maximum angle of overhangs for which support will be added. With 0 " @@ -1349,7 +1269,6 @@ msgid "X/Y Distance" msgstr "X/Y-Abstand" #: fdmprinter.json -#, fuzzy msgctxt "support_xy_distance description" msgid "" "Distance of the support structure from the print in the X/Y directions. " @@ -1391,7 +1310,6 @@ msgid "Distance from the print to the bottom of the support." msgstr "Abstand vom gedruckten Objekt bis zur Unterseite der Stützstruktur." #: fdmprinter.json -#, fuzzy msgctxt "support_conical_enabled label" msgid "Conical Support" msgstr "Konische Stützstruktur" @@ -1404,7 +1322,6 @@ msgid "" msgstr "Experimentelle Funktion: Macht die Bereiche der Stützstruktur am Boden kleiner als beim Überhang." #: fdmprinter.json -#, fuzzy msgctxt "support_conical_angle label" msgid "Cone Angle" msgstr "Kegelwinkel" @@ -1419,13 +1336,11 @@ msgid "" msgstr "Der Neigungswinkel der konischen Stützstruktur. Bei 0 Grad ist er vertikal und bei 90 Grad horizontal. Kleinere Winkel machen die Stützstruktur stabiler, aber benötigen mehr Material. Negative Winkel machen die Basis der Stützstruktur breiter als die Spitze." #: fdmprinter.json -#, fuzzy msgctxt "support_conical_min_width label" msgid "Minimal Width" msgstr "Mindestdurchmesser" #: fdmprinter.json -#, fuzzy msgctxt "support_conical_min_width description" msgid "" "Minimal width to which conical support reduces the support areas. Small " @@ -1452,7 +1367,6 @@ msgid "Join Distance" msgstr "Abstand für Zusammenführung" #: fdmprinter.json -#, fuzzy msgctxt "support_join_distance description" msgid "" "The maximum distance between support blocks in the X/Y directions, so that " @@ -1460,13 +1374,11 @@ msgid "" msgstr "Der maximal zulässige Abstand zwischen Stützblöcken in den X/Y-Richtungen, damit die Blöcke zusammengeführt werden können." #: fdmprinter.json -#, fuzzy msgctxt "support_offset label" msgid "Horizontal Expansion" msgstr "Horizontale Erweiterung" #: fdmprinter.json -#, fuzzy msgctxt "support_offset description" msgid "" "Amount of offset applied to all support polygons in each layer. Positive " @@ -1479,7 +1391,6 @@ msgid "Area Smoothing" msgstr "Bereichsglättung" #: fdmprinter.json -#, fuzzy msgctxt "support_area_smoothing description" msgid "" "Maximum distance in the X/Y directions of a line segment which is to be " @@ -1490,26 +1401,22 @@ msgid "" msgstr "Maximalabstand in die X/Y-Richtungen eines Liniensegments, das geglättet werden muss. Durch den Verbindungsabstand und die Stützbrücke kommt es zu ausgefransten Linien, was zu einem Mitschwingen der Maschine führt. Das Glätten der Stützbereiche führt nicht zum Brechen durch die Belastung, allerdings kann der Überhang dadurch verändert werden." #: fdmprinter.json -#, fuzzy msgctxt "support_roof_enable label" msgid "Enable Support Roof" msgstr "Stützdach aktivieren" #: fdmprinter.json -#, fuzzy msgctxt "support_roof_enable description" msgid "" "Generate a dense top skin at the top of the support on which the model sits." msgstr "Generiert eine dichte obere Außenhaut auf der Stützstruktur, auf der das Modell aufliegt." #: fdmprinter.json -#, fuzzy msgctxt "support_roof_height label" msgid "Support Roof Thickness" msgstr "Dicke des Stützdachs" #: fdmprinter.json -#, fuzzy msgctxt "support_roof_height description" msgid "The height of the support roofs." msgstr "Die Dicke des Stützdachs. " @@ -1520,7 +1427,6 @@ msgid "Support Roof Density" msgstr "Dichte des Stützdachs" #: fdmprinter.json -#, fuzzy msgctxt "support_roof_density description" msgid "" "This controls how densely filled the roofs of the support will be. A higher " @@ -1529,25 +1435,21 @@ msgid "" msgstr "Dies steuert, wie dicht die Dächer der Stützstruktur gefüllt werden. Ein höherer Prozentsatz liefert bessere Überhänge, die jedoch schwieriger zu entfernen sind." #: fdmprinter.json -#, fuzzy msgctxt "support_roof_line_distance label" msgid "Support Roof Line Distance" msgstr "Linienabstand des Stützdachs" #: fdmprinter.json -#, fuzzy msgctxt "support_roof_line_distance description" msgid "Distance between the printed support roof lines." msgstr "Abstand zwischen den gedruckten Stützdachlinien." #: fdmprinter.json -#, fuzzy msgctxt "support_roof_pattern label" msgid "Support Roof Pattern" msgstr "Muster des Stützdachs" #: fdmprinter.json -#, fuzzy msgctxt "support_roof_pattern description" msgid "The pattern with which the top of the support is printed." msgstr "Das Muster, mit dem die Oberseite der Stützstruktur gedruckt wird." @@ -1578,7 +1480,6 @@ msgid "Zig Zag" msgstr "Zickzack" #: fdmprinter.json -#, fuzzy msgctxt "support_use_towers label" msgid "Use towers" msgstr "Pfeiler verwenden." @@ -1592,13 +1493,11 @@ msgid "" msgstr "Spezielle Pfeiler verwenden, um kleine Überhänge zu stützen. Diese Pfeiler haben einen größeren Durchmesser als der von ihnen gestützte Bereich. In der Nähe des Überhangs verkleinert sich der Durchmesser der Pfeiler, was zur Bildung eines Dachs führt." #: fdmprinter.json -#, fuzzy msgctxt "support_minimal_diameter label" msgid "Minimum Diameter" msgstr "Mindestdurchmesser" #: fdmprinter.json -#, fuzzy msgctxt "support_minimal_diameter description" msgid "" "Minimum diameter in the X/Y directions of a small area which is to be " @@ -1611,7 +1510,6 @@ msgid "Tower Diameter" msgstr "Pfeilerdurchmesser" #: fdmprinter.json -#, fuzzy msgctxt "support_tower_diameter description" msgid "The diameter of a special tower." msgstr "Der Durchmesser eines speziellen Pfeilers." @@ -1622,7 +1520,6 @@ msgid "Tower Roof Angle" msgstr "Winkel des Pfeilerdachs" #: fdmprinter.json -#, fuzzy msgctxt "support_tower_roof_angle description" msgid "" "The angle of the rooftop of a tower. Larger angles mean more pointy towers." @@ -1634,7 +1531,6 @@ msgid "Pattern" msgstr "Muster" #: fdmprinter.json -#, fuzzy msgctxt "support_pattern description" msgid "" "Cura can generate 3 distinct types of support structure. First is a grid " @@ -1682,13 +1578,11 @@ msgid "" msgstr "Diese Funktion verbindet die Zickzack-Elemente. Dadurch sind diese zwar schwerer zu entfernen, aber das Fadenziehen getrennter Zickzack-Elemente wird dadurch vermieden." #: fdmprinter.json -#, fuzzy msgctxt "support_infill_rate label" msgid "Fill Amount" msgstr "Füllmenge" #: fdmprinter.json -#, fuzzy msgctxt "support_infill_rate description" msgid "" "The amount of infill structure in the support; less infill gives weaker " @@ -1716,7 +1610,6 @@ msgid "Type" msgstr "Typ" #: fdmprinter.json -#, fuzzy msgctxt "adhesion_type description" msgid "" "Different options that help to improve priming your extrusion.\n" @@ -1730,7 +1623,6 @@ msgid "" msgstr "Verschiedene Optionen dienen der Materialbereitstellung für Ihre Extrusion.\nBrim und Raft sorgen dafür, dass Ecken nicht durch Verformung angehoben werden. Durch die Funktion Brim wird ein flacher, einschichtiger Bereich um das Objekt herum hinzugefügt, der nach dem Druckvorgang leicht entfernt werden kann. Dies ist die empfohlene Option. Durch die Raft-Funktion wird ein dickes Gitter unter dem Objekt sowie ein dünnes Verbindungselement zwischen diesem Gitter und dem Objekt hinzugefügt. (Beachten Sie, dass die Skirt-Funktion durch Aktivieren von Brim bzw. Raft deaktiviert wird.)" #: fdmprinter.json -#, fuzzy msgctxt "adhesion_type option skirt" msgid "Skirt" msgstr "Skirt" @@ -1784,13 +1676,11 @@ msgid "" msgstr "Die Mindestlänge für das Skirt-Element. Wenn diese Mindestlänge nicht erreicht wird, werden weitere Skirt-Linien hinzugefügt, um diese Mindestlänge zu erreichen. Hinweis: Wenn die Linienzahl auf 0 eingestellt wird, wird dies ignoriert." #: fdmprinter.json -#, fuzzy msgctxt "brim_width label" msgid "Brim Width" msgstr "Linienbreite" #: fdmprinter.json -#, fuzzy msgctxt "brim_width description" msgid "" "The distance from the model to the end of the brim. A larger brim sticks " @@ -1804,7 +1694,6 @@ msgid "Brim Line Count" msgstr "Anzahl der Brim-Linien" #: fdmprinter.json -#, fuzzy msgctxt "brim_line_count description" msgid "" "The number of lines used for a brim. More lines means a larger brim which " @@ -1839,13 +1728,11 @@ msgid "" msgstr "Die Lücke zwischen der letzten Raft-Schicht und der ersten Schicht des Objekts. Nur die erste Schicht wird entsprechend dieses Wertes angehoben, um die Bindung zwischen der Raft-Schicht und dem Objekt zu reduzieren. Dies macht es leichter, das Raft abzuziehen." #: fdmprinter.json -#, fuzzy msgctxt "raft_surface_layers label" msgid "Raft Top Layers" msgstr "Obere Raft-Schichten" #: fdmprinter.json -#, fuzzy msgctxt "raft_surface_layers description" msgid "" "The number of top layers on top of the 2nd raft layer. These are fully " @@ -1854,25 +1741,21 @@ msgid "" msgstr "Die Anzahl der Oberflächenschichten auf der zweiten Raft-Schicht. Dabei handelt es sich um komplett gefüllte Schichten, auf denen das Objekt ruht. Bei der Verwendung von 2 Schichten entsteht eine glattere Oberfläche als bei einer Schicht." #: fdmprinter.json -#, fuzzy msgctxt "raft_surface_thickness label" msgid "Raft Top Layer Thickness" msgstr "Dicke der oberen Raft-Schichten" #: fdmprinter.json -#, fuzzy msgctxt "raft_surface_thickness description" msgid "Layer thickness of the top raft layers." msgstr "Schichtdicke der oberen Raft-Schichten." #: fdmprinter.json -#, fuzzy msgctxt "raft_surface_line_width label" msgid "Raft Top Line Width" msgstr "Linienbreite der Raft-Oberfläche" #: fdmprinter.json -#, fuzzy msgctxt "raft_surface_line_width description" msgid "" "Width of the lines in the top surface of the raft. These can be thin lines " @@ -1880,13 +1763,11 @@ msgid "" msgstr "Breite der Linien in der Raft-Oberfläche. Dünne Linien sorgen dafür, dass die Raft-Oberfläche glatter wird." #: fdmprinter.json -#, fuzzy msgctxt "raft_surface_line_spacing label" msgid "Raft Top Spacing" msgstr "Linienabstand der Raft-Oberfläche" #: fdmprinter.json -#, fuzzy msgctxt "raft_surface_line_spacing description" msgid "" "The distance between the raft lines for the top raft layers. The spacing " @@ -1894,25 +1775,21 @@ msgid "" msgstr "Der Abstand zwischen den Raft-Linien der Raft-Oberflächenschichten. Der Abstand sollte der Linienbreite entsprechen, damit die Oberfläche stabil ist." #: fdmprinter.json -#, fuzzy msgctxt "raft_interface_thickness label" msgid "Raft Middle Thickness" msgstr "Dicke der Raft-Mittelbereichs" #: fdmprinter.json -#, fuzzy msgctxt "raft_interface_thickness description" msgid "Layer thickness of the middle raft layer." msgstr "Schichtdicke des Raft-Mittelbereichs." #: fdmprinter.json -#, fuzzy msgctxt "raft_interface_line_width label" msgid "Raft Middle Line Width" msgstr "Linienbreite des Raft-Mittelbereichs" #: fdmprinter.json -#, fuzzy msgctxt "raft_interface_line_width description" msgid "" "Width of the lines in the middle raft layer. Making the second layer extrude " @@ -1920,13 +1797,11 @@ msgid "" msgstr "Breite der Linien im Raft-Mittelbereich. Wenn die zweite Schicht mehr extrudiert, haften die Linien besser am Druckbett." #: fdmprinter.json -#, fuzzy msgctxt "raft_interface_line_spacing label" msgid "Raft Middle Spacing" msgstr "Linienabstand im Raft-Mittelbereich" #: fdmprinter.json -#, fuzzy msgctxt "raft_interface_line_spacing description" msgid "" "The distance between the raft lines for the middle raft layer. The spacing " @@ -1940,7 +1815,6 @@ msgid "Raft Base Thickness" msgstr "Dicke der Raft-Basis" #: fdmprinter.json -#, fuzzy msgctxt "raft_base_thickness description" msgid "" "Layer thickness of the base raft layer. This should be a thick layer which " @@ -1948,13 +1822,11 @@ msgid "" msgstr "Schichtdicke der Raft-Basisschicht. Dabei sollte es sich um eine dicke Schicht handeln, die fest am Druckbett haftet." #: fdmprinter.json -#, fuzzy msgctxt "raft_base_line_width label" msgid "Raft Base Line Width" msgstr "Linienbreite der Raft-Basis" #: fdmprinter.json -#, fuzzy msgctxt "raft_base_line_width description" msgid "" "Width of the lines in the base raft layer. These should be thick lines to " @@ -1962,13 +1834,11 @@ msgid "" msgstr "Breite der Linien in Raft-Basisschicht. Dabei sollte es sich um dicke Linien handeln, da diese besser am Druckbett haften." #: fdmprinter.json -#, fuzzy msgctxt "raft_base_line_spacing label" msgid "Raft Line Spacing" msgstr "Raft-Linienabstand" #: fdmprinter.json -#, fuzzy msgctxt "raft_base_line_spacing description" msgid "" "The distance between the raft lines for the base raft layer. Wide spacing " @@ -1976,25 +1846,21 @@ msgid "" msgstr "Der Abstand zwischen den Raft-Linien der Raft-Basisschicht. Große Abstände erleichtern das Entfernen des Raft von der Druckplatte." #: fdmprinter.json -#, fuzzy msgctxt "raft_speed label" msgid "Raft Print Speed" msgstr "Raft-Druckgeschwindigkeit" #: fdmprinter.json -#, fuzzy msgctxt "raft_speed description" msgid "The speed at which the raft is printed." msgstr "Die Geschwindigkeit, mit der das Raft gedruckt wird." #: fdmprinter.json -#, fuzzy msgctxt "raft_surface_speed label" msgid "Raft Surface Print Speed" msgstr "Druckgeschwindigkeit für Raft-Oberfläche" #: fdmprinter.json -#, fuzzy msgctxt "raft_surface_speed description" msgid "" "The speed at which the surface raft layers are printed. These should be " @@ -2003,13 +1869,11 @@ msgid "" msgstr "Die Geschwindigkeit, mit der die Oberflächenschichten des Raft gedruckt werden. Diese sollte etwas geringer sein, damit die Düse langsam angrenzende Oberflächenlinien glätten kann." #: fdmprinter.json -#, fuzzy msgctxt "raft_interface_speed label" msgid "Raft Interface Print Speed" msgstr "Druckgeschwindigkeit für Raft-Verbindungselement" #: fdmprinter.json -#, fuzzy msgctxt "raft_interface_speed description" msgid "" "The speed at which the interface raft layer is printed. This should be " @@ -2023,7 +1887,6 @@ msgid "Raft Base Print Speed" msgstr "Druckgeschwindigkeit für Raft-Basis" #: fdmprinter.json -#, fuzzy msgctxt "raft_base_speed description" msgid "" "The speed at which the base raft layer is printed. This should be printed " @@ -2032,7 +1895,6 @@ msgid "" msgstr "Die Geschwindigkeit, mit der die Raft-Basisschicht gedruckt wird. Diese sollte relativ niedrig sein, da zu diesem Zeitpunkt ein großes Materialvolumen aus der Düse kommt." #: fdmprinter.json -#, fuzzy msgctxt "raft_fan_speed label" msgid "Raft Fan Speed" msgstr "Lüfterdrehzahl für Raft" @@ -2043,43 +1905,36 @@ msgid "The fan speed for the raft." msgstr "Die Drehzahl des Lüfters für das Raft." #: fdmprinter.json -#, fuzzy msgctxt "raft_surface_fan_speed label" msgid "Raft Surface Fan Speed" msgstr "Lüfterdrehzahl für Raft-Oberfläche" #: fdmprinter.json -#, fuzzy msgctxt "raft_surface_fan_speed description" msgid "The fan speed for the surface raft layers." msgstr "Die Drehzahl des Lüfters für die Raft-Oberflächenschichten." #: fdmprinter.json -#, fuzzy msgctxt "raft_interface_fan_speed label" msgid "Raft Interface Fan Speed" msgstr "Lüfterdrehzahl für Raft-Verbindungselement" #: fdmprinter.json -#, fuzzy msgctxt "raft_interface_fan_speed description" msgid "The fan speed for the interface raft layer." msgstr "Die Drehzahl des Lüfters für das Raft-Verbindungselement." #: fdmprinter.json -#, fuzzy msgctxt "raft_base_fan_speed label" msgid "Raft Base Fan Speed" msgstr "Lüfterdrehzahl für Raft-Basis" #: fdmprinter.json -#, fuzzy msgctxt "raft_base_fan_speed description" msgid "The fan speed for the base raft layer." msgstr "Die Drehzahl des Lüfters für die Raft-Basisschicht." #: fdmprinter.json -#, fuzzy msgctxt "draft_shield_enabled label" msgid "Enable Draft Shield" msgstr "Windschutz aktivieren" @@ -2093,13 +1948,11 @@ msgid "" msgstr "Aktiviert den äußeren Windschutz. Es wird rund um das Objekt eine Wand erstellt, die (heiße) Luft festhält und vor Windstößen schützt. Besonders nützlich bei Materialien, die sich leicht verbiegen." #: fdmprinter.json -#, fuzzy msgctxt "draft_shield_dist label" msgid "Draft Shield X/Y Distance" msgstr "X/Y-Abstand des Windschutzes" #: fdmprinter.json -#, fuzzy msgctxt "draft_shield_dist description" msgid "Distance of the draft shield from the print, in the X/Y directions." msgstr "Abstand des Windschutzes zum gedruckten Objekt in den X/Y-Richtungen." @@ -2110,7 +1963,6 @@ msgid "Draft Shield Limitation" msgstr "Begrenzung des Windschutzes" #: fdmprinter.json -#, fuzzy msgctxt "draft_shield_height_limitation description" msgid "Whether or not to limit the height of the draft shield." msgstr "Ob die Höhe des Windschutzes begrenzt werden soll" @@ -2126,7 +1978,6 @@ msgid "Limited" msgstr "Begrenzt" #: fdmprinter.json -#, fuzzy msgctxt "draft_shield_height label" msgid "Draft Shield Height" msgstr "Höhe des Windschutzes" @@ -2139,19 +1990,16 @@ msgid "" msgstr "Begrenzung der Höhe des Windschutzes. Oberhalb dieser Höhe wird kein Windschutz mehr gedruckt." #: fdmprinter.json -#, fuzzy msgctxt "meshfix label" msgid "Mesh Fixes" msgstr "Netzreparaturen" #: fdmprinter.json -#, fuzzy msgctxt "meshfix_union_all label" msgid "Union Overlapping Volumes" msgstr "Überlappende Volumen vereinen" #: fdmprinter.json -#, fuzzy msgctxt "meshfix_union_all description" msgid "" "Ignore the internal geometry arising from overlapping volumes and print the " @@ -2190,7 +2038,6 @@ msgid "Keep Disconnected Faces" msgstr "Unterbrochene Flächen beibehalten" #: fdmprinter.json -#, fuzzy msgctxt "meshfix_keep_open_polygons description" msgid "" "Normally Cura tries to stitch up small holes in the mesh and remove parts of " @@ -2205,13 +2052,11 @@ msgid "Special Modes" msgstr "Sonderfunktionen" #: fdmprinter.json -#, fuzzy msgctxt "print_sequence label" msgid "Print sequence" msgstr "Druckreihenfolge" #: fdmprinter.json -#, fuzzy msgctxt "print_sequence description" msgid "" "Whether to print all objects one layer at a time or to wait for one object " @@ -2261,13 +2106,11 @@ msgid "Both" msgstr "Beides" #: fdmprinter.json -#, fuzzy msgctxt "magic_spiralize label" msgid "Spiralize Outer Contour" msgstr "Spiralisieren der äußeren Konturen" #: fdmprinter.json -#, fuzzy msgctxt "magic_spiralize description" msgid "" "Spiralize smooths out the Z move of the outer edge. This will create a " @@ -2289,7 +2132,6 @@ msgid "" msgstr "Willkürliche Zitterbewegung beim Druck der äußeren Wand, wodurch die Oberfläche ein raues und ungleichmäßiges Aussehen erhält." #: fdmprinter.json -#, fuzzy msgctxt "magic_fuzzy_skin_thickness label" msgid "Fuzzy Skin Thickness" msgstr "Dicke der ungleichmäßigen Außenhaut" @@ -2315,7 +2157,6 @@ msgid "" msgstr "Die durchschnittliche Dichte der Punkte, die auf jedes Polygon einer Schicht aufgebracht werden. Beachten Sie, dass die Originalpunkte des Polygons verworfen werden, sodass eine geringe Dichte in einer Reduzierung der Auflösung resultiert." #: fdmprinter.json -#, fuzzy msgctxt "magic_fuzzy_skin_point_dist label" msgid "Fuzzy Skin Point Distance" msgstr "Punktabstand der ungleichmäßigen Außenhaut" @@ -2344,13 +2185,11 @@ msgid "" msgstr "Druckt „schwebend“ nur die äußere Oberfläche mit einer dünnen Netzstruktur. Dazu werden die Konturen des Modells horizontal gemäß den gegebenen Z-Intervallen gedruckt, welche durch aufwärts und diagonal abwärts verlaufende Linien verbunden werden." #: fdmprinter.json -#, fuzzy msgctxt "wireframe_height label" msgid "WP Connection Height" msgstr "Verbindungshöhe bei Drucken mit Drahtstruktur" #: fdmprinter.json -#, fuzzy msgctxt "wireframe_height description" msgid "" "The height of the upward and diagonally downward lines between two " @@ -2359,7 +2198,6 @@ msgid "" msgstr "Die Höhe der Aufwärtslinien und diagonalen Abwärtslinien zwischen zwei horizontalen Teilen. Dies legt die Gesamtdichte der Netzstruktur fest. Dies gilt nur für das Drucken mit Drahtstruktur." #: fdmprinter.json -#, fuzzy msgctxt "wireframe_roof_inset label" msgid "WP Roof Inset Distance" msgstr "Einfügeabstand für Dach bei Drucken mit Drahtstruktur" @@ -2372,7 +2210,6 @@ msgid "" msgstr "Der abgedeckte Abstand beim Herstellen einer Verbindung vom Dachumriss nach innen. Dies gilt nur für das Drucken mit Drahtstruktur." #: fdmprinter.json -#, fuzzy msgctxt "wireframe_printspeed label" msgid "WP speed" msgstr "Geschwindigkeit beim Drucken mit Drahtstruktur" @@ -2385,7 +2222,6 @@ msgid "" msgstr "Die Geschwindigkeit, mit der sich die Düse bei der Materialextrusion bewegt. Dies gilt nur für das Drucken mit Drahtstruktur." #: fdmprinter.json -#, fuzzy msgctxt "wireframe_printspeed_bottom label" msgid "WP Bottom Printing Speed" msgstr "Geschwindigkeit beim Drucken der Unterseite mit Drahtstruktur" @@ -2398,7 +2234,6 @@ msgid "" msgstr "Die Geschwindigkeit beim drucken der ersten Schicht, also der einzigen Schicht, welche die Druckplatte berührt. Dies gilt nur für das Drucken mit Drahtstruktur." #: fdmprinter.json -#, fuzzy msgctxt "wireframe_printspeed_up label" msgid "WP Upward Printing Speed" msgstr "Geschwindigkeit beim Drucken in Aufwärtsrichtung mit Drahtstruktur" @@ -2410,7 +2245,6 @@ msgid "" msgstr "Geschwindigkeit beim Drucken einer „schwebenden“ Linie in Aufwärtsrichtung. Dies gilt nur für das Drucken mit Drahtstruktur." #: fdmprinter.json -#, fuzzy msgctxt "wireframe_printspeed_down label" msgid "WP Downward Printing Speed" msgstr "Geschwindigkeit beim Drucken in Abwärtsrichtung mit Drahtstruktur" @@ -2422,7 +2256,6 @@ msgid "" msgstr "Geschwindigkeit beim Drucken einer Linie in diagonaler Abwärtsrichtung. Dies gilt nur für das Drucken mit Drahtstruktur." #: fdmprinter.json -#, fuzzy msgctxt "wireframe_printspeed_flat label" msgid "WP Horizontal Printing Speed" msgstr "Geschwindigkeit beim Drucken in horizontaler Richtung mit Drahtstruktur" @@ -2435,7 +2268,6 @@ msgid "" msgstr "Geschwindigkeit beim Drucken der horizontalen Konturen des Objekts. Dies gilt nur für das Drucken mit Drahtstruktur." #: fdmprinter.json -#, fuzzy msgctxt "wireframe_flow label" msgid "WP Flow" msgstr "Fluss für Drucken mit Drahtstruktur" @@ -2448,7 +2280,6 @@ msgid "" msgstr "Flusskompensation: Die extrudierte Materialmenge wird mit diesem Wert multipliziert. Dies gilt nur für das Drucken mit Drahtstruktur." #: fdmprinter.json -#, fuzzy msgctxt "wireframe_flow_connection label" msgid "WP Connection Flow" msgstr "Fluss für Drucken von Verbindungen mit Drahtstruktur" @@ -2459,7 +2290,6 @@ msgid "Flow compensation when going up or down. Only applies to Wire Printing." msgstr "Flusskompensation bei der Aufwärts- und Abwärtsbewegung. Dies gilt nur für das Drucken mit Drahtstruktur." #: fdmprinter.json -#, fuzzy msgctxt "wireframe_flow_flat label" msgid "WP Flat Flow" msgstr "Fluss für Drucken von flachen Linien mit Drahtstruktur" @@ -2471,7 +2301,6 @@ msgid "" msgstr "Flusskompensation beim Drucken flacher Linien. Dies gilt nur für das Drucken mit Drahtstruktur." #: fdmprinter.json -#, fuzzy msgctxt "wireframe_top_delay label" msgid "WP Top Delay" msgstr "Aufwärtsverzögerung beim Drucken mit Drahtstruktur" @@ -2484,25 +2313,21 @@ msgid "" msgstr "Verzögerungszeit nach einer Aufwärtsbewegung, damit die Aufwärtslinie härten kann. Dies gilt nur für das Drucken mit Drahtstruktur." #: fdmprinter.json -#, fuzzy msgctxt "wireframe_bottom_delay label" msgid "WP Bottom Delay" msgstr "Abwärtsverzögerung beim Drucken mit Drahtstruktur" #: fdmprinter.json -#, fuzzy msgctxt "wireframe_bottom_delay description" msgid "Delay time after a downward move. Only applies to Wire Printing." msgstr "Verzögerungszeit nach einer Abwärtsbewegung. Dies gilt nur für das Drucken mit Drahtstruktur." #: fdmprinter.json -#, fuzzy msgctxt "wireframe_flat_delay label" msgid "WP Flat Delay" msgstr "Horizontale Verzögerung beim Drucken mit Drahtstruktur" #: fdmprinter.json -#, fuzzy msgctxt "wireframe_flat_delay description" msgid "" "Delay time between two horizontal segments. Introducing such a delay can " @@ -2511,7 +2336,6 @@ msgid "" msgstr "Verzögerungszeit zwischen zwei horizontalen Segmenten. Durch eine solche Verzögerung kann eine bessere Haftung an den Verbindungspunkten zu vorherigen Schichten erreicht werden; bei einer zu langen Verzögerungszeit kann es allerdings zum Herabsinken von Bestandteilen kommen. Dies gilt nur für das Drucken mit Drahtstruktur." #: fdmprinter.json -#, fuzzy msgctxt "wireframe_up_half_speed label" msgid "WP Ease Upward" msgstr "Langsame Aufwärtsbewegung bei Drucken mit Drahtstruktur" @@ -2525,7 +2349,6 @@ msgid "" msgstr "Die Strecke einer Aufwärtsbewegung, die mit halber Geschwindigkeit extrudiert wird.\nDies kann zu einer besseren Haftung an vorhergehenden Schichten führen, während gleichzeitig ein Überhitzen des Materials in diesen Schichten vermieden wird. Dies gilt nur für das Drucken mit Drahtstruktur." #: fdmprinter.json -#, fuzzy msgctxt "wireframe_top_jump label" msgid "WP Knot Size" msgstr "Knotengröße für Drucken mit Drahtstruktur" @@ -2539,7 +2362,6 @@ msgid "" msgstr "Stellt einen kleinen Knoten oben auf einer Aufwärtslinie her, damit die nächste horizontale Schicht eine bessere Verbindung mit dieser herstellen kann. Dies gilt nur für das Drucken mit Drahtstruktur." #: fdmprinter.json -#, fuzzy msgctxt "wireframe_fall_down label" msgid "WP Fall Down" msgstr "Herunterfallen bei Drucken mit Drahtstruktur" @@ -2552,7 +2374,6 @@ msgid "" msgstr "Die Strecke, die das Material nach einer Aufwärts-Extrusion herunterfällt. Diese Strecke wird kompensiert. Dies gilt nur für das Drucken mit Drahtstruktur." #: fdmprinter.json -#, fuzzy msgctxt "wireframe_drag_along label" msgid "WP Drag along" msgstr "Nachziehen bei Drucken mit Drahtstruktur" @@ -2566,13 +2387,11 @@ msgid "" msgstr "Die Strecke, die das Material bei einer Aufwärts-Extrusion mit der diagonalen Abwärts-Extrusion nach unten gezogen wird. Diese Strecke wird kompensiert. Dies gilt nur für das Drucken mit Drahtstruktur." #: fdmprinter.json -#, fuzzy msgctxt "wireframe_strategy label" msgid "WP Strategy" msgstr "Strategie für Drucken mit Drahtstruktur" #: fdmprinter.json -#, fuzzy msgctxt "wireframe_strategy description" msgid "" "Strategy for making sure two consecutive layers connect at each connection " @@ -2595,13 +2414,11 @@ msgid "Knot" msgstr "Knoten" #: fdmprinter.json -#, fuzzy msgctxt "wireframe_strategy option retract" msgid "Retract" msgstr "Einziehen" #: fdmprinter.json -#, fuzzy msgctxt "wireframe_straight_before_down label" msgid "WP Straighten Downward Lines" msgstr "Abwärtslinien beim Drucken mit Drahtstruktur geraderichten" @@ -2615,7 +2432,6 @@ msgid "" msgstr "Prozentsatz einer diagonalen Abwärtslinie, die von einem horizontalen Linienteil bedeckt wird. Dies kann das Herabsinken des höchsten Punktes einer Aufwärtslinie verhindern. Dies gilt nur für das Drucken mit Drahtstruktur." #: fdmprinter.json -#, fuzzy msgctxt "wireframe_roof_fall_down label" msgid "WP Roof Fall Down" msgstr "Herunterfallen des Dachs bei Drucken mit Drahtstruktur" @@ -2629,7 +2445,6 @@ msgid "" msgstr "Die Strecke, um die horizontale Dachlinien, die „schwebend“ gedruckt werden, beim Druck herunterfallen. Diese Strecke wird kompensiert. Dies gilt nur für das Drucken mit Drahtstruktur." #: fdmprinter.json -#, fuzzy msgctxt "wireframe_roof_drag_along label" msgid "WP Roof Drag Along" msgstr "Nachziehen für Dach bei Drucken mit Drahtstruktur" @@ -2643,13 +2458,11 @@ msgid "" msgstr "Die Strecke des Endstücks einer nach innen verlaufenden Linie, um die diese bei der Rückkehr zur äußeren Umfangslinie des Dachs nachgezogen wird. Diese Strecke wird kompensiert. Dies gilt nur für das Drucken mit Drahtstruktur." #: fdmprinter.json -#, fuzzy msgctxt "wireframe_roof_outer_delay label" msgid "WP Roof Outer Delay" msgstr "Verzögerung für Dachumfänge bei Drucken mit Drahtstruktur" #: fdmprinter.json -#, fuzzy msgctxt "wireframe_roof_outer_delay description" msgid "" "Time spent at the outer perimeters of hole which is to become a roof. Longer " @@ -2657,7 +2470,6 @@ msgid "" msgstr "Die Zeit, die für die äußeren Umfänge eines Lochs aufgewendet wird, das später zu einem Dach werden soll. Durch längere Zeiten kann die Verbindung besser werden. Dies gilt nur für das Drucken mit Drahtstruktur." #: fdmprinter.json -#, fuzzy msgctxt "wireframe_nozzle_clearance label" msgid "WP Nozzle Clearance" msgstr "Düsenabstand bei Drucken mit Drahtstruktur" diff --git a/resources/i18n/fi/cura.po b/resources/i18n/fi/cura.po index d8f4234125..868b145f87 100644 --- a/resources/i18n/fi/cura.po +++ b/resources/i18n/fi/cura.po @@ -3,7 +3,6 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -#, fuzzy msgid "" msgstr "" "Project-Id-Version: Cura 2.1\n" @@ -38,13 +37,11 @@ msgid "Open Web Page" msgstr "Avaa verkkosivu" #: /home/tamara/2.1/Cura/cura/CuraApplication.py:158 -#, fuzzy msgctxt "@info:progress" msgid "Setting up scene..." msgstr "Asetetaan näkymää..." #: /home/tamara/2.1/Cura/cura/CuraApplication.py:192 -#, fuzzy msgctxt "@info:progress" msgid "Loading interface..." msgstr "Ladataan käyttöliittymää..." @@ -61,26 +58,22 @@ msgid "Cura Profile Reader" msgstr "Cura-profiilin lukija" #: /home/tamara/2.1/Cura/plugins/CuraProfileReader/__init__.py:15 -#, fuzzy msgctxt "@info:whatsthis" msgid "Provides support for importing Cura profiles." msgstr "Tukee Cura-profiilien tuontia." #: /home/tamara/2.1/Cura/plugins/CuraProfileReader/__init__.py:21 #: /home/tamara/2.1/Cura/plugins/CuraProfileWriter/__init__.py:21 -#, fuzzy msgctxt "@item:inlistbox" msgid "Cura Profile" msgstr "Cura-profiili" #: /home/tamara/2.1/Cura/plugins/XRayView/__init__.py:12 -#, fuzzy msgctxt "@label" msgid "X-Ray View" msgstr "Kerrosnäkymä" #: /home/tamara/2.1/Cura/plugins/XRayView/__init__.py:15 -#, fuzzy msgctxt "@info:whatsthis" msgid "Provides the X-Ray view." msgstr "Näyttää kerrosnäkymän." @@ -173,13 +166,11 @@ msgid "Provides removable drive hotplugging and writing support" msgstr "Tukee irrotettavan aseman kytkemistä lennossa ja sille kirjoittamista" #: /home/tamara/2.1/Cura/plugins/ChangeLogPlugin/ChangeLog.py:34 -#, fuzzy msgctxt "@item:inmenu" msgid "Show Changelog" msgstr "Näytä muutosloki" #: /home/tamara/2.1/Cura/plugins/ChangeLogPlugin/__init__.py:12 -#, fuzzy msgctxt "@label" msgid "Changelog" msgstr "Muutosloki" @@ -206,7 +197,6 @@ msgid "CuraEngine Backend" msgstr "CuraEngine-taustaosa" #: /home/tamara/2.1/Cura/plugins/CuraEngineBackend/__init__.py:15 -#, fuzzy msgctxt "@info:whatsthis" msgid "Provides the link to the CuraEngine slicing backend" msgstr "Linkki CuraEngine-viipalointiin taustalla" @@ -222,7 +212,6 @@ msgid "Writes GCode to a file" msgstr "Kirjoittaa GCodea tiedostoon" #: /home/tamara/2.1/Cura/plugins/GCodeWriter/__init__.py:22 -#, fuzzy msgctxt "@item:inlistbox" msgid "GCode File" msgstr "GCode-tiedosto" @@ -233,7 +222,6 @@ msgid "Firmware" msgstr "Laiteohjelmisto" #: /home/tamara/2.1/Cura/plugins/USBPrinting/USBPrinterManager.py:50 -#, fuzzy msgctxt "@item:inmenu" msgid "Update Firmware" msgstr "Päivitä laiteohjelmisto" @@ -291,19 +279,16 @@ msgid "Submits anonymous slice info. Can be disabled through preferences." msgstr "Lähettää anonyymiä viipalointitietoa. Voidaan lisäasetuksista kytkeä pois käytöstä." #: /home/tamara/2.1/Cura/plugins/CuraProfileWriter/__init__.py:12 -#, fuzzy msgctxt "@label" msgid "Cura Profile Writer" msgstr "Cura-profiilin kirjoitin" #: /home/tamara/2.1/Cura/plugins/CuraProfileWriter/__init__.py:15 -#, fuzzy msgctxt "@info:whatsthis" msgid "Provides support for exporting Cura profiles." msgstr "Tukee Cura-profiilien vientiä." #: /home/tamara/2.1/Cura/plugins/ImageReader/__init__.py:12 -#, fuzzy msgctxt "@label" msgid "Image Reader" msgstr "Kuvanlukija" @@ -339,37 +324,31 @@ msgid "GIF Image" msgstr "GIF-kuva" #: /home/tamara/2.1/Cura/plugins/GCodeProfileReader/__init__.py:12 -#, fuzzy msgctxt "@label" msgid "GCode Profile Reader" msgstr "GCode-profiilin lukija" #: /home/tamara/2.1/Cura/plugins/GCodeProfileReader/__init__.py:15 -#, fuzzy msgctxt "@info:whatsthis" msgid "Provides support for importing profiles from g-code files." msgstr "Tukee profiilien tuontia GCode-tiedostoista." #: /home/tamara/2.1/Cura/plugins/GCodeProfileReader/__init__.py:21 -#, fuzzy msgctxt "@item:inlistbox" msgid "G-code File" msgstr "GCode-tiedosto" #: /home/tamara/2.1/Cura/plugins/SolidView/__init__.py:12 -#, fuzzy msgctxt "@label" msgid "Solid View" msgstr "Kiinteä näkymä" #: /home/tamara/2.1/Cura/plugins/SolidView/__init__.py:15 -#, fuzzy msgctxt "@info:whatsthis" msgid "Provides a normal solid mesh view." msgstr "Näyttää normaalin kiinteän verkkonäkymän." #: /home/tamara/2.1/Cura/plugins/SolidView/__init__.py:19 -#, fuzzy msgctxt "@item:inmenu" msgid "Solid" msgstr "Kiinteä" @@ -405,13 +384,11 @@ msgid "Per Object Settings Tool" msgstr "Kappalekohtaisten asetusten työkalu" #: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/__init__.py:15 -#, fuzzy msgctxt "@info:whatsthis" msgid "Provides the Per Object Settings." msgstr "Näyttää kappalekohtaiset asetukset." #: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/__init__.py:19 -#, fuzzy msgctxt "@label" msgid "Per Object Settings" msgstr "Kappalekohtaiset asetukset" @@ -427,7 +404,6 @@ msgid "Legacy Cura Profile Reader" msgstr "Aikaisempien Cura-profiilien lukija" #: /home/tamara/2.1/Cura/plugins/LegacyProfileReader/__init__.py:15 -#, fuzzy msgctxt "@info:whatsthis" msgid "Provides support for importing profiles from legacy Cura versions." msgstr "Tukee profiilien tuontia aikaisemmista Cura-versioista." @@ -443,19 +419,16 @@ msgid "Firmware Update" msgstr "Laiteohjelmiston päivitys" #: /home/tamara/2.1/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:38 -#, fuzzy msgctxt "@label" msgid "Starting firmware update, this may take a while." msgstr "Käynnistetään laiteohjelmiston päivitystä, mikä voi kestää hetken." #: /home/tamara/2.1/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:43 -#, fuzzy msgctxt "@label" msgid "Firmware update completed." msgstr "Laiteohjelmiston päivitys suoritettu." #: /home/tamara/2.1/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:48 -#, fuzzy msgctxt "@label" msgid "Updating firmware." msgstr "Päivitetään laiteohjelmistoa." @@ -463,7 +436,6 @@ msgstr "Päivitetään laiteohjelmistoa." #: /home/tamara/2.1/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:80 #: /home/tamara/2.1/Cura/resources/qml/EngineLog.qml:38 #: /home/tamara/2.1/Cura/resources/qml/AboutDialog.qml:74 -#, fuzzy msgctxt "@action:button" msgid "Close" msgstr "Sulje" @@ -474,19 +446,16 @@ msgid "Print with USB" msgstr "Tulostus USB:n kautta" #: /home/tamara/2.1/Cura/plugins/USBPrinting/ControlWindow.qml:28 -#, fuzzy msgctxt "@label" msgid "Extruder Temperature %1" msgstr "Suulakkeen lämpötila %1" #: /home/tamara/2.1/Cura/plugins/USBPrinting/ControlWindow.qml:33 -#, fuzzy msgctxt "@label" msgid "Bed Temperature %1" msgstr "Pöydän lämpötila %1" #: /home/tamara/2.1/Cura/plugins/USBPrinting/ControlWindow.qml:60 -#, fuzzy msgctxt "@action:button" msgid "Print" msgstr "Tulosta" @@ -495,7 +464,6 @@ msgstr "Tulosta" #: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:200 #: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:303 #: /home/tamara/2.1/Cura/resources/qml/LoadProfileDialog.qml:58 -#, fuzzy msgctxt "@action:button" msgid "Cancel" msgstr "Peruuta" @@ -592,7 +560,6 @@ msgid "Object profile" msgstr "Kappaleprofiili" #: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:126 -#, fuzzy msgctxt "@action:button" msgid "Add Setting" msgstr "Lisää asetus" @@ -618,19 +585,16 @@ msgid "0.0 m" msgstr "0,0 m" #: /home/tamara/2.1/Cura/resources/qml/JobSpecs.qml:218 -#, fuzzy msgctxt "@label" msgid "%1 m" msgstr "%1 m" #: /home/tamara/2.1/Cura/resources/qml/SidebarHeader.qml:29 -#, fuzzy msgctxt "@label:listbox" msgid "Print Job" msgstr "Tulostustyö" #: /home/tamara/2.1/Cura/resources/qml/SidebarHeader.qml:50 -#, fuzzy msgctxt "@label:listbox" msgid "Printer:" msgstr "Tulostin:" @@ -641,7 +605,6 @@ msgid "Nozzle:" msgstr "Suutin:" #: /home/tamara/2.1/Cura/resources/qml/Sidebar.qml:89 -#, fuzzy msgctxt "@label:listbox" msgid "Setup" msgstr "Asetukset" @@ -657,20 +620,17 @@ msgid "Advanced" msgstr "Laajennettu" #: /home/tamara/2.1/Cura/resources/qml/AddMachineWizard.qml:18 -#, fuzzy msgctxt "@title:window" msgid "Add Printer" msgstr "Lisää tulostin" #: /home/tamara/2.1/Cura/resources/qml/AddMachineWizard.qml:25 #: /home/tamara/2.1/Cura/resources/qml/WizardPages/AddMachine.qml:99 -#, fuzzy msgctxt "@title" msgid "Add Printer" msgstr "Lisää tulostin" #: /home/tamara/2.1/Cura/resources/qml/LoadProfileDialog.qml:15 -#, fuzzy msgctxt "@title:window" msgid "Load profile" msgstr "Lataa profiili" @@ -689,7 +649,6 @@ msgid "Show details." msgstr "Näytä tiedot." #: /home/tamara/2.1/Cura/resources/qml/LoadProfileDialog.qml:50 -#, fuzzy msgctxt "@action:button" msgid "Merge settings" msgstr "Yhdistä asetukset" @@ -700,13 +659,11 @@ msgid "Reset profile" msgstr "Nollaa profiili" #: /home/tamara/2.1/Cura/resources/qml/ProfileSetup.qml:28 -#, fuzzy msgctxt "@label" msgid "Profile:" msgstr "Profiili:" #: /home/tamara/2.1/Cura/resources/qml/EngineLog.qml:15 -#, fuzzy msgctxt "@title:window" msgid "Engine Log" msgstr "Moottorin loki" @@ -717,67 +674,56 @@ msgid "Toggle Fu&ll Screen" msgstr "Vaihda &koko näyttöön" #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:57 -#, fuzzy msgctxt "@action:inmenu menubar:edit" msgid "&Undo" msgstr "&Kumoa" #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:65 -#, fuzzy msgctxt "@action:inmenu menubar:edit" msgid "&Redo" msgstr "Tee &uudelleen" #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:73 -#, fuzzy msgctxt "@action:inmenu menubar:file" msgid "&Quit" msgstr "&Lopeta" #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:81 -#, fuzzy msgctxt "@action:inmenu menubar:settings" msgid "&Preferences..." msgstr "&Lisäasetukset..." #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:88 -#, fuzzy msgctxt "@action:inmenu menubar:printer" msgid "&Add Printer..." msgstr "L&isää tulostin..." #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:94 -#, fuzzy msgctxt "@action:inmenu menubar:printer" msgid "Manage Pr&inters..." msgstr "Tulostinten &hallinta..." #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:101 -#, fuzzy msgctxt "@action:inmenu menubar:profile" msgid "Manage Profiles..." msgstr "Profiilien hallinta..." #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:108 -#, fuzzy msgctxt "@action:inmenu menubar:help" msgid "Show Online &Documentation" msgstr "Näytä sähköinen &dokumentaatio" #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:115 -#, fuzzy msgctxt "@action:inmenu menubar:help" msgid "Report a &Bug" msgstr "Ilmoita &virheestä" #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:122 -#, fuzzy msgctxt "@action:inmenu menubar:help" msgid "&About..." msgstr "Ti&etoja..." #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:129 -#, fuzzy msgctxt "@action:inmenu menubar:edit" msgid "Delete &Selection" msgstr "&Poista valinta" @@ -793,19 +739,16 @@ msgid "Ce&nter Object on Platform" msgstr "K&eskitä kappale alustalle" #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:150 -#, fuzzy msgctxt "@action:inmenu menubar:edit" msgid "&Group Objects" msgstr "&Ryhmitä kappaleet" #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:158 -#, fuzzy msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Objects" msgstr "Pura kappaleiden ryhmitys" #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:166 -#, fuzzy msgctxt "@action:inmenu menubar:edit" msgid "&Merge Objects" msgstr "&Yhdistä kappaleet" @@ -816,37 +759,31 @@ msgid "&Duplicate Object" msgstr "&Monista kappale" #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:181 -#, fuzzy msgctxt "@action:inmenu menubar:edit" msgid "&Clear Build Platform" msgstr "&Tyhjennä alusta" #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:189 -#, fuzzy msgctxt "@action:inmenu menubar:file" msgid "Re&load All Objects" msgstr "&Lataa kaikki kappaleet uudelleen" #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:196 -#, fuzzy msgctxt "@action:inmenu menubar:edit" msgid "Reset All Object Positions" msgstr "Nollaa kaikkien kappaleiden sijainnit" #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:202 -#, fuzzy msgctxt "@action:inmenu menubar:edit" msgid "Reset All Object &Transformations" msgstr "Nollaa kaikkien kappaleiden m&uunnokset" #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:208 -#, fuzzy msgctxt "@action:inmenu menubar:file" msgid "&Open File..." msgstr "&Avaa tiedosto..." #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:216 -#, fuzzy msgctxt "@action:inmenu menubar:help" msgid "Show Engine &Log..." msgstr "Näytä moottorin l&oki" @@ -862,7 +799,6 @@ msgid "Hollow" msgstr "Ontto" #: /home/tamara/2.1/Cura/resources/qml/SidebarSimple.qml:239 -#, fuzzy msgctxt "@label" msgid "No (0%) infill will leave your model hollow at the cost of low strength" msgstr "Ei (0 %) täyttöä jättää mallin ontoksi ja lujuudeltaan alhaiseksi" @@ -873,7 +809,6 @@ msgid "Light" msgstr "Harva" #: /home/tamara/2.1/Cura/resources/qml/SidebarSimple.qml:245 -#, fuzzy msgctxt "@label" msgid "Light (20%) infill will give your model an average strength" msgstr "Harva (20 %) täyttö antaa mallille keskimääräisen lujuuden" @@ -934,7 +869,6 @@ msgid "General" msgstr "Yleiset" #: /home/tamara/2.1/Cura/resources/qml/GeneralPage.qml:51 -#, fuzzy msgctxt "@label" msgid "Language:" msgstr "Kieli:" @@ -982,14 +916,12 @@ msgid "Ensure objects are kept apart" msgstr "Pidä kappaleet erillään" #: /home/tamara/2.1/Cura/resources/qml/GeneralPage.qml:131 -#, fuzzy msgctxt "@info:tooltip" msgid "" "Should opened files be scaled to the build volume if they are too large?" msgstr "Pitäisikö avoimia tiedostoja skaalata rakennustilavuuteen, jos ne ovat liian isoja?" #: /home/tamara/2.1/Cura/resources/qml/GeneralPage.qml:136 -#, fuzzy msgctxt "@option:check" msgid "Scale large files" msgstr "Skaalaa isot tiedostot" @@ -1003,13 +935,11 @@ msgid "" msgstr "Pitäisikö anonyymejä tietoja tulosteesta lähettää Ultimakerille? Huomaa, että malleja, IP-osoitteita tai muita henkilökohtaisia tietoja ei lähetetä eikä tallenneta." #: /home/tamara/2.1/Cura/resources/qml/GeneralPage.qml:150 -#, fuzzy msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "Lähetä (anonyymit) tulostustiedot" #: /home/tamara/2.1/Cura/resources/qml/ViewPage.qml:16 -#, fuzzy msgctxt "@title:window" msgid "View" msgstr "Näytä" @@ -1022,7 +952,6 @@ msgid "" msgstr "Korostaa mallin vailla tukea olevat alueet punaisella. Ilman tukea nämä alueet eivät tulostu kunnolla." #: /home/tamara/2.1/Cura/resources/qml/ViewPage.qml:42 -#, fuzzy msgctxt "@option:check" msgid "Display overhang" msgstr "Näytä uloke" @@ -1156,7 +1085,6 @@ msgid "Extruder driver ugrades" msgstr "Suulakekäytön päivitykset" #: /home/tamara/2.1/Cura/resources/qml/WizardPages/SelectUpgradedParts.qml:63 -#, fuzzy msgctxt "@option:check" msgid "Heated printer bed" msgstr "Lämmitetty tulostinpöytä" @@ -1176,7 +1104,6 @@ msgid "" msgstr "Jos olet hankkinut Ultimakerin lokakuun 2012 jälkeen, sinulla on suulakekäytön päivityspaketti (Extruder drive). Ellei sinulla ole tätä päivitystä, sitä suositellaan luotettavuuden parantamiseksi. Tämä päivityspaketti voidaan ostaa Ultimakerin verkkokaupasta, ja se löytyy thingiverse-sivustolta numerolla 26094" #: /home/tamara/2.1/Cura/resources/qml/WizardPages/AddMachine.qml:108 -#, fuzzy msgctxt "@label" msgid "Please select the type of printer:" msgstr "Valitse tulostimen tyyppi:" @@ -1189,7 +1116,6 @@ msgid "" msgstr "Tämä tulostimen nimi on jo käytössä. Valitse toinen tulostimen nimi." #: /home/tamara/2.1/Cura/resources/qml/WizardPages/AddMachine.qml:245 -#, fuzzy msgctxt "@label:textbox" msgid "Printer Name:" msgstr "Tulostimen nimi:" @@ -1284,7 +1210,6 @@ msgid "Preparing to slice..." msgstr "Valmistellaan viipalointia..." #: /home/tamara/2.1/Cura/resources/qml/SaveButton.qml:28 -#, fuzzy msgctxt "@label:PrintjobStatus" msgid "Slicing..." msgstr "Viipaloidaan..." @@ -1316,165 +1241,149 @@ msgid "" msgstr "Cura-ohjelman on kehittänyt Ultimaker B.V. yhteistyössä käyttäjäyhteisön kanssa." #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:16 -#, fuzzy msgctxt "@title:window" msgid "Cura" msgstr "Cura" #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:53 -#, fuzzy msgctxt "@title:menu menubar:toplevel" msgid "&File" msgstr "&Tiedosto" #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:62 -#, fuzzy msgctxt "@title:menu menubar:file" msgid "Open &Recent" msgstr "Avaa &viimeisin" #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:92 -#, fuzzy msgctxt "@action:inmenu menubar:file" msgid "&Save Selection to File" msgstr "&Tallenna valinta tiedostoon" #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:100 -#, fuzzy msgctxt "@title:menu menubar:file" msgid "Save &All" msgstr "Tallenna &kaikki" #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:128 -#, fuzzy msgctxt "@title:menu menubar:toplevel" msgid "&Edit" msgstr "&Muokkaa" #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:145 -#, fuzzy msgctxt "@title:menu menubar:toplevel" msgid "&View" msgstr "&Näytä" #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:167 -#, fuzzy msgctxt "@title:menu menubar:toplevel" msgid "&Printer" msgstr "&Tulostin" #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:213 -#, fuzzy msgctxt "@title:menu menubar:toplevel" msgid "P&rofile" msgstr "&Profiili" #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:240 -#, fuzzy msgctxt "@title:menu menubar:toplevel" msgid "E&xtensions" msgstr "Laa&jennukset" #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:273 -#, fuzzy msgctxt "@title:menu menubar:toplevel" msgid "&Settings" msgstr "&Asetukset" #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:281 -#, fuzzy msgctxt "@title:menu menubar:toplevel" msgid "&Help" msgstr "&Ohje" #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:366 -#, fuzzy msgctxt "@action:button" msgid "Open File" msgstr "Avaa tiedosto" #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:410 -#, fuzzy msgctxt "@action:button" msgid "View Mode" msgstr "Näyttötapa" #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:495 -#, fuzzy msgctxt "@title:tab" msgid "View" msgstr "Näytä" #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:644 -#, fuzzy msgctxt "@title:window" msgid "Open file" msgstr "Avaa tiedosto" -#~ msgctxt "@label" -#~ msgid "Variant:" -#~ msgstr "Variantti:" +msgctxt "@label" +msgid "Variant:" +msgstr "Variantti:" -#~ msgctxt "@label" -#~ msgid "Global Profile:" -#~ msgstr "Yleisprofiili:" +msgctxt "@label" +msgid "Global Profile:" +msgstr "Yleisprofiili:" -#~ msgctxt "@option:check" -#~ msgid "Heated printer bed (standard kit)" -#~ msgstr "Lämmitetty tulostinpöytä (normaali sarja)" +msgctxt "@option:check" +msgid "Heated printer bed (standard kit)" +msgstr "Lämmitetty tulostinpöytä (normaali sarja)" -#~ msgctxt "@option:check" -#~ msgid "Dual extrusion (experimental)" -#~ msgstr "Kaksoispursotus (kokeellinen)" +msgctxt "@option:check" +msgid "Dual extrusion (experimental)" +msgstr "Kaksoispursotus (kokeellinen)" -#~ msgctxt "@item:inlistbox" -#~ msgid "Bulgarian" -#~ msgstr "bulgaria" +msgctxt "@item:inlistbox" +msgid "Bulgarian" +msgstr "Bulgaria" -#~ msgctxt "@item:inlistbox" -#~ msgid "Czech" -#~ msgstr "tsekki" +msgctxt "@item:inlistbox" +msgid "Czech" +msgstr "Tsekki" -#~ msgctxt "@item:inlistbox" -#~ msgid "Italian" -#~ msgstr "italia" +msgctxt "@item:inlistbox" +msgid "Italian" +msgstr "Italia" -#~ msgctxt "@item:inlistbox" -#~ msgid "Russian" -#~ msgstr "venäjä" +msgctxt "@item:inlistbox" +msgid "Russian" +msgstr "Venäjä" -#~ msgctxt "@item:inlistbox" -#~ msgid "Spanish" -#~ msgstr "espanja" +msgctxt "@item:inlistbox" +msgid "Spanish" +msgstr "Espanja" -#~ msgctxt "@label:textbox" -#~ msgid "Printjob Name" -#~ msgstr "Tulostustyön nimi" +msgctxt "@label:textbox" +msgid "Printjob Name" +msgstr "Tulostustyön nimi" -#~ msgctxt "@label" -#~ msgid "Sparse" -#~ msgstr "Harva" +msgctxt "@label" +msgid "Sparse" +msgstr "Harva" -#~ msgctxt "@option:check" -#~ msgid "Enable Skirt Adhesion" -#~ msgstr "Ota helman tarttuvuus käyttöön" +msgctxt "@option:check" +msgid "Enable Skirt Adhesion" +msgstr "Ota helman tarttuvuus käyttöön" -#~ msgctxt "@option:check" -#~ msgid "Enable Support" -#~ msgstr "Ota tuki käyttöön" +msgctxt "@option:check" +msgid "Enable Support" +msgstr "Ota tuki käyttöön" -#~ msgctxt "@label:listbox" -#~ msgid "Machine:" -#~ msgstr "Laite:" +msgctxt "@label:listbox" +msgid "Machine:" +msgstr "Laite:" -#~ msgctxt "@title:menu" -#~ msgid "&Machine" -#~ msgstr "&Laite" +msgctxt "@title:menu" +msgid "&Machine" +msgstr "&Laite" -#~ msgctxt "Save button tooltip" -#~ msgid "Save to Disk" -#~ msgstr "Tallenna levylle" +msgctxt "Save button tooltip" +msgid "Save to Disk" +msgstr "Tallenna levylle" -#~ msgctxt "Message action tooltip, {0} is sdcard" -#~ msgid "Eject SD Card {0}" -#~ msgstr "Poista SD-kortti {0}" +msgctxt "Message action tooltip, {0} is sdcard" +msgid "Eject SD Card {0}" +msgstr "Poista SD-kortti {0}" diff --git a/resources/i18n/fi/fdmprinter.json.po b/resources/i18n/fi/fdmprinter.json.po index ce2c0218bc..9c04e46803 100644 --- a/resources/i18n/fi/fdmprinter.json.po +++ b/resources/i18n/fi/fdmprinter.json.po @@ -1,4 +1,3 @@ -#, fuzzy msgid "" msgstr "" "Project-Id-Version: Cura 2.1 json setting files\n" @@ -20,13 +19,11 @@ msgid "Machine" msgstr "Laite" #: fdmprinter.json -#, fuzzy msgctxt "machine_nozzle_size label" msgid "Nozzle Diameter" msgstr "Suuttimen läpimitta" #: fdmprinter.json -#, fuzzy msgctxt "machine_nozzle_size description" msgid "The inner diameter of the nozzle." msgstr "Suuttimen sisäläpimitta." @@ -82,7 +79,6 @@ msgid "Wall Line Width" msgstr "Seinämälinjan leveys" #: fdmprinter.json -#, fuzzy msgctxt "wall_line_width description" msgid "" "Width of a single shell line. Each line of the shell will be printed with " @@ -128,7 +124,6 @@ msgid "Top/bottom line width" msgstr "Ylä-/alalinjan leveys" #: fdmprinter.json -#, fuzzy msgctxt "skin_line_width description" msgid "" "Width of a single top/bottom printed line, used to fill up the top/bottom " @@ -204,7 +199,6 @@ msgid "Wall Line Count" msgstr "Seinämälinjaluku" #: fdmprinter.json -#, fuzzy msgctxt "wall_line_count description" msgid "" "Number of shell lines. These lines are called perimeter lines in other tools " @@ -230,7 +224,6 @@ msgid "Bottom/Top Thickness" msgstr "Ala-/yläosan paksuus" #: fdmprinter.json -#, fuzzy msgctxt "top_bottom_thickness description" msgid "" "This controls the thickness of the bottom and top layers. The number of " @@ -245,7 +238,6 @@ msgid "Top Thickness" msgstr "Yläosan paksuus" #: fdmprinter.json -#, fuzzy msgctxt "top_thickness description" msgid "" "This controls the thickness of the top layers. The number of solid layers " @@ -260,7 +252,6 @@ msgid "Top Layers" msgstr "Yläkerrokset" #: fdmprinter.json -#, fuzzy msgctxt "top_layers description" msgid "This controls the number of top layers." msgstr "Tällä säädetään yläkerrosten lukumäärä." @@ -375,7 +366,6 @@ msgid "Bottom/Top Pattern" msgstr "Ala-/yläkuvio" #: fdmprinter.json -#, fuzzy msgctxt "top_bottom_pattern description" msgid "" "Pattern of the top/bottom solid fill. This is normally done with lines to " @@ -399,13 +389,11 @@ msgid "Zig Zag" msgstr "Siksak" #: fdmprinter.json -#, fuzzy msgctxt "skin_no_small_gaps_heuristic label" msgid "Ignore small Z gaps" msgstr "Ohita pienet Z-raot" #: fdmprinter.json -#, fuzzy msgctxt "skin_no_small_gaps_heuristic description" msgid "" "When the model has small vertical gaps, about 5% extra computation time can " @@ -419,7 +407,6 @@ msgid "Alternate Skin Rotation" msgstr "Vuorottele pintakalvon pyöritystä" #: fdmprinter.json -#, fuzzy msgctxt "skin_alternate_rotation description" msgid "" "Alternate between diagonal skin fill and horizontal + vertical skin fill. " @@ -433,7 +420,6 @@ msgid "Extra Skin Wall Count" msgstr "Pintakalvojen ulkopuolisten lisäseinämien määrä" #: fdmprinter.json -#, fuzzy msgctxt "skin_outline_count description" msgid "" "Number of lines around skin regions. Using one or two skin perimeter lines " @@ -446,7 +432,6 @@ msgid "Horizontal expansion" msgstr "Vaakalaajennus" #: fdmprinter.json -#, fuzzy msgctxt "xy_offset description" msgid "" "Amount of offset applied to all polygons in each layer. Positive values can " @@ -460,7 +445,6 @@ msgid "Z Seam Alignment" msgstr "Z-sauman kohdistus" #: fdmprinter.json -#, fuzzy msgctxt "z_seam_type description" msgid "" "Starting point of each path in a layer. When paths in consecutive layers " @@ -496,7 +480,6 @@ msgid "Infill Density" msgstr "Täytön tiheys" #: fdmprinter.json -#, fuzzy msgctxt "infill_sparse_density description" msgid "" "This controls how densely filled the insides of your print will be. For a " @@ -521,7 +504,6 @@ msgid "Infill Pattern" msgstr "Täyttökuvio" #: fdmprinter.json -#, fuzzy msgctxt "infill_pattern description" msgid "" "Cura defaults to switching between grid and line infill, but with this " @@ -541,7 +523,6 @@ msgid "Lines" msgstr "Linjat" #: fdmprinter.json -#, fuzzy msgctxt "infill_pattern option triangles" msgid "Triangles" msgstr "Kolmiot" @@ -557,13 +538,11 @@ msgid "Zig Zag" msgstr "Siksak" #: fdmprinter.json -#, fuzzy msgctxt "infill_overlap label" msgid "Infill Overlap" msgstr "Täytön limitys" #: fdmprinter.json -#, fuzzy msgctxt "infill_overlap description" msgid "" "The amount of overlap between the infill and the walls. A slight overlap " @@ -576,7 +555,6 @@ msgid "Infill Wipe Distance" msgstr "Täyttöliikkeen etäisyys" #: fdmprinter.json -#, fuzzy msgctxt "infill_wipe_dist description" msgid "" "Distance of a travel move inserted after every infill line, to make the " @@ -585,7 +563,6 @@ msgid "" msgstr "Siirtoliikkeen pituus jokaisen täyttölinjan jälkeen, jotta täyttö tarttuu seinämiin paremmin. Tämä vaihtoehto on samanlainen kuin täytön limitys, mutta ilman pursotusta ja tapahtuu vain toisessa päässä täyttölinjaa." #: fdmprinter.json -#, fuzzy msgctxt "infill_sparse_thickness label" msgid "Infill Thickness" msgstr "Täytön paksuus" @@ -618,7 +595,6 @@ msgid "Material" msgstr "Materiaali" #: fdmprinter.json -#, fuzzy msgctxt "material_flow_dependent_temperature label" msgid "Auto Temperature" msgstr "Automaattinen lämpötila" @@ -644,7 +620,6 @@ msgid "" msgstr "Tulostuksessa käytettävä lämpötila. Aseta nollaan, jos hoidat esilämmityksen itse. PLA:lla käytetään\nyleensä arvoa 210 °C. ABS-muovilla tarvitaan arvo 230 °C tai korkeampi." #: fdmprinter.json -#, fuzzy msgctxt "material_flow_temp_graph label" msgid "Flow Temperature Graph" msgstr "Virtauksen lämpötilakaavio" @@ -657,7 +632,6 @@ msgid "" msgstr "Tiedot, jotka yhdistävät materiaalivirran (mm3 sekunnissa) lämpötilaan (celsiusastetta)." #: fdmprinter.json -#, fuzzy msgctxt "material_standby_temperature label" msgid "Standby Temperature" msgstr "Valmiustilan lämpötila" @@ -699,7 +673,6 @@ msgid "Diameter" msgstr "Läpimitta" #: fdmprinter.json -#, fuzzy msgctxt "material_diameter description" msgid "" "The diameter of your filament needs to be measured as accurately as " @@ -738,7 +711,6 @@ msgid "Retraction Distance" msgstr "Takaisinvetoetäisyys" #: fdmprinter.json -#, fuzzy msgctxt "retraction_amount description" msgid "" "The amount of retraction: Set at 0 for no retraction at all. A value of " @@ -786,7 +758,6 @@ msgid "Retraction Extra Prime Amount" msgstr "Takaisinvedon esitäytön lisäys" #: fdmprinter.json -#, fuzzy msgctxt "retraction_extra_prime_amount description" msgid "" "The amount of material extruded after a retraction. During a travel move, " @@ -799,7 +770,6 @@ msgid "Retraction Minimum Travel" msgstr "Takaisinvedon minimiliike" #: fdmprinter.json -#, fuzzy msgctxt "retraction_min_travel description" msgid "" "The minimum distance of travel needed for a retraction to happen at all. " @@ -807,13 +777,11 @@ msgid "" msgstr "Tarvittavan siirtoliikkeen minimietäisyys, jotta takaisinveto yleensäkin tapahtuu. Tällä varmistetaan, ettei takaisinvetoja tapahdu runsaasti pienellä alueella." #: fdmprinter.json -#, fuzzy msgctxt "retraction_count_max label" msgid "Maximum Retraction Count" msgstr "Takaisinvedon maksimiluku" #: fdmprinter.json -#, fuzzy msgctxt "retraction_count_max description" msgid "" "This setting limits the number of retractions occurring within the Minimum " @@ -823,13 +791,11 @@ msgid "" msgstr "Tämä asetus rajoittaa pursotuksen minimietäisyyden ikkunassa tapahtuvien takaisinvetojen lukumäärää. Muut tämän ikkunan takaisinvedot jätetään huomiotta. Tällä vältetään toistuvat takaisinvedot samalla tulostuslangan osalla, sillä tällöin lanka voi litistyä ja aiheuttaa hiertymisongelmia." #: fdmprinter.json -#, fuzzy msgctxt "retraction_extrusion_window label" msgid "Minimum Extrusion Distance Window" msgstr "Pursotuksen minimietäisyyden ikkuna" #: fdmprinter.json -#, fuzzy msgctxt "retraction_extrusion_window description" msgid "" "The window in which the Maximum Retraction Count is enforced. This value " @@ -844,7 +810,6 @@ msgid "Z Hop when Retracting" msgstr "Z-hyppy takaisinvedossa" #: fdmprinter.json -#, fuzzy msgctxt "retraction_hop description" msgid "" "Whenever a retraction is done, the head is lifted by this amount to travel " @@ -889,7 +854,6 @@ msgid "Shell Speed" msgstr "Kuoren nopeus" #: fdmprinter.json -#, fuzzy msgctxt "speed_wall description" msgid "" "The speed at which the shell is printed. Printing the outer shell at a lower " @@ -902,7 +866,6 @@ msgid "Outer Shell Speed" msgstr "Ulkokuoren nopeus" #: fdmprinter.json -#, fuzzy msgctxt "speed_wall_0 description" msgid "" "The speed at which the outer shell is printed. Printing the outer shell at a " @@ -917,7 +880,6 @@ msgid "Inner Shell Speed" msgstr "Sisäkuoren nopeus" #: fdmprinter.json -#, fuzzy msgctxt "speed_wall_x description" msgid "" "The speed at which all inner shells are printed. Printing the inner shell " @@ -944,7 +906,6 @@ msgid "Support Speed" msgstr "Tukirakenteen nopeus" #: fdmprinter.json -#, fuzzy msgctxt "speed_support description" msgid "" "The speed at which exterior support is printed. Printing exterior supports " @@ -959,7 +920,6 @@ msgid "Support Wall Speed" msgstr "Tukiseinämän nopeus" #: fdmprinter.json -#, fuzzy msgctxt "speed_support_lines description" msgid "" "The speed at which the walls of exterior support are printed. Printing the " @@ -972,7 +932,6 @@ msgid "Support Roof Speed" msgstr "Tukikaton nopeus" #: fdmprinter.json -#, fuzzy msgctxt "speed_support_roof description" msgid "" "The speed at which the roofs of exterior support are printed. Printing the " @@ -985,7 +944,6 @@ msgid "Travel Speed" msgstr "Siirtoliikkeen nopeus" #: fdmprinter.json -#, fuzzy msgctxt "speed_travel description" msgid "" "The speed at which travel moves are done. A well-built Ultimaker can reach " @@ -998,7 +956,6 @@ msgid "Bottom Layer Speed" msgstr "Pohjakerroksen nopeus" #: fdmprinter.json -#, fuzzy msgctxt "speed_layer_0 description" msgid "" "The print speed for the bottom layer: You want to print the first layer " @@ -1011,7 +968,6 @@ msgid "Skirt Speed" msgstr "Helman nopeus" #: fdmprinter.json -#, fuzzy msgctxt "skirt_speed description" msgid "" "The speed at which the skirt and brim are printed. Normally this is done at " @@ -1020,13 +976,11 @@ msgid "" msgstr "Nopeus, jolla helma ja reunus tulostetaan. Yleensä se tehdään alkukerroksen nopeudella. Joskus helma halutaan kuitenkin tulostaa eri nopeudella." #: fdmprinter.json -#, fuzzy msgctxt "speed_slowdown_layers label" msgid "Number of Slower Layers" msgstr "Hitaampien kerrosten määrä" #: fdmprinter.json -#, fuzzy msgctxt "speed_slowdown_layers description" msgid "" "The first few layers are printed slower than the rest of the object, this to " @@ -1046,7 +1000,6 @@ msgid "Enable Combing" msgstr "Ota pyyhkäisy käyttöön" #: fdmprinter.json -#, fuzzy msgctxt "retraction_combing description" msgid "" "Combing keeps the head within the interior of the print whenever possible " @@ -1106,7 +1059,6 @@ msgid "Minimal Volume Before Coasting" msgstr "Aineen minimimäärä ennen vapaaliukua" #: fdmprinter.json -#, fuzzy msgctxt "coasting_min_volume description" msgid "" "The least volume an extrusion path should have to coast the full amount. For " @@ -1121,7 +1073,6 @@ msgid "Coasting Speed" msgstr "Vapaaliukunopeus" #: fdmprinter.json -#, fuzzy msgctxt "coasting_speed description" msgid "" "The speed by which to move during coasting, relative to the speed of the " @@ -1208,7 +1159,6 @@ msgid "" msgstr "Kerroksen numero, jossa tuuletin toimii täysillä. Tätä alemmilla kerroksilla tuulettimen nopeutta muutetaan lineaarisesti siten, että tuuletin on pois käytöstä ensimmäisen kerroksen kohdalla." #: fdmprinter.json -#, fuzzy msgctxt "cool_min_layer_time label" msgid "Minimum Layer Time" msgstr "Kerroksen minimiaika" @@ -1223,13 +1173,11 @@ msgid "" msgstr "Kerrokseen käytetty minimiaika. Antaa kerrokselle aikaa jäähtyä ennen kuin seuraava tulostetaan päälle. Jos kerros tulostuisi lyhyemmässä ajassa, tulostin hidastaa nopeutta, jotta se käyttää vähintään näin monta sekuntia kerroksen tulostamiseen." #: fdmprinter.json -#, fuzzy msgctxt "cool_min_layer_time_fan_speed_max label" msgid "Minimum Layer Time Full Fan Speed" msgstr "Kerroksen minimiaika tuulettimen täydellä nopeudella" #: fdmprinter.json -#, fuzzy msgctxt "cool_min_layer_time_fan_speed_max description" msgid "" "The minimum time spent in a layer which will cause the fan to be at maximum " @@ -1287,7 +1235,6 @@ msgid "Placement" msgstr "Sijoituspaikka" #: fdmprinter.json -#, fuzzy msgctxt "support_type description" msgid "" "Where to place support structures. The placement can be restricted so that " @@ -1324,7 +1271,6 @@ msgid "X/Y Distance" msgstr "X/Y-etäisyys" #: fdmprinter.json -#, fuzzy msgctxt "support_xy_distance description" msgid "" "Distance of the support structure from the print in the X/Y directions. " @@ -1397,7 +1343,6 @@ msgid "Minimal Width" msgstr "Minimileveys" #: fdmprinter.json -#, fuzzy msgctxt "support_conical_min_width description" msgid "" "Minimal width to which conical support reduces the support areas. Small " @@ -1424,7 +1369,6 @@ msgid "Join Distance" msgstr "Liitosetäisyys" #: fdmprinter.json -#, fuzzy msgctxt "support_join_distance description" msgid "" "The maximum distance between support blocks in the X/Y directions, so that " @@ -1432,7 +1376,6 @@ msgid "" msgstr "Tukilohkojen välinen maksimietäisyys X- ja Y-suunnissa siten, että lohkot sulautuvat yhdeksi lohkoksi." #: fdmprinter.json -#, fuzzy msgctxt "support_offset label" msgid "Horizontal Expansion" msgstr "Vaakalaajennus" @@ -1450,7 +1393,6 @@ msgid "Area Smoothing" msgstr "Alueen tasoitus" #: fdmprinter.json -#, fuzzy msgctxt "support_area_smoothing description" msgid "" "Maximum distance in the X/Y directions of a line segment which is to be " @@ -1477,7 +1419,6 @@ msgid "Support Roof Thickness" msgstr "Tukikaton paksuus" #: fdmprinter.json -#, fuzzy msgctxt "support_roof_height description" msgid "The height of the support roofs." msgstr "Tukikattojen korkeus." @@ -1488,7 +1429,6 @@ msgid "Support Roof Density" msgstr "Tukikaton tiheys" #: fdmprinter.json -#, fuzzy msgctxt "support_roof_density description" msgid "" "This controls how densely filled the roofs of the support will be. A higher " @@ -1542,7 +1482,6 @@ msgid "Zig Zag" msgstr "Siksak" #: fdmprinter.json -#, fuzzy msgctxt "support_use_towers label" msgid "Use towers" msgstr "Käytä torneja" @@ -1556,13 +1495,11 @@ msgid "" msgstr "Pieniä ulokealueita tuetaan erityisillä torneilla. Näiden tornien läpimitta on niiden tukemaa aluetta suurempi. Ulokkeen lähellä tornien läpimitta pienenee muodostaen katon. " #: fdmprinter.json -#, fuzzy msgctxt "support_minimal_diameter label" msgid "Minimum Diameter" msgstr "Minimiläpimitta" #: fdmprinter.json -#, fuzzy msgctxt "support_minimal_diameter description" msgid "" "Minimum diameter in the X/Y directions of a small area which is to be " @@ -1575,7 +1512,6 @@ msgid "Tower Diameter" msgstr "Tornin läpimitta" #: fdmprinter.json -#, fuzzy msgctxt "support_tower_diameter description" msgid "The diameter of a special tower." msgstr "Erityistornin läpimitta." @@ -1586,7 +1522,6 @@ msgid "Tower Roof Angle" msgstr "Tornin kattokulma" #: fdmprinter.json -#, fuzzy msgctxt "support_tower_roof_angle description" msgid "" "The angle of the rooftop of a tower. Larger angles mean more pointy towers." @@ -1598,7 +1533,6 @@ msgid "Pattern" msgstr "Kuvio" #: fdmprinter.json -#, fuzzy msgctxt "support_pattern description" msgid "" "Cura can generate 3 distinct types of support structure. First is a grid " @@ -1646,13 +1580,11 @@ msgid "" msgstr "Yhdistää siksakit. Tekee niiden poistamisesta vaikeampaa, mutta estää erillisten siksakkien rihmoittumisen." #: fdmprinter.json -#, fuzzy msgctxt "support_infill_rate label" msgid "Fill Amount" msgstr "Täyttömäärä" #: fdmprinter.json -#, fuzzy msgctxt "support_infill_rate description" msgid "" "The amount of infill structure in the support; less infill gives weaker " @@ -1680,7 +1612,6 @@ msgid "Type" msgstr "Tyyppi" #: fdmprinter.json -#, fuzzy msgctxt "adhesion_type description" msgid "" "Different options that help to improve priming your extrusion.\n" @@ -1747,13 +1678,11 @@ msgid "" msgstr "Helman minimipituus. Jos tätä minimipituutta ei saavuteta, lisätään useampia helmalinjoja, jotta tähän minimipituuteen päästään. Huomaa: jos linjalukuna on 0, tämä jätetään huomiotta." #: fdmprinter.json -#, fuzzy msgctxt "brim_width label" msgid "Brim Width" msgstr "Reunuksen leveys" #: fdmprinter.json -#, fuzzy msgctxt "brim_width description" msgid "" "The distance from the model to the end of the brim. A larger brim sticks " @@ -1767,7 +1696,6 @@ msgid "Brim Line Count" msgstr "Reunuksen linjaluku" #: fdmprinter.json -#, fuzzy msgctxt "brim_line_count description" msgid "" "The number of lines used for a brim. More lines means a larger brim which " @@ -1802,13 +1730,11 @@ msgid "" msgstr "Rako pohjaristikon viimeisen kerroksen ja kappaleen ensimmäisen kerroksen välillä. Vain ensimmäistä kerrosta nostetaan tällä määrällä pohjaristikkokerroksen ja kappaleen välisen sidoksen vähentämiseksi. Se helpottaa pohjaristikon irti kuorimista." #: fdmprinter.json -#, fuzzy msgctxt "raft_surface_layers label" msgid "Raft Top Layers" msgstr "Pohjaristikon pintakerrokset" #: fdmprinter.json -#, fuzzy msgctxt "raft_surface_layers description" msgid "" "The number of top layers on top of the 2nd raft layer. These are fully " @@ -1817,25 +1743,21 @@ msgid "" msgstr "Pohjaristikon toisen kerroksen päällä olevien pintakerrosten lukumäärä. Ne ovat täysin täytettyjä kerroksia, joilla kappale lepää. Kaksi kerrosta tuottaa sileämmän pinnan kuin yksi kerros." #: fdmprinter.json -#, fuzzy msgctxt "raft_surface_thickness label" msgid "Raft Top Layer Thickness" msgstr "Pohjaristikon pintakerroksen paksuus" #: fdmprinter.json -#, fuzzy msgctxt "raft_surface_thickness description" msgid "Layer thickness of the top raft layers." msgstr "Pohjaristikon pintakerrosten kerrospaksuus." #: fdmprinter.json -#, fuzzy msgctxt "raft_surface_line_width label" msgid "Raft Top Line Width" msgstr "Pohjaristikon pinnan linjaleveys" #: fdmprinter.json -#, fuzzy msgctxt "raft_surface_line_width description" msgid "" "Width of the lines in the top surface of the raft. These can be thin lines " @@ -1843,13 +1765,11 @@ msgid "" msgstr "Pohjaristikon pintakerrosten linjojen leveys. Näiden tulisi olla ohuita linjoja, jotta pohjaristikon yläosasta tulee sileä." #: fdmprinter.json -#, fuzzy msgctxt "raft_surface_line_spacing label" msgid "Raft Top Spacing" msgstr "Pohjaristikon pinnan linjajako" #: fdmprinter.json -#, fuzzy msgctxt "raft_surface_line_spacing description" msgid "" "The distance between the raft lines for the top raft layers. The spacing " @@ -1857,25 +1777,21 @@ msgid "" msgstr "Pohjaristikon pintakerrosten linjojen välinen etäisyys. Linjajaon tulisi olla sama kuin linjaleveys, jotta pinta on kiinteä." #: fdmprinter.json -#, fuzzy msgctxt "raft_interface_thickness label" msgid "Raft Middle Thickness" msgstr "Pohjaristikon keskikerroksen paksuus" #: fdmprinter.json -#, fuzzy msgctxt "raft_interface_thickness description" msgid "Layer thickness of the middle raft layer." msgstr "Pohjaristikon keskikerroksen kerrospaksuus." #: fdmprinter.json -#, fuzzy msgctxt "raft_interface_line_width label" msgid "Raft Middle Line Width" msgstr "Pohjaristikon keskikerroksen linjaleveys" #: fdmprinter.json -#, fuzzy msgctxt "raft_interface_line_width description" msgid "" "Width of the lines in the middle raft layer. Making the second layer extrude " @@ -1883,13 +1799,11 @@ msgid "" msgstr "Pohjaristikon keskikerroksen linjojen leveys. Pursottamalla toiseen kerrokseen enemmän saa linjat tarttumaan pöytään." #: fdmprinter.json -#, fuzzy msgctxt "raft_interface_line_spacing label" msgid "Raft Middle Spacing" msgstr "Pohjaristikon keskikerroksen linjajako" #: fdmprinter.json -#, fuzzy msgctxt "raft_interface_line_spacing description" msgid "" "The distance between the raft lines for the middle raft layer. The spacing " @@ -1922,7 +1836,6 @@ msgid "" msgstr "Pohjaristikon pohjakerroksen linjojen leveys. Näiden tulisi olla paksuja linjoja auttamassa tarttuvuutta pöytään." #: fdmprinter.json -#, fuzzy msgctxt "raft_base_line_spacing label" msgid "Raft Line Spacing" msgstr "Pohjaristikon linjajako" @@ -1950,7 +1863,6 @@ msgid "Raft Surface Print Speed" msgstr "Pohjaristikon pinnan tulostusnopeus" #: fdmprinter.json -#, fuzzy msgctxt "raft_surface_speed description" msgid "" "The speed at which the surface raft layers are printed. These should be " @@ -1964,7 +1876,6 @@ msgid "Raft Interface Print Speed" msgstr "Pohjaristikon liittymän tulostusnopeus" #: fdmprinter.json -#, fuzzy msgctxt "raft_interface_speed description" msgid "" "The speed at which the interface raft layer is printed. This should be " @@ -1978,7 +1889,6 @@ msgid "Raft Base Print Speed" msgstr "Pohjaristikon pohjan tulostusnopeus" #: fdmprinter.json -#, fuzzy msgctxt "raft_base_speed description" msgid "" "The speed at which the base raft layer is printed. This should be printed " @@ -2055,7 +1965,6 @@ msgid "Draft Shield Limitation" msgstr "Vetosuojuksen rajoitus" #: fdmprinter.json -#, fuzzy msgctxt "draft_shield_height_limitation description" msgid "Whether or not to limit the height of the draft shield." msgstr "Määrittää, rajoitetaanko vetosuojuksen korkeutta." @@ -2093,7 +2002,6 @@ msgid "Union Overlapping Volumes" msgstr "Yhdistä limittyvät ainemäärät" #: fdmprinter.json -#, fuzzy msgctxt "meshfix_union_all description" msgid "" "Ignore the internal geometry arising from overlapping volumes and print the " @@ -2132,7 +2040,6 @@ msgid "Keep Disconnected Faces" msgstr "Pidä erilliset pinnat" #: fdmprinter.json -#, fuzzy msgctxt "meshfix_keep_open_polygons description" msgid "" "Normally Cura tries to stitch up small holes in the mesh and remove parts of " @@ -2152,7 +2059,6 @@ msgid "Print sequence" msgstr "Tulostusjärjestys" #: fdmprinter.json -#, fuzzy msgctxt "print_sequence description" msgid "" "Whether to print all objects one layer at a time or to wait for one object " @@ -2207,7 +2113,6 @@ msgid "Spiralize Outer Contour" msgstr "Kierukoi ulompi ääriviiva" #: fdmprinter.json -#, fuzzy msgctxt "magic_spiralize description" msgid "" "Spiralize smooths out the Z move of the outer edge. This will create a " @@ -2282,7 +2187,6 @@ msgid "" msgstr "Tulostetaan vain ulkopinta harvalla verkkorakenteella eli tulostetaan \"suoraan ilmaan\". Tämä toteutetaan tulostamalla mallin ääriviivat vaakasuoraan tietyin Z-välein, jotka yhdistetään ylöspäin menevillä linjoilla ja alaspäin menevillä diagonaalilinjoilla." #: fdmprinter.json -#, fuzzy msgctxt "wireframe_height label" msgid "WP Connection Height" msgstr "Rautalankatulostuksen liitoskorkeus" @@ -2320,7 +2224,6 @@ msgid "" msgstr "Nopeus, jolla suutin liikkuu materiaalia pursottaessaan. Koskee vain rautalankamallin tulostusta." #: fdmprinter.json -#, fuzzy msgctxt "wireframe_printspeed_bottom label" msgid "WP Bottom Printing Speed" msgstr "Rautalankapohjan tulostusnopeus" @@ -2333,7 +2236,6 @@ msgid "" msgstr "Nopeus, jolla tulostetaan ensimmäinen kerros, joka on ainoa alustaa koskettava kerros. Koskee vain rautalankamallin tulostusta." #: fdmprinter.json -#, fuzzy msgctxt "wireframe_printspeed_up label" msgid "WP Upward Printing Speed" msgstr "Rautalangan tulostusnopeus ylöspäin" @@ -2345,7 +2247,6 @@ msgid "" msgstr "Nopeus, jolla tulostetaan linja ylöspäin \"suoraan ilmaan\". Koskee vain rautalankamallin tulostusta." #: fdmprinter.json -#, fuzzy msgctxt "wireframe_printspeed_down label" msgid "WP Downward Printing Speed" msgstr "Rautalangan tulostusnopeus alaspäin" @@ -2357,7 +2258,6 @@ msgid "" msgstr "Nopeus, jolla tulostetaan linja diagonaalisesti alaspäin. Koskee vain rautalankamallin tulostusta." #: fdmprinter.json -#, fuzzy msgctxt "wireframe_printspeed_flat label" msgid "WP Horizontal Printing Speed" msgstr "Rautalangan tulostusnopeus vaakasuoraan" @@ -2403,7 +2303,6 @@ msgid "" msgstr "Virtauksen kompensointi tulostettaessa latteita linjoja. Koskee vain rautalankamallin tulostusta." #: fdmprinter.json -#, fuzzy msgctxt "wireframe_top_delay label" msgid "WP Top Delay" msgstr "Rautalankatulostuksen viive ylhäällä" @@ -2416,13 +2315,11 @@ msgid "" msgstr "Viive nousuliikkeen jälkeen, jotta linja voi kovettua. Koskee vain rautalankamallin tulostusta." #: fdmprinter.json -#, fuzzy msgctxt "wireframe_bottom_delay label" msgid "WP Bottom Delay" msgstr "Rautalankatulostuksen viive alhaalla" #: fdmprinter.json -#, fuzzy msgctxt "wireframe_bottom_delay description" msgid "Delay time after a downward move. Only applies to Wire Printing." msgstr "Viive laskuliikkeen jälkeen. Koskee vain rautalankamallin tulostusta." @@ -2433,7 +2330,6 @@ msgid "WP Flat Delay" msgstr "Rautalankatulostuksen lattea viive" #: fdmprinter.json -#, fuzzy msgctxt "wireframe_flat_delay description" msgid "" "Delay time between two horizontal segments. Introducing such a delay can " @@ -2455,7 +2351,6 @@ msgid "" msgstr "Puolella nopeudella pursotetun nousuliikkeen etäisyys.\nSe voi parantaa tarttuvuutta edellisiin kerroksiin kuumentamatta materiaalia liikaa kyseisissä kerroksissa. Koskee vain rautalankamallin tulostusta." #: fdmprinter.json -#, fuzzy msgctxt "wireframe_top_jump label" msgid "WP Knot Size" msgstr "Rautalankatulostuksen solmukoko" @@ -2469,7 +2364,6 @@ msgid "" msgstr "Tekee pienen solmun nousulinjan yläpäähän, jotta seuraava vaakasuora kerros pystyy paremmin liittymään siihen. Koskee vain rautalankamallin tulostusta." #: fdmprinter.json -#, fuzzy msgctxt "wireframe_fall_down label" msgid "WP Fall Down" msgstr "Rautalankatulostuksen pudotus" @@ -2482,7 +2376,6 @@ msgid "" msgstr "Etäisyys, jonka materiaali putoaa ylöspäin menevän pursotuksen jälkeen. Tämä etäisyys kompensoidaan. Koskee vain rautalankamallin tulostusta." #: fdmprinter.json -#, fuzzy msgctxt "wireframe_drag_along label" msgid "WP Drag along" msgstr "Rautalankatulostuksen laahaus" @@ -2496,13 +2389,11 @@ msgid "" msgstr "Etäisyys, jonka ylöspäin pursotettu materiaali laahautuu diagonaalisen laskevan pursotuksen mukana. Tämä etäisyys kompensoidaan. Koskee vain rautalankamallin tulostusta." #: fdmprinter.json -#, fuzzy msgctxt "wireframe_strategy label" msgid "WP Strategy" msgstr "Rautalankatulostuksen strategia" #: fdmprinter.json -#, fuzzy msgctxt "wireframe_strategy description" msgid "" "Strategy for making sure two consecutive layers connect at each connection " @@ -2530,7 +2421,6 @@ msgid "Retract" msgstr "Takaisinveto" #: fdmprinter.json -#, fuzzy msgctxt "wireframe_straight_before_down label" msgid "WP Straighten Downward Lines" msgstr "Rautalankatulostuksen laskulinjojen suoristus" @@ -2544,7 +2434,6 @@ msgid "" msgstr "Prosenttiluku diagonaalisesti laskevasta linjasta, jota peittää vaakalinjan pätkä. Tämä voi estää nousulinjojen ylimmän kohdan riippumista. Koskee vain rautalankamallin tulostusta." #: fdmprinter.json -#, fuzzy msgctxt "wireframe_roof_fall_down label" msgid "WP Roof Fall Down" msgstr "Rautalankatulostuksen katon pudotus" @@ -2558,7 +2447,6 @@ msgid "" msgstr "Etäisyys, jonka \"suoraan ilmaan\" tulostetut vaakasuorat kattolinjat roikkuvat tulostettaessa. Tämä etäisyys kompensoidaan. Koskee vain rautalankamallin tulostusta." #: fdmprinter.json -#, fuzzy msgctxt "wireframe_roof_drag_along label" msgid "WP Roof Drag Along" msgstr "Rautalankatulostuksen katon laahaus" @@ -2572,13 +2460,11 @@ msgid "" msgstr "Sisäpuolisen linjan päätyosan etäisyys ko. linjan laahautuessa mukana, kun mennään takaisin katon ulommalle ulkolinjalle. Tämä etäisyys kompensoidaan. Koskee vain rautalankamallin tulostusta." #: fdmprinter.json -#, fuzzy msgctxt "wireframe_roof_outer_delay label" msgid "WP Roof Outer Delay" msgstr "Rautalankatulostuksen katon ulompi viive" #: fdmprinter.json -#, fuzzy msgctxt "wireframe_roof_outer_delay description" msgid "" "Time spent at the outer perimeters of hole which is to become a roof. Longer " @@ -2586,7 +2472,6 @@ msgid "" msgstr "Katoksi tulevan aukon ulkoreunoihin käytetty aika. Pitemmät ajat varmistavat paremman liitoksen. Koskee vain rautalankamallin tulostusta." #: fdmprinter.json -#, fuzzy msgctxt "wireframe_nozzle_clearance label" msgid "WP Nozzle Clearance" msgstr "Rautalankatulostuksen suutinväli" @@ -2600,148 +2485,148 @@ msgid "" "applies to Wire Printing." msgstr "Suuttimen ja vaakasuoraan laskevien linjojen välinen etäisyys. Suurempi väli aiheuttaa vähemmän jyrkän kulman diagonaalisesti laskeviin linjoihin, mikä puolestaan johtaa harvempiin yläliitoksiin seuraavan kerroksen kanssa. Koskee vain rautalankamallin tulostusta." -#~ msgctxt "skin_outline_count label" -#~ msgid "Skin Perimeter Line Count" -#~ msgstr "Pintakalvon reunan linjaluku" +msgctxt "skin_outline_count label" +msgid "Skin Perimeter Line Count" +msgstr "Pintakalvon reunan linjaluku" -#~ msgctxt "infill_sparse_combine label" -#~ msgid "Infill Layers" -#~ msgstr "Täyttökerrokset" +msgctxt "infill_sparse_combine label" +msgid "Infill Layers" +msgstr "Täyttökerrokset" -#~ msgctxt "infill_sparse_combine description" -#~ msgid "Amount of layers that are combined together to form sparse infill." -#~ msgstr "" -#~ "Kerrosten määrä, jotka yhdistetään yhteen harvan täytön muodostamiseksi." +msgctxt "infill_sparse_combine description" +msgid "Amount of layers that are combined together to form sparse infill." +msgstr "" +"Kerrosten määrä, jotka yhdistetään yhteen harvan täytön muodostamiseksi." -#~ msgctxt "coasting_volume_retract label" -#~ msgid "Retract-Coasting Volume" -#~ msgstr "Takaisinveto-vapaaliu'un ainemäärä" +msgctxt "coasting_volume_retract label" +msgid "Retract-Coasting Volume" +msgstr "Takaisinveto-vapaaliu'un ainemäärä" -#~ msgctxt "coasting_volume_retract description" -#~ msgid "The volume otherwise oozed in a travel move with retraction." -#~ msgstr "Aineen määrä, joka muutoin on tihkunut takaisinvetoliikkeen aikana." +msgctxt "coasting_volume_retract description" +msgid "The volume otherwise oozed in a travel move with retraction." +msgstr "Aineen määrä, joka muutoin on tihkunut takaisinvetoliikkeen aikana." -#~ msgctxt "coasting_volume_move label" -#~ msgid "Move-Coasting Volume" -#~ msgstr "Siirto-vapaaliu'un ainemäärä" +msgctxt "coasting_volume_move label" +msgid "Move-Coasting Volume" +msgstr "Siirto-vapaaliu'un ainemäärä" -#~ msgctxt "coasting_volume_move description" -#~ msgid "The volume otherwise oozed in a travel move without retraction." -#~ msgstr "" -#~ "Aineen määrä, joka muutoin on tihkunut siirtoliikkeen aikana ilman " -#~ "takaisinvetoa." +msgctxt "coasting_volume_move description" +msgid "The volume otherwise oozed in a travel move without retraction." +msgstr "" +"Aineen määrä, joka muutoin on tihkunut siirtoliikkeen aikana ilman " +"takaisinvetoa." -#~ msgctxt "coasting_min_volume_retract label" -#~ msgid "Min Volume Retract-Coasting" -#~ msgstr "Takaisinveto-vapaaliu'un pienin ainemäärä" +msgctxt "coasting_min_volume_retract label" +msgid "Min Volume Retract-Coasting" +msgstr "Takaisinveto-vapaaliu'un pienin ainemäärä" -#~ msgctxt "coasting_min_volume_retract description" -#~ msgid "" -#~ "The minimal volume an extrusion path must have in order to coast the full " -#~ "amount before doing a retraction." -#~ msgstr "" -#~ "Pienin ainemäärä, joka pursotusreitillä täytyy olla täyttä " -#~ "vapaaliukumäärää varten ennen takaisinvedon tekemistä." +msgctxt "coasting_min_volume_retract description" +msgid "" +"The minimal volume an extrusion path must have in order to coast the full " +"amount before doing a retraction." +msgstr "" +"Pienin ainemäärä, joka pursotusreitillä täytyy olla täyttä " +"vapaaliukumäärää varten ennen takaisinvedon tekemistä." -#~ msgctxt "coasting_min_volume_move label" -#~ msgid "Min Volume Move-Coasting" -#~ msgstr "Siirto-vapaaliu'un pienin ainemäärä" +msgctxt "coasting_min_volume_move label" +msgid "Min Volume Move-Coasting" +msgstr "Siirto-vapaaliu'un pienin ainemäärä" -#~ msgctxt "coasting_min_volume_move description" -#~ msgid "" -#~ "The minimal volume an extrusion path must have in order to coast the full " -#~ "amount before doing a travel move without retraction." -#~ msgstr "" -#~ "Pienin ainemäärä, joka pursotusreitillä täytyy olla täyttä " -#~ "vapaaliukumäärää varten ennen siirtoliikkeen tekemistä ilman " -#~ "takaisinvetoa." +msgctxt "coasting_min_volume_move description" +msgid "" +"The minimal volume an extrusion path must have in order to coast the full " +"amount before doing a travel move without retraction." +msgstr "" +"Pienin ainemäärä, joka pursotusreitillä täytyy olla täyttä " +"vapaaliukumäärää varten ennen siirtoliikkeen tekemistä ilman " +"takaisinvetoa." -#~ msgctxt "coasting_speed_retract label" -#~ msgid "Retract-Coasting Speed" -#~ msgstr "Takaisinveto-vapaaliukunopeus" +msgctxt "coasting_speed_retract label" +msgid "Retract-Coasting Speed" +msgstr "Takaisinveto-vapaaliukunopeus" -#~ msgctxt "coasting_speed_retract description" -#~ msgid "" -#~ "The speed by which to move during coasting before a retraction, relative " -#~ "to the speed of the extrusion path." -#~ msgstr "" -#~ "Nopeus, jolla siirrytään vapaaliu'un aikana ennen takaisinvetoa, on " -#~ "suhteessa pursotusreitin nopeuteen." +msgctxt "coasting_speed_retract description" +msgid "" +"The speed by which to move during coasting before a retraction, relative " +"to the speed of the extrusion path." +msgstr "" +"Nopeus, jolla siirrytään vapaaliu'un aikana ennen takaisinvetoa, on " +"suhteessa pursotusreitin nopeuteen." -#~ msgctxt "coasting_speed_move label" -#~ msgid "Move-Coasting Speed" -#~ msgstr "Siirto-vapaaliukunopeus" +msgctxt "coasting_speed_move label" +msgid "Move-Coasting Speed" +msgstr "Siirto-vapaaliukunopeus" -#~ msgctxt "coasting_speed_move description" -#~ msgid "" -#~ "The speed by which to move during coasting before a travel move without " -#~ "retraction, relative to the speed of the extrusion path." -#~ msgstr "" -#~ "Nopeus, jolla siirrytään vapaaliu'un aikana ennen siirtoliikettä ilman " -#~ "takaisinvetoa, on suhteessa pursotusreitin nopeuteen." +msgctxt "coasting_speed_move description" +msgid "" +"The speed by which to move during coasting before a travel move without " +"retraction, relative to the speed of the extrusion path." +msgstr "" +"Nopeus, jolla siirrytään vapaaliu'un aikana ennen siirtoliikettä ilman " +"takaisinvetoa, on suhteessa pursotusreitin nopeuteen." -#~ msgctxt "skirt_line_count description" -#~ msgid "" -#~ "The skirt is a line drawn around the first layer of the. This helps to " -#~ "prime your extruder, and to see if the object fits on your platform. " -#~ "Setting this to 0 will disable the skirt. Multiple skirt lines can help " -#~ "to prime your extruder better for small objects." -#~ msgstr "" -#~ "Helma on kappaleen ensimmäisen kerroksen ympärille vedetty linja. Se " -#~ "auttaa suulakkeen esitäytössä ja siinä nähdään mahtuuko kappale " -#~ "alustalle. Tämän arvon asettaminen nollaan poistaa helman käytöstä. Useat " -#~ "helmalinjat voivat auttaa suulakkeen esitäytössä pienten kappaleiden " -#~ "osalta." +msgctxt "skirt_line_count description" +msgid "" +"The skirt is a line drawn around the first layer of the. This helps to " +"prime your extruder, and to see if the object fits on your platform. " +"Setting this to 0 will disable the skirt. Multiple skirt lines can help " +"to prime your extruder better for small objects." +msgstr "" +"Helma on kappaleen ensimmäisen kerroksen ympärille vedetty linja. Se " +"auttaa suulakkeen esitäytössä ja siinä nähdään mahtuuko kappale " +"alustalle. Tämän arvon asettaminen nollaan poistaa helman käytöstä. Useat " +"helmalinjat voivat auttaa suulakkeen esitäytössä pienten kappaleiden " +"osalta." -#~ msgctxt "raft_surface_layers label" -#~ msgid "Raft Surface Layers" -#~ msgstr "Pohjaristikon pintakerrokset" +msgctxt "raft_surface_layers label" +msgid "Raft Surface Layers" +msgstr "Pohjaristikon pintakerrokset" -#~ msgctxt "raft_surface_thickness label" -#~ msgid "Raft Surface Thickness" -#~ msgstr "Pohjaristikon pinnan paksuus" +msgctxt "raft_surface_thickness label" +msgid "Raft Surface Thickness" +msgstr "Pohjaristikon pinnan paksuus" -#~ msgctxt "raft_surface_line_width label" -#~ msgid "Raft Surface Line Width" -#~ msgstr "Pohjaristikon pintalinjan leveys" +msgctxt "raft_surface_line_width label" +msgid "Raft Surface Line Width" +msgstr "Pohjaristikon pintalinjan leveys" -#~ msgctxt "raft_surface_line_spacing label" -#~ msgid "Raft Surface Spacing" -#~ msgstr "Pohjaristikon pinnan linjajako" +msgctxt "raft_surface_line_spacing label" +msgid "Raft Surface Spacing" +msgstr "Pohjaristikon pinnan linjajako" -#~ msgctxt "raft_interface_thickness label" -#~ msgid "Raft Interface Thickness" -#~ msgstr "Pohjaristikon liittymän paksuus" +msgctxt "raft_interface_thickness label" +msgid "Raft Interface Thickness" +msgstr "Pohjaristikon liittymän paksuus" -#~ msgctxt "raft_interface_line_width label" -#~ msgid "Raft Interface Line Width" -#~ msgstr "Pohjaristikon liittymälinjan leveys" +msgctxt "raft_interface_line_width label" +msgid "Raft Interface Line Width" +msgstr "Pohjaristikon liittymälinjan leveys" -#~ msgctxt "raft_interface_line_spacing label" -#~ msgid "Raft Interface Spacing" -#~ msgstr "Pohjaristikon liittymän linjajako" +msgctxt "raft_interface_line_spacing label" +msgid "Raft Interface Spacing" +msgstr "Pohjaristikon liittymän linjajako" -#~ msgctxt "layer_height_0 label" -#~ msgid "Initial Layer Thickness" -#~ msgstr "Alkukerroksen paksuus" +msgctxt "layer_height_0 label" +msgid "Initial Layer Thickness" +msgstr "Alkukerroksen paksuus" -#~ msgctxt "wall_line_width_0 label" -#~ msgid "First Wall Line Width" -#~ msgstr "Ensimmäisen seinämälinjan leveys" +msgctxt "wall_line_width_0 label" +msgid "First Wall Line Width" +msgstr "Ensimmäisen seinämälinjan leveys" -#~ msgctxt "raft_interface_linewidth description" -#~ msgid "" -#~ "Width of the 2nd raft layer lines. These lines should be thinner than the " -#~ "first layer, but strong enough to attach the object to." -#~ msgstr "" -#~ "Pohjaristikon toisen kerroksen linjojen leveys. Näiden linjojen tulisi " -#~ "olla ensimmäistä kerrosta ohuempia, mutta riittävän vahvoja kiinnittymään " -#~ "kohteeseen." +msgctxt "raft_interface_linewidth description" +msgid "" +"Width of the 2nd raft layer lines. These lines should be thinner than the " +"first layer, but strong enough to attach the object to." +msgstr "" +"Pohjaristikon toisen kerroksen linjojen leveys. Näiden linjojen tulisi " +"olla ensimmäistä kerrosta ohuempia, mutta riittävän vahvoja kiinnittymään " +"kohteeseen." -#~ msgctxt "wireframe_printspeed label" -#~ msgid "Wire Printing speed" -#~ msgstr "Rautalankatulostuksen nopeus" +msgctxt "wireframe_printspeed label" +msgid "Wire Printing speed" +msgstr "Rautalankatulostuksen nopeus" -#~ msgctxt "wireframe_flow label" -#~ msgid "Wire Printing Flow" -#~ msgstr "Rautalankatulostuksen virtaus" +msgctxt "wireframe_flow label" +msgid "Wire Printing Flow" +msgstr "Rautalankatulostuksen virtaus" diff --git a/resources/i18n/fr/cura.po b/resources/i18n/fr/cura.po index f36ea5ddd8..806085572a 100644 --- a/resources/i18n/fr/cura.po +++ b/resources/i18n/fr/cura.po @@ -33,13 +33,11 @@ msgid "Open Web Page" msgstr "Ouvrir la page Web" #: /home/tamara/2.1/Cura/cura/CuraApplication.py:158 -#, fuzzy msgctxt "@info:progress" msgid "Setting up scene..." msgstr "Préparation de la scène..." #: /home/tamara/2.1/Cura/cura/CuraApplication.py:192 -#, fuzzy msgctxt "@info:progress" msgid "Loading interface..." msgstr "Chargement de l'interface..." @@ -56,25 +54,21 @@ msgid "Cura Profile Reader" msgstr "Lecteur de profil Cura" #: /home/tamara/2.1/Cura/plugins/CuraProfileReader/__init__.py:15 -#, fuzzy msgctxt "@info:whatsthis" msgid "Provides support for importing Cura profiles." msgstr "Fournit la prise en charge de l'importation de profils Cura." #: /home/tamara/2.1/Cura/plugins/CuraProfileReader/__init__.py:21 /home/tamara/2.1/Cura/plugins/CuraProfileWriter/__init__.py:21 -#, fuzzy msgctxt "@item:inlistbox" msgid "Cura Profile" msgstr "Profil Cura" #: /home/tamara/2.1/Cura/plugins/XRayView/__init__.py:12 -#, fuzzy msgctxt "@label" msgid "X-Ray View" msgstr "Vue Rayon-X" #: /home/tamara/2.1/Cura/plugins/XRayView/__init__.py:15 -#, fuzzy msgctxt "@info:whatsthis" msgid "Provides the X-Ray view." msgstr "Permet la vue Rayon-X." @@ -95,7 +89,6 @@ msgid "Provides support for reading 3MF files." msgstr "Fournit la prise en charge de la lecture de fichiers 3MF." #: /home/tamara/2.1/Cura/plugins/3MFReader/__init__.py:21 -#, fuzzy msgctxt "@item:inlistbox" msgid "3MF File" msgstr "Fichier 3MF" @@ -124,7 +117,6 @@ msgid "Saved to Removable Drive {0} as {1}" msgstr "Enregistré sur le lecteur amovible {0} sous {1}" #: /home/tamara/2.1/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:86 -#, fuzzy msgctxt "@action:button" msgid "Eject" msgstr "Ejecter" @@ -169,13 +161,11 @@ msgid "Provides removable drive hotplugging and writing support" msgstr "Permet le branchement hot-plug et l'écriture sur lecteur amovible" #: /home/tamara/2.1/Cura/plugins/ChangeLogPlugin/ChangeLog.py:34 -#, fuzzy msgctxt "@item:inmenu" msgid "Show Changelog" msgstr "Afficher le récapitulatif des changements" #: /home/tamara/2.1/Cura/plugins/ChangeLogPlugin/__init__.py:12 -#, fuzzy msgctxt "@label" msgid "Changelog" msgstr "Récapitulatif des changements" @@ -201,37 +191,31 @@ msgid "CuraEngine Backend" msgstr "Système CuraEngine" #: /home/tamara/2.1/Cura/plugins/CuraEngineBackend/__init__.py:15 -#, fuzzy msgctxt "@info:whatsthis" msgid "Provides the link to the CuraEngine slicing backend" msgstr "Fournit le lien vers le système de découpage CuraEngine" #: /home/tamara/2.1/Cura/plugins/GCodeWriter/__init__.py:12 -#, fuzzy msgctxt "@label" msgid "GCode Writer" msgstr "Générateur de GCode" #: /home/tamara/2.1/Cura/plugins/GCodeWriter/__init__.py:15 -#, fuzzy msgctxt "@info:whatsthis" msgid "Writes GCode to a file" msgstr "Enregistre le GCode dans un fichier" #: /home/tamara/2.1/Cura/plugins/GCodeWriter/__init__.py:22 -#, fuzzy msgctxt "@item:inlistbox" msgid "GCode File" msgstr "Fichier GCode" #: /home/tamara/2.1/Cura/plugins/USBPrinting/USBPrinterManager.py:49 -#, fuzzy msgctxt "@title:menu" msgid "Firmware" msgstr "Firmware" #: /home/tamara/2.1/Cura/plugins/USBPrinting/USBPrinterManager.py:50 -#, fuzzy msgctxt "@item:inmenu" msgid "Update Firmware" msgstr "Mise à jour du firmware" @@ -262,7 +246,6 @@ msgid "USB printing" msgstr "Impression par USB" #: /home/tamara/2.1/Cura/plugins/USBPrinting/__init__.py:17 -#, fuzzy msgctxt "@info:whatsthis" msgid "Accepts G-Code and sends them to a printer. Plugin can also update firmware." msgstr "Accepte les G-Code et les envoie à une imprimante. Ce plugin peut aussi mettre à jour le firmware." @@ -288,19 +271,16 @@ msgid "Submits anonymous slice info. Can be disabled through preferences." msgstr "Envoie des informations anonymes sur le découpage. Peut être désactivé dans les préférences." #: /home/tamara/2.1/Cura/plugins/CuraProfileWriter/__init__.py:12 -#, fuzzy msgctxt "@label" msgid "Cura Profile Writer" msgstr "Générateur de profil Cura" #: /home/tamara/2.1/Cura/plugins/CuraProfileWriter/__init__.py:15 -#, fuzzy msgctxt "@info:whatsthis" msgid "Provides support for exporting Cura profiles." msgstr "Fournit la prise en charge de l'exportation de profils Cura." #: /home/tamara/2.1/Cura/plugins/ImageReader/__init__.py:12 -#, fuzzy msgctxt "@label" msgid "Image Reader" msgstr "Lecteur d'images" @@ -336,55 +316,46 @@ msgid "GIF Image" msgstr "Image GIF" #: /home/tamara/2.1/Cura/plugins/GCodeProfileReader/__init__.py:12 -#, fuzzy msgctxt "@label" msgid "GCode Profile Reader" msgstr "Lecteur de profil GCode" #: /home/tamara/2.1/Cura/plugins/GCodeProfileReader/__init__.py:15 -#, fuzzy msgctxt "@info:whatsthis" msgid "Provides support for importing profiles from g-code files." msgstr "Fournit la prise en charge de l'importation de profils à partir de fichiers g-code." #: /home/tamara/2.1/Cura/plugins/GCodeProfileReader/__init__.py:21 -#, fuzzy msgctxt "@item:inlistbox" msgid "G-code File" msgstr "Fichier GCode" #: /home/tamara/2.1/Cura/plugins/SolidView/__init__.py:12 -#, fuzzy msgctxt "@label" msgid "Solid View" msgstr "Vue solide" #: /home/tamara/2.1/Cura/plugins/SolidView/__init__.py:15 -#, fuzzy msgctxt "@info:whatsthis" msgid "Provides a normal solid mesh view." msgstr "Affiche une vue en maille solide normale." #: /home/tamara/2.1/Cura/plugins/SolidView/__init__.py:19 -#, fuzzy msgctxt "@item:inmenu" msgid "Solid" msgstr "Solide" #: /home/tamara/2.1/Cura/plugins/LayerView/__init__.py:13 -#, fuzzy msgctxt "@label" msgid "Layer View" msgstr "Vue en couches" #: /home/tamara/2.1/Cura/plugins/LayerView/__init__.py:16 -#, fuzzy msgctxt "@info:whatsthis" msgid "Provides the Layer view." msgstr "Permet la vue en couches." #: /home/tamara/2.1/Cura/plugins/LayerView/__init__.py:20 -#, fuzzy msgctxt "@item:inlistbox" msgid "Layers" msgstr "Couches" @@ -405,13 +376,11 @@ msgid "Per Object Settings Tool" msgstr "Outil de configuration par objet" #: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/__init__.py:15 -#, fuzzy msgctxt "@info:whatsthis" msgid "Provides the Per Object Settings." msgstr "Affiche les Paramètres par objet." #: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/__init__.py:19 -#, fuzzy msgctxt "@label" msgid "Per Object Settings" msgstr "Paramètres par objet" @@ -427,7 +396,6 @@ msgid "Legacy Cura Profile Reader" msgstr "Lecteur de profil Cura antérieur" #: /home/tamara/2.1/Cura/plugins/LegacyProfileReader/__init__.py:15 -#, fuzzy msgctxt "@info:whatsthis" msgid "Provides support for importing profiles from legacy Cura versions." msgstr "Fournit la prise en charge de l'importation de profils à partir de versions Cura antérieures." @@ -438,31 +406,26 @@ msgid "Cura 15.04 profiles" msgstr "Profils Cura 15.04" #: /home/tamara/2.1/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:20 -#, fuzzy msgctxt "@title:window" msgid "Firmware Update" msgstr "Mise à jour du firmware" #: /home/tamara/2.1/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:38 -#, fuzzy msgctxt "@label" msgid "Starting firmware update, this may take a while." msgstr "Démarrage de la mise à jour du firmware, cela peut prendre un certain temps." #: /home/tamara/2.1/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:43 -#, fuzzy msgctxt "@label" msgid "Firmware update completed." msgstr "Mise à jour du firmware terminée." #: /home/tamara/2.1/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:48 -#, fuzzy msgctxt "@label" msgid "Updating firmware." msgstr "Mise à jour du firmware en cours." #: /home/tamara/2.1/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:80 /home/tamara/2.1/Cura/resources/qml/EngineLog.qml:38 /home/tamara/2.1/Cura/resources/qml/AboutDialog.qml:74 -#, fuzzy msgctxt "@action:button" msgid "Close" msgstr "Fermer" @@ -473,25 +436,21 @@ msgid "Print with USB" msgstr "Imprimer par USB" #: /home/tamara/2.1/Cura/plugins/USBPrinting/ControlWindow.qml:28 -#, fuzzy msgctxt "@label" msgid "Extruder Temperature %1" msgstr "Température de l'extrudeuse %1" #: /home/tamara/2.1/Cura/plugins/USBPrinting/ControlWindow.qml:33 -#, fuzzy msgctxt "@label" msgid "Bed Temperature %1" msgstr "Température du plateau %1" #: /home/tamara/2.1/Cura/plugins/USBPrinting/ControlWindow.qml:60 -#, fuzzy msgctxt "@action:button" msgid "Print" msgstr "Imprimer" #: /home/tamara/2.1/Cura/plugins/USBPrinting/ControlWindow.qml:67 /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:200 /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:303 /home/tamara/2.1/Cura/resources/qml/LoadProfileDialog.qml:58 -#, fuzzy msgctxt "@action:button" msgid "Cancel" msgstr "Annuler" @@ -582,7 +541,6 @@ msgid "Object profile" msgstr "Profil d'objet" #: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:126 -#, fuzzy msgctxt "@action:button" msgid "Add Setting" msgstr "Ajouter un paramètre" @@ -608,19 +566,16 @@ msgid "0.0 m" msgstr "0,0 m" #: /home/tamara/2.1/Cura/resources/qml/JobSpecs.qml:218 -#, fuzzy msgctxt "@label" msgid "%1 m" msgstr "%1 m" #: /home/tamara/2.1/Cura/resources/qml/SidebarHeader.qml:29 -#, fuzzy msgctxt "@label:listbox" msgid "Print Job" msgstr "Imprimer la tâche" #: /home/tamara/2.1/Cura/resources/qml/SidebarHeader.qml:50 -#, fuzzy msgctxt "@label:listbox" msgid "Printer:" msgstr "Imprimante :" @@ -631,37 +586,31 @@ msgid "Nozzle:" msgstr "Buse :" #: /home/tamara/2.1/Cura/resources/qml/Sidebar.qml:89 -#, fuzzy msgctxt "@label:listbox" msgid "Setup" msgstr "Configuration" #: /home/tamara/2.1/Cura/resources/qml/Sidebar.qml:215 -#, fuzzy msgctxt "@title:tab" msgid "Simple" msgstr "Simple" #: /home/tamara/2.1/Cura/resources/qml/Sidebar.qml:216 -#, fuzzy msgctxt "@title:tab" msgid "Advanced" msgstr "Avancée" #: /home/tamara/2.1/Cura/resources/qml/AddMachineWizard.qml:18 -#, fuzzy msgctxt "@title:window" msgid "Add Printer" msgstr "Ajouter une imprimante" #: /home/tamara/2.1/Cura/resources/qml/AddMachineWizard.qml:25 /home/tamara/2.1/Cura/resources/qml/WizardPages/AddMachine.qml:99 -#, fuzzy msgctxt "@title" msgid "Add Printer" msgstr "Ajouter une imprimante" #: /home/tamara/2.1/Cura/resources/qml/LoadProfileDialog.qml:15 -#, fuzzy msgctxt "@title:window" msgid "Load profile" msgstr "Charger un profil" @@ -677,7 +626,6 @@ msgid "Show details." msgstr "Afficher les détails." #: /home/tamara/2.1/Cura/resources/qml/LoadProfileDialog.qml:50 -#, fuzzy msgctxt "@action:button" msgid "Merge settings" msgstr "Fusionner les paramètres" @@ -688,13 +636,11 @@ msgid "Reset profile" msgstr "Réinitialiser le profil" #: /home/tamara/2.1/Cura/resources/qml/ProfileSetup.qml:28 -#, fuzzy msgctxt "@label" msgid "Profile:" msgstr "Profil :" #: /home/tamara/2.1/Cura/resources/qml/EngineLog.qml:15 -#, fuzzy msgctxt "@title:window" msgid "Engine Log" msgstr "Journal du moteur" @@ -705,139 +651,116 @@ msgid "Toggle Fu&ll Screen" msgstr "Passer en P&lein écran" #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:57 -#, fuzzy msgctxt "@action:inmenu menubar:edit" msgid "&Undo" msgstr "&Annuler" #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:65 -#, fuzzy msgctxt "@action:inmenu menubar:edit" msgid "&Redo" msgstr "&Rétablir" #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:73 -#, fuzzy msgctxt "@action:inmenu menubar:file" msgid "&Quit" msgstr "&Quitter" #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:81 -#, fuzzy msgctxt "@action:inmenu menubar:settings" msgid "&Preferences..." msgstr "&Préférences..." #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:88 -#, fuzzy msgctxt "@action:inmenu menubar:printer" msgid "&Add Printer..." msgstr "&Ajouter une imprimante..." #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:94 -#, fuzzy msgctxt "@action:inmenu menubar:printer" msgid "Manage Pr&inters..." msgstr "Gérer les &imprimantes..." #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:101 -#, fuzzy msgctxt "@action:inmenu menubar:profile" msgid "Manage Profiles..." msgstr "Gérer les profils..." #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:108 -#, fuzzy msgctxt "@action:inmenu menubar:help" msgid "Show Online &Documentation" msgstr "Afficher la &documentation en ligne" #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:115 -#, fuzzy msgctxt "@action:inmenu menubar:help" msgid "Report a &Bug" msgstr "Notifier un &bug" #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:122 -#, fuzzy msgctxt "@action:inmenu menubar:help" msgid "&About..." msgstr "&À propos de..." #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:129 -#, fuzzy msgctxt "@action:inmenu menubar:edit" msgid "Delete &Selection" msgstr "&Supprimer la sélection" #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:137 -#, fuzzy msgctxt "@action:inmenu" msgid "Delete Object" msgstr "Supprimer l'objet" #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:144 -#, fuzzy msgctxt "@action:inmenu" msgid "Ce&nter Object on Platform" msgstr "Ce&ntrer l’objet sur le plateau" #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:150 -#, fuzzy msgctxt "@action:inmenu menubar:edit" msgid "&Group Objects" msgstr "&Grouper les objets" #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:158 -#, fuzzy msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Objects" msgstr "Dégrouper les objets" #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:166 -#, fuzzy msgctxt "@action:inmenu menubar:edit" msgid "&Merge Objects" msgstr "&Fusionner les objets" #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:174 -#, fuzzy msgctxt "@action:inmenu" msgid "&Duplicate Object" msgstr "&Dupliquer l’objet" #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:181 -#, fuzzy msgctxt "@action:inmenu menubar:edit" msgid "&Clear Build Platform" msgstr "&Supprimer les objets du plateau" #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:189 -#, fuzzy msgctxt "@action:inmenu menubar:file" msgid "Re&load All Objects" msgstr "Rechar&ger tous les objets" #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:196 -#, fuzzy msgctxt "@action:inmenu menubar:edit" msgid "Reset All Object Positions" msgstr "Réinitialiser les positions de tous les objets" #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:202 -#, fuzzy msgctxt "@action:inmenu menubar:edit" msgid "Reset All Object &Transformations" msgstr "Réinitialiser les &transformations de tous les objets" #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:208 -#, fuzzy msgctxt "@action:inmenu menubar:file" msgid "&Open File..." msgstr "&Ouvrir un fichier..." #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:216 -#, fuzzy msgctxt "@action:inmenu menubar:help" msgid "Show Engine &Log..." msgstr "Afficher le &journal du moteur..." @@ -853,7 +776,6 @@ msgid "Hollow" msgstr "Creux" #: /home/tamara/2.1/Cura/resources/qml/SidebarSimple.qml:239 -#, fuzzy msgctxt "@label" msgid "No (0%) infill will leave your model hollow at the cost of low strength" msgstr "L'absence de remplissage (0 %) laissera votre modèle creux pour une solidité faible" @@ -864,7 +786,6 @@ msgid "Light" msgstr "Clairsemé" #: /home/tamara/2.1/Cura/resources/qml/SidebarSimple.qml:245 -#, fuzzy msgctxt "@label" msgid "Light (20%) infill will give your model an average strength" msgstr "Un remplissage clairsemé (20 %) donnera à votre modèle une solidité moyenne" @@ -890,7 +811,6 @@ msgid "Solid (100%) infill will make your model completely solid" msgstr "Un remplissage solide (100 %) rendra votre modèle vraiment résistant" #: /home/tamara/2.1/Cura/resources/qml/SidebarSimple.qml:276 -#, fuzzy msgctxt "@label:listbox" msgid "Helpers:" msgstr "Aides :" @@ -921,7 +841,6 @@ msgid "General" msgstr "Général" #: /home/tamara/2.1/Cura/resources/qml/GeneralPage.qml:51 -#, fuzzy msgctxt "@label" msgid "Language:" msgstr "Langue :" @@ -967,13 +886,11 @@ msgid "Ensure objects are kept apart" msgstr "Veillez à ce que les objets restent séparés" #: /home/tamara/2.1/Cura/resources/qml/GeneralPage.qml:131 -#, fuzzy msgctxt "@info:tooltip" msgid "Should opened files be scaled to the build volume if they are too large?" msgstr "Les fichiers ouverts doivent-ils être mis à l'échelle du volume d'impression s'ils sont trop grands ?" #: /home/tamara/2.1/Cura/resources/qml/GeneralPage.qml:136 -#, fuzzy msgctxt "@option:check" msgid "Scale large files" msgstr "Réduire la taille des fichiers trop grands" @@ -984,13 +901,11 @@ msgid "Should anonymous data about your print be sent to Ultimaker? Note, no mod msgstr "Les données anonymes de votre impression doivent-elles être envoyées à Ultimaker ? Notez qu'aucun modèle, aucune adresse IP ni aucune autre information permettant de vous identifier personnellement ne seront envoyés ou stockés." #: /home/tamara/2.1/Cura/resources/qml/GeneralPage.qml:150 -#, fuzzy msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "Envoyer des informations (anonymes) sur l'impression" #: /home/tamara/2.1/Cura/resources/qml/ViewPage.qml:16 -#, fuzzy msgctxt "@title:window" msgid "View" msgstr "Visualisation" @@ -1001,7 +916,6 @@ msgid "Highlight unsupported areas of the model in red. Without support these ar msgstr "Surligne les parties non supportées du modèle en rouge. Sans ajouter de support, ces zones ne s'imprimeront pas correctement." #: /home/tamara/2.1/Cura/resources/qml/ViewPage.qml:42 -#, fuzzy msgctxt "@option:check" msgid "Display overhang" msgstr "Mettre en surbrillance les porte-à-faux" @@ -1017,7 +931,6 @@ msgid "Center camera when item is selected" msgstr "Centrer la caméra lorsqu'un élément est sélectionné" #: /home/tamara/2.1/Cura/resources/qml/WizardPages/UltimakerCheckup.qml:72 /home/tamara/2.1/Cura/resources/qml/WizardPages/AddMachine.qml:275 -#, fuzzy msgctxt "@title" msgid "Check Printer" msgstr "Tester l'imprimante" @@ -1095,7 +1008,6 @@ msgid "Checking" msgstr "Vérification en cours" #: /home/tamara/2.1/Cura/resources/qml/WizardPages/UltimakerCheckup.qml:267 -#, fuzzy msgctxt "@label" msgid "bed temperature check:" msgstr "test de la température du plateau :" @@ -1116,13 +1028,11 @@ msgid "To assist you in having better default settings for your Ultimaker. Cura msgstr "Afin de vous aider à créer de meilleurs réglages par défaut pour votre Ultimaker, Cura doit savoir quelles améliorations vous avez installées sur votre machine :" #: /home/tamara/2.1/Cura/resources/qml/WizardPages/SelectUpgradedParts.qml:57 -#, fuzzy msgctxt "@option:check" msgid "Extruder driver ugrades" msgstr "Améliorations de l'entrainement de l'extrudeuse" #: /home/tamara/2.1/Cura/resources/qml/WizardPages/SelectUpgradedParts.qml:63 -#, fuzzy msgctxt "@option:check" msgid "Heated printer bed" msgstr "Plateau d'imprimante chauffant" @@ -1138,7 +1048,6 @@ msgid "If you bought your Ultimaker after october 2012 you will have the Extrude msgstr "Si vous avez acheté votre Ultimaker après octobre 2012, la mise à jour du système d'entraînement est déjà installée. Si vous n'avez pas encore cette amélioration, sachez qu'elle est fortement recommandée pour améliorer la fiabilité. Cette amélioration peut être achetée sur l'e-shop Ultimaker ou téléchargée sur thingiverse, sous la référence : thing:26094" #: /home/tamara/2.1/Cura/resources/qml/WizardPages/AddMachine.qml:108 -#, fuzzy msgctxt "@label" msgid "Please select the type of printer:" msgstr "Veuillez sélectionner le type d’imprimante :" @@ -1149,13 +1058,11 @@ msgid "This printer name has already been used. Please choose a different printe msgstr "Ce nom d'imprimante a déjà été utilisé. Veuillez choisir un autre nom d'imprimante." #: /home/tamara/2.1/Cura/resources/qml/WizardPages/AddMachine.qml:245 -#, fuzzy msgctxt "@label:textbox" msgid "Printer Name:" msgstr "Nom de l'imprimante :" #: /home/tamara/2.1/Cura/resources/qml/WizardPages/AddMachine.qml:272 /home/tamara/2.1/Cura/resources/qml/WizardPages/UpgradeFirmware.qml:22 -#, fuzzy msgctxt "@title" msgid "Upgrade Firmware" msgstr "Mise à niveau du firmware" @@ -1211,7 +1118,6 @@ msgid "Cura requires these new features and thus your firmware will most likely msgstr "Cura a besoin de ces nouvelles fonctionnalités et par conséquent, votre firmware a besoin d'être mis à jour. Vous pouvez procéder à la mise à jour maintenant." #: /home/tamara/2.1/Cura/resources/qml/WizardPages/UpgradeFirmware.qml:64 -#, fuzzy msgctxt "@action:button" msgid "Upgrade to Marlin Firmware" msgstr "Mettre à jour vers le firmware Marlin" @@ -1232,7 +1138,6 @@ msgid "Preparing to slice..." msgstr "Préparation de la découpe..." #: /home/tamara/2.1/Cura/resources/qml/SaveButton.qml:28 -#, fuzzy msgctxt "@label:PrintjobStatus" msgid "Slicing..." msgstr "Découpe en cours..." @@ -1248,115 +1153,96 @@ msgid "Select the active output device" msgstr "Sélectionner le périphérique de sortie actif" #: /home/tamara/2.1/Cura/resources/qml/AboutDialog.qml:15 -#, fuzzy msgctxt "@title:window" msgid "About Cura" msgstr "À propos de Cura" #: /home/tamara/2.1/Cura/resources/qml/AboutDialog.qml:54 -#, fuzzy msgctxt "@label" msgid "End-to-end solution for fused filament 3D printing." msgstr "Solution complète pour l'impression 3D par dépôt de filament fondu." #: /home/tamara/2.1/Cura/resources/qml/AboutDialog.qml:66 -#, fuzzy msgctxt "@info:credit" msgid "Cura has been developed by Ultimaker B.V. in cooperation with the community." msgstr "Cura a été développé par Ultimaker B.V. en coopération avec la communauté Ultimaker." #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:16 -#, fuzzy msgctxt "@title:window" msgid "Cura" msgstr "Cura" #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:53 -#, fuzzy msgctxt "@title:menu menubar:toplevel" msgid "&File" msgstr "&Fichier" #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:62 -#, fuzzy msgctxt "@title:menu menubar:file" msgid "Open &Recent" msgstr "Ouvrir un fichier &récent" #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:92 -#, fuzzy msgctxt "@action:inmenu menubar:file" msgid "&Save Selection to File" msgstr "Enregi&strer la sélection dans un fichier" #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:100 -#, fuzzy msgctxt "@title:menu menubar:file" msgid "Save &All" msgstr "Enregistrer &tout" #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:128 -#, fuzzy msgctxt "@title:menu menubar:toplevel" msgid "&Edit" msgstr "&Modifier" #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:145 -#, fuzzy msgctxt "@title:menu menubar:toplevel" msgid "&View" msgstr "&Visualisation" #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:167 -#, fuzzy msgctxt "@title:menu menubar:toplevel" msgid "&Printer" msgstr "Im&primante" #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:213 -#, fuzzy msgctxt "@title:menu menubar:toplevel" msgid "P&rofile" msgstr "P&rofil" #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:240 -#, fuzzy msgctxt "@title:menu menubar:toplevel" msgid "E&xtensions" msgstr "E&xtensions" #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:273 -#, fuzzy msgctxt "@title:menu menubar:toplevel" msgid "&Settings" msgstr "&Paramètres" #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:281 -#, fuzzy msgctxt "@title:menu menubar:toplevel" msgid "&Help" msgstr "&Aide" #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:366 -#, fuzzy msgctxt "@action:button" msgid "Open File" msgstr "Ouvrir un fichier" #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:410 -#, fuzzy msgctxt "@action:button" msgid "View Mode" msgstr "Mode d’affichage" #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:495 -#, fuzzy msgctxt "@title:tab" msgid "View" msgstr "Visualisation" #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:644 -#, fuzzy msgctxt "@title:window" msgid "Open file" msgstr "Ouvrir un fichier" @@ -1407,7 +1293,7 @@ msgstr "Ouvrir un fichier" #~ msgctxt "@option:check" #~ msgid "Enable Skirt Adhesion" -#~ msgstr "Adhäsion der Unterlage aktivieren" +#~ msgstr "Activer l'Adhérence de Jupe" #~ msgctxt "@option:check" #~ msgid "Enable Support" diff --git a/resources/i18n/fr/fdmprinter.json.po b/resources/i18n/fr/fdmprinter.json.po index e41b7ca82c..8009a33b7f 100644 --- a/resources/i18n/fr/fdmprinter.json.po +++ b/resources/i18n/fr/fdmprinter.json.po @@ -1,4 +1,3 @@ -#, fuzzy msgid "" msgstr "" "Project-Id-Version: Cura 2.1 json setting files\n" @@ -18,13 +17,11 @@ msgid "Machine" msgstr "Machine" #: fdmprinter.json -#, fuzzy msgctxt "machine_nozzle_size label" msgid "Nozzle Diameter" msgstr "Diamètre de la buse" #: fdmprinter.json -#, fuzzy msgctxt "machine_nozzle_size description" msgid "The inner diameter of the nozzle." msgstr "Le diamètre intérieur de la buse." @@ -49,13 +46,11 @@ msgid "" msgstr "La hauteur de chaque couche, en mm. Les impressions de qualité normale sont de 0,1 mm et celles de haute qualité sont de 0,06 mm. Vous pouvez sélectionner une hauteur jusqu’à 0,25 mm avec une machine Ultimaker pour des impressions très rapides et de faible qualité. En général, des hauteurs de couche comprises entre 0,1 et 0,2 mm offrent un bon compromis entre la vitesse et la finition de surface." #: fdmprinter.json -#, fuzzy msgctxt "layer_height_0 label" msgid "Initial Layer Height" msgstr "Hauteur de la couche initiale" #: fdmprinter.json -#, fuzzy msgctxt "layer_height_0 description" msgid "" "The layer height of the bottom layer. A thicker bottom layer makes sticking " @@ -63,7 +58,6 @@ msgid "" msgstr "L’épaisseur de la couche du dessous. Une couche épaisse adhère plus facilement au plateau." #: fdmprinter.json -#, fuzzy msgctxt "line_width label" msgid "Line Width" msgstr "Largeur de ligne" @@ -83,7 +77,6 @@ msgid "Wall Line Width" msgstr "Largeur de ligne de la paroi" #: fdmprinter.json -#, fuzzy msgctxt "wall_line_width description" msgid "" "Width of a single shell line. Each line of the shell will be printed with " @@ -91,7 +84,6 @@ msgid "" msgstr "Largeur d’une ligne de coque. Chaque ligne de la coque sera imprimée en prenant en compte cette largeur." #: fdmprinter.json -#, fuzzy msgctxt "wall_line_width_0 label" msgid "Outer Wall Line Width" msgstr "Largeur de ligne de la paroi externe" @@ -130,7 +122,6 @@ msgid "Top/bottom line width" msgstr "Largeur de la couche du dessus/dessous" #: fdmprinter.json -#, fuzzy msgctxt "skin_line_width description" msgid "" "Width of a single top/bottom printed line, used to fill up the top/bottom " @@ -158,20 +149,17 @@ msgid "Width of the printed support structures lines." msgstr "Largeur des lignes des structures de support imprimées." #: fdmprinter.json -#, fuzzy msgctxt "support_roof_line_width label" msgid "Support Roof line width" msgstr "Largeur de ligne des plafonds de support" #: fdmprinter.json -#, fuzzy msgctxt "support_roof_line_width description" msgid "" "Width of a single support roof line, used to fill the top of the support." msgstr "Épaisseur d'une seule ligne de plafond de support, utilisée pour remplir le haut du support." #: fdmprinter.json -#, fuzzy msgctxt "shell label" msgid "Shell" msgstr "Coque" @@ -209,7 +197,6 @@ msgid "Wall Line Count" msgstr "Nombre de lignes de la paroi" #: fdmprinter.json -#, fuzzy msgctxt "wall_line_count description" msgid "" "Number of shell lines. These lines are called perimeter lines in other tools " @@ -235,7 +222,6 @@ msgid "Bottom/Top Thickness" msgstr "Épaisseur du dessus/dessous " #: fdmprinter.json -#, fuzzy msgctxt "top_bottom_thickness description" msgid "" "This controls the thickness of the bottom and top layers. The number of " @@ -250,7 +236,6 @@ msgid "Top Thickness" msgstr "Épaisseur du dessus" #: fdmprinter.json -#, fuzzy msgctxt "top_thickness description" msgid "" "This controls the thickness of the top layers. The number of solid layers " @@ -265,7 +250,6 @@ msgid "Top Layers" msgstr "Couches supérieures" #: fdmprinter.json -#, fuzzy msgctxt "top_layers description" msgid "This controls the number of top layers." msgstr "Cette option contrôle le nombre de couches supérieures." @@ -295,13 +279,11 @@ msgid "This controls the amount of bottom layers." msgstr "Cette option contrôle le nombre de couches inférieures." #: fdmprinter.json -#, fuzzy msgctxt "remove_overlapping_walls_enabled label" msgid "Remove Overlapping Wall Parts" msgstr "Éliminer les morceaux de paroi qui se chevauchent" #: fdmprinter.json -#, fuzzy msgctxt "remove_overlapping_walls_enabled description" msgid "" "Remove parts of a wall which share an overlap which would result in " @@ -310,13 +292,11 @@ msgid "" msgstr "Retire les parties d'une paroi qui se chevauchent ce qui résulterait en une surextrusion à certains endroits. Ces volumes apparaissent dans les pièces fines ou dans les angles aigus." #: fdmprinter.json -#, fuzzy msgctxt "remove_overlapping_walls_0_enabled label" msgid "Remove Overlapping Outer Wall Parts" msgstr "Éliminer les morceaux de paroi extérieure qui se chevauchent" #: fdmprinter.json -#, fuzzy msgctxt "remove_overlapping_walls_0_enabled description" msgid "" "Remove parts of an outer wall which share an overlap which would result in " @@ -325,13 +305,11 @@ msgid "" msgstr "Retire les parties d'une paroi extérieure qui se chevauchent ce qui résulterait en une surextrusion à certains endroits. Ces volumes apparaissent dans les pièces fines ou dans les angles aigus." #: fdmprinter.json -#, fuzzy msgctxt "remove_overlapping_walls_x_enabled label" msgid "Remove Overlapping Other Wall Parts" msgstr "Éliminer les morceaux d'autres parois qui se chevauchent" #: fdmprinter.json -#, fuzzy msgctxt "remove_overlapping_walls_x_enabled description" msgid "" "Remove parts of an inner wall which share an overlap which would result in " @@ -386,7 +364,6 @@ msgid "Bottom/Top Pattern" msgstr "Motif du dessus/dessous" #: fdmprinter.json -#, fuzzy msgctxt "top_bottom_pattern description" msgid "" "Pattern of the top/bottom solid fill. This is normally done with lines to " @@ -410,13 +387,11 @@ msgid "Zig Zag" msgstr "Zig Zag" #: fdmprinter.json -#, fuzzy msgctxt "skin_no_small_gaps_heuristic label" msgid "Ignore small Z gaps" msgstr "Ignorer les petits trous en Z" #: fdmprinter.json -#, fuzzy msgctxt "skin_no_small_gaps_heuristic description" msgid "" "When the model has small vertical gaps, about 5% extra computation time can " @@ -430,7 +405,6 @@ msgid "Alternate Skin Rotation" msgstr "Alterner la rotation dans les couches extérieures" #: fdmprinter.json -#, fuzzy msgctxt "skin_alternate_rotation description" msgid "" "Alternate between diagonal skin fill and horizontal + vertical skin fill. " @@ -444,7 +418,6 @@ msgid "Extra Skin Wall Count" msgstr "Nombre supplémentaire de parois extérieures" #: fdmprinter.json -#, fuzzy msgctxt "skin_outline_count description" msgid "" "Number of lines around skin regions. Using one or two skin perimeter lines " @@ -457,7 +430,6 @@ msgid "Horizontal expansion" msgstr "Vitesse d’impression horizontale" #: fdmprinter.json -#, fuzzy msgctxt "xy_offset description" msgid "" "Amount of offset applied to all polygons in each layer. Positive values can " @@ -471,7 +443,6 @@ msgid "Z Seam Alignment" msgstr "Alignement de la jointure en Z" #: fdmprinter.json -#, fuzzy msgctxt "z_seam_type description" msgid "" "Starting point of each path in a layer. When paths in consecutive layers " @@ -502,13 +473,11 @@ msgid "Infill" msgstr "Remplissage" #: fdmprinter.json -#, fuzzy msgctxt "infill_sparse_density label" msgid "Infill Density" msgstr "Densité du remplissage" #: fdmprinter.json -#, fuzzy msgctxt "infill_sparse_density description" msgid "" "This controls how densely filled the insides of your print will be. For a " @@ -528,13 +497,11 @@ msgid "Distance between the printed infill lines." msgstr "Distance entre les lignes de remplissage imprimées." #: fdmprinter.json -#, fuzzy msgctxt "infill_pattern label" msgid "Infill Pattern" msgstr "Motif de remplissage" #: fdmprinter.json -#, fuzzy msgctxt "infill_pattern description" msgid "" "Cura defaults to switching between grid and line infill, but with this " @@ -554,7 +521,6 @@ msgid "Lines" msgstr "Lignes" #: fdmprinter.json -#, fuzzy msgctxt "infill_pattern option triangles" msgid "Triangles" msgstr "Triangles" @@ -570,13 +536,11 @@ msgid "Zig Zag" msgstr "Zig Zag" #: fdmprinter.json -#, fuzzy msgctxt "infill_overlap label" msgid "Infill Overlap" msgstr "Chevauchement du remplissage" #: fdmprinter.json -#, fuzzy msgctxt "infill_overlap description" msgid "" "The amount of overlap between the infill and the walls. A slight overlap " @@ -584,13 +548,11 @@ msgid "" msgstr "Le degré de chevauchement entre le remplissage et les parois. Un léger chevauchement permet de lier fermement les parois au remplissage." #: fdmprinter.json -#, fuzzy msgctxt "infill_wipe_dist label" msgid "Infill Wipe Distance" msgstr "Distance de remplissage" #: fdmprinter.json -#, fuzzy msgctxt "infill_wipe_dist description" msgid "" "Distance of a travel move inserted after every infill line, to make the " @@ -599,13 +561,11 @@ msgid "" msgstr "Distance de déplacement à insérer après chaque ligne de remplissage, pour s'assurer que le remplissage collera mieux aux parois externes. Cette option est similaire au chevauchement du remplissage, mais sans extrusion et seulement à l'une des deux extrémités de la ligne de remplissage." #: fdmprinter.json -#, fuzzy msgctxt "infill_sparse_thickness label" msgid "Infill Thickness" msgstr "Épaisseur de remplissage" #: fdmprinter.json -#, fuzzy msgctxt "infill_sparse_thickness description" msgid "" "The thickness of the sparse infill. This is rounded to a multiple of the " @@ -614,7 +574,6 @@ msgid "" msgstr "L’épaisseur de l’espace de remplissage libre. Elle est arrondie à un multiple de la hauteur de couche et utilisée pour imprimer l’espace de remplissage libre avec des couches plus épaisses et moins nombreuses afin de gagner du temps d’impression." #: fdmprinter.json -#, fuzzy msgctxt "infill_before_walls label" msgid "Infill Before Walls" msgstr "Imprimer le remplissage avant les parois" @@ -634,7 +593,6 @@ msgid "Material" msgstr "Matériau" #: fdmprinter.json -#, fuzzy msgctxt "material_flow_dependent_temperature label" msgid "Auto Temperature" msgstr "Température auto" @@ -660,7 +618,6 @@ msgid "" msgstr "La température utilisée pour l’impression. Définissez-la sur 0 pour la préchauffer vous-même. Pour le PLA, on utilise généralement une température de 210° C.\nPour l’ABS, une température de 230°C minimum est requise." #: fdmprinter.json -#, fuzzy msgctxt "material_flow_temp_graph label" msgid "Flow Temperature Graph" msgstr "Graphique de la température du flux" @@ -673,7 +630,6 @@ msgid "" msgstr "Données reliant le flux de matériau (en mm3 par seconde) à la température (degrés Celsius)." #: fdmprinter.json -#, fuzzy msgctxt "material_standby_temperature label" msgid "Standby Temperature" msgstr "Température en veille" @@ -715,7 +671,6 @@ msgid "Diameter" msgstr "Diamètre" #: fdmprinter.json -#, fuzzy msgctxt "material_diameter description" msgid "" "The diameter of your filament needs to be measured as accurately as " @@ -754,7 +709,6 @@ msgid "Retraction Distance" msgstr "Distance de rétraction" #: fdmprinter.json -#, fuzzy msgctxt "retraction_amount description" msgid "" "The amount of retraction: Set at 0 for no retraction at all. A value of " @@ -797,13 +751,11 @@ msgid "The speed at which the filament is pushed back after retraction." msgstr "La vitesse à laquelle le filament est poussé en retour après la rétraction." #: fdmprinter.json -#, fuzzy msgctxt "retraction_extra_prime_amount label" msgid "Retraction Extra Prime Amount" msgstr "Degré supplémentaire de rétraction primaire" #: fdmprinter.json -#, fuzzy msgctxt "retraction_extra_prime_amount description" msgid "" "The amount of material extruded after a retraction. During a travel move, " @@ -816,7 +768,6 @@ msgid "Retraction Minimum Travel" msgstr "Déplacement minimal de rétraction" #: fdmprinter.json -#, fuzzy msgctxt "retraction_min_travel description" msgid "" "The minimum distance of travel needed for a retraction to happen at all. " @@ -824,13 +775,11 @@ msgid "" msgstr "La distance minimale de déplacement nécessaire pour qu’une rétraction ait lieu. Cela permet d’éviter qu’un grand nombre de rétractions ne se produisent sur une petite portion." #: fdmprinter.json -#, fuzzy msgctxt "retraction_count_max label" msgid "Maximum Retraction Count" msgstr "Nombre maximal de rétractions" #: fdmprinter.json -#, fuzzy msgctxt "retraction_count_max description" msgid "" "This setting limits the number of retractions occurring within the Minimum " @@ -840,13 +789,11 @@ msgid "" msgstr "Ce paramètre limite le nombre de rétractions dans l'intervalle de distance minimal d'extrusion. Les rétractions qui dépassent cette valeur seront ignorées. Cela évite les rétractions répétitives sur le même morceau de filament, car cela risque de l’aplatir et de générer des problèmes d’écrasement." #: fdmprinter.json -#, fuzzy msgctxt "retraction_extrusion_window label" msgid "Minimum Extrusion Distance Window" msgstr "Intervalle de distance minimale d'extrusion" #: fdmprinter.json -#, fuzzy msgctxt "retraction_extrusion_window description" msgid "" "The window in which the Maximum Retraction Count is enforced. This value " @@ -861,7 +808,6 @@ msgid "Z Hop when Retracting" msgstr "Décalage en Z lors d’une rétraction" #: fdmprinter.json -#, fuzzy msgctxt "retraction_hop description" msgid "" "Whenever a retraction is done, the head is lifted by this amount to travel " @@ -906,7 +852,6 @@ msgid "Shell Speed" msgstr "Vitesse d'impression de la coque" #: fdmprinter.json -#, fuzzy msgctxt "speed_wall description" msgid "" "The speed at which the shell is printed. Printing the outer shell at a lower " @@ -919,7 +864,6 @@ msgid "Outer Shell Speed" msgstr "Vitesse d'impression de la coque externe" #: fdmprinter.json -#, fuzzy msgctxt "speed_wall_0 description" msgid "" "The speed at which the outer shell is printed. Printing the outer shell at a " @@ -934,7 +878,6 @@ msgid "Inner Shell Speed" msgstr "Vitesse d'impression de la coque interne" #: fdmprinter.json -#, fuzzy msgctxt "speed_wall_x description" msgid "" "The speed at which all inner shells are printed. Printing the inner shell " @@ -961,7 +904,6 @@ msgid "Support Speed" msgstr "Vitesse d'impression des supports" #: fdmprinter.json -#, fuzzy msgctxt "speed_support description" msgid "" "The speed at which exterior support is printed. Printing exterior supports " @@ -971,13 +913,11 @@ msgid "" msgstr "La vitesse à laquelle les supports extérieurs sont imprimés. Imprimer les supports extérieurs à une vitesse supérieure peut fortement accélérer l’impression. Par ailleurs, la qualité de la surface des support extérieurs n’a généralement pas beaucoup d’importance, par conséquent la vitesse peut être plus élevée." #: fdmprinter.json -#, fuzzy msgctxt "speed_support_lines label" msgid "Support Wall Speed" msgstr "Vitesse d'impression des parois de support" #: fdmprinter.json -#, fuzzy msgctxt "speed_support_lines description" msgid "" "The speed at which the walls of exterior support are printed. Printing the " @@ -985,13 +925,11 @@ msgid "" msgstr "La vitesse à laquelle les parois du support extérieur sont imprimées. L'impression des parois à une vitesse plus élevée permet de réduire la durée d'impression." #: fdmprinter.json -#, fuzzy msgctxt "speed_support_roof label" msgid "Support Roof Speed" msgstr "Vitesse d'impression des plafonds de support" #: fdmprinter.json -#, fuzzy msgctxt "speed_support_roof description" msgid "" "The speed at which the roofs of exterior support are printed. Printing the " @@ -1004,7 +942,6 @@ msgid "Travel Speed" msgstr "Vitesse de déplacement" #: fdmprinter.json -#, fuzzy msgctxt "speed_travel description" msgid "" "The speed at which travel moves are done. A well-built Ultimaker can reach " @@ -1017,7 +954,6 @@ msgid "Bottom Layer Speed" msgstr "Vitesse de la couche inférieure" #: fdmprinter.json -#, fuzzy msgctxt "speed_layer_0 description" msgid "" "The print speed for the bottom layer: You want to print the first layer " @@ -1030,7 +966,6 @@ msgid "Skirt Speed" msgstr "Vitesse d'impression de la jupe" #: fdmprinter.json -#, fuzzy msgctxt "skirt_speed description" msgid "" "The speed at which the skirt and brim are printed. Normally this is done at " @@ -1039,13 +974,11 @@ msgid "" msgstr "La vitesse à laquelle la jupe et la bordure sont imprimées. Normalement, cette vitesse est celle de la couche initiale, mais il est parfois nécessaire d’imprimer la jupe à une vitesse différente." #: fdmprinter.json -#, fuzzy msgctxt "speed_slowdown_layers label" msgid "Number of Slower Layers" msgstr "Nombre de couches plus lentes" #: fdmprinter.json -#, fuzzy msgctxt "speed_slowdown_layers description" msgid "" "The first few layers are printed slower than the rest of the object, this to " @@ -1055,7 +988,6 @@ msgid "" msgstr "Les premières couches sont imprimées plus lentement par rapport au reste de l’objet. Le but est d’obtenir une meilleure adhérence au plateau de l’imprimante et d’améliorer le taux de réussite global des impressions. La vitesse augmente graduellement à chacune de ces couches. Il faut en général 4 couches d’accélération pour la plupart des matériaux et des imprimantes." #: fdmprinter.json -#, fuzzy msgctxt "travel label" msgid "Travel" msgstr "Déplacement" @@ -1066,7 +998,6 @@ msgid "Enable Combing" msgstr "Activer les détours" #: fdmprinter.json -#, fuzzy msgctxt "retraction_combing description" msgid "" "Combing keeps the head within the interior of the print whenever possible " @@ -1086,7 +1017,6 @@ msgid "Avoid other parts when traveling between parts." msgstr "Éviter les autres pièces lors des déplacements d'une pièce à l'autre." #: fdmprinter.json -#, fuzzy msgctxt "travel_avoid_distance label" msgid "Avoid Distance" msgstr "Distance d'évitement" @@ -1097,7 +1027,6 @@ msgid "The distance to stay clear of parts which are avoided during travel." msgstr "Distance à respecter pour rester loin des autres pièces à éviter pendant les déplacements." #: fdmprinter.json -#, fuzzy msgctxt "coasting_enable label" msgid "Enable Coasting" msgstr "Activer la roue libre" @@ -1123,13 +1052,11 @@ msgid "" msgstr "Volume de matière qui devrait suinter de la buse. Cette valeur doit généralement rester proche du diamètre de la buse au cube." #: fdmprinter.json -#, fuzzy msgctxt "coasting_min_volume label" msgid "Minimal Volume Before Coasting" msgstr "Volume minimal avant roue libre" #: fdmprinter.json -#, fuzzy msgctxt "coasting_min_volume description" msgid "" "The least volume an extrusion path should have to coast the full amount. For " @@ -1139,13 +1066,11 @@ msgid "" msgstr "Le plus petit volume qu'un mouvement d'extrusion doit entraîner pour pouvoir ensuite compléter en roue libre le chemin complet. Pour les petits mouvements d'extrusion, une pression moindre s'est formée dans le tube bowden, de sorte que le volume déposable en roue libre est alors réduit linéairement. Cette valeur doit toujours être supérieure au Volume en roue libre." #: fdmprinter.json -#, fuzzy msgctxt "coasting_speed label" msgid "Coasting Speed" msgstr "Vitesse de roue libre" #: fdmprinter.json -#, fuzzy msgctxt "coasting_speed description" msgid "" "The speed by which to move during coasting, relative to the speed of the " @@ -1232,7 +1157,6 @@ msgid "" msgstr "Le nombre de couches auquel le ventilateur est entièrement activé. Pour les couches précédentes, la vitesse du ventilateur augmente de façon linéaire et le ventilateur est éteint pour la première couche." #: fdmprinter.json -#, fuzzy msgctxt "cool_min_layer_time label" msgid "Minimum Layer Time" msgstr "Durée minimale d’une couche" @@ -1247,13 +1171,11 @@ msgid "" msgstr "Le temps minimal passé pour une couche : cette fonction permet de laisser une couche refroidir avant que la couche suivante ne soit appliquée. Si cette couche est plus rapide à imprimer, l’imprimante ralentira afin de passer au moins le temps requis pour l’impression de cette couche." #: fdmprinter.json -#, fuzzy msgctxt "cool_min_layer_time_fan_speed_max label" msgid "Minimum Layer Time Full Fan Speed" msgstr "Durée minimale d’une couche pour que le ventilateur fonctionne à pleine puissance" #: fdmprinter.json -#, fuzzy msgctxt "cool_min_layer_time_fan_speed_max description" msgid "" "The minimum time spent in a layer which will cause the fan to be at maximum " @@ -1311,7 +1233,6 @@ msgid "Placement" msgstr "Positionnement" #: fdmprinter.json -#, fuzzy msgctxt "support_type description" msgid "" "Where to place support structures. The placement can be restricted so that " @@ -1335,7 +1256,6 @@ msgid "Overhang Angle" msgstr "Angle de porte-à-faux" #: fdmprinter.json -#, fuzzy msgctxt "support_angle description" msgid "" "The maximum angle of overhangs for which support will be added. With 0 " @@ -1349,7 +1269,6 @@ msgid "X/Y Distance" msgstr "Distance X/Y" #: fdmprinter.json -#, fuzzy msgctxt "support_xy_distance description" msgid "" "Distance of the support structure from the print in the X/Y directions. " @@ -1391,7 +1310,6 @@ msgid "Distance from the print to the bottom of the support." msgstr "Distance entre l’impression et le bas des supports." #: fdmprinter.json -#, fuzzy msgctxt "support_conical_enabled label" msgid "Conical Support" msgstr "Supports coniques" @@ -1404,7 +1322,6 @@ msgid "" msgstr "Fonctionnalité expérimentale : rendre les aires de support plus petites en bas qu'au niveau du porte-à-faux à supporter." #: fdmprinter.json -#, fuzzy msgctxt "support_conical_angle label" msgid "Cone Angle" msgstr "Angle du cône" @@ -1419,13 +1336,11 @@ msgid "" msgstr "Angle d'inclinaison des supports coniques. Un angle de 0 degré est vertical tandis qu'un angle de 90 degrés est horizontal. Les petits angles rendent le support plus solide mais utilisent plus de matière. Les angles négatifs rendent la base du support plus large que le sommet." #: fdmprinter.json -#, fuzzy msgctxt "support_conical_min_width label" msgid "Minimal Width" msgstr "Largeur minimale" #: fdmprinter.json -#, fuzzy msgctxt "support_conical_min_width description" msgid "" "Minimal width to which conical support reduces the support areas. Small " @@ -1452,7 +1367,6 @@ msgid "Join Distance" msgstr "Distance de jointement" #: fdmprinter.json -#, fuzzy msgctxt "support_join_distance description" msgid "" "The maximum distance between support blocks in the X/Y directions, so that " @@ -1460,13 +1374,11 @@ msgid "" msgstr "La distance maximale entre des blocs de support, sur les axes X/Y, de sorte que les supports fusionnent en un bloc unique." #: fdmprinter.json -#, fuzzy msgctxt "support_offset label" msgid "Horizontal Expansion" msgstr "Vitesse d’impression horizontale" #: fdmprinter.json -#, fuzzy msgctxt "support_offset description" msgid "" "Amount of offset applied to all support polygons in each layer. Positive " @@ -1479,7 +1391,6 @@ msgid "Area Smoothing" msgstr "Lissage" #: fdmprinter.json -#, fuzzy msgctxt "support_area_smoothing description" msgid "" "Maximum distance in the X/Y directions of a line segment which is to be " @@ -1490,26 +1401,22 @@ msgid "" msgstr "Distance maximale sur les axes X/Y d’un segment de ligne qui doit être lissé. Les lignes irrégulières sont provoquées par la distance de jointement et le pont de support qui font résonner la machine. Le lissage des zones de support empêchera leur rupture lors de l’application de contraintes, mais cela peut modifier le porte-à-faux." #: fdmprinter.json -#, fuzzy msgctxt "support_roof_enable label" msgid "Enable Support Roof" msgstr "Activer les plafonds de support" #: fdmprinter.json -#, fuzzy msgctxt "support_roof_enable description" msgid "" "Generate a dense top skin at the top of the support on which the model sits." msgstr "Génère une couche dense en haut des supports sur laquelle le modèle s'appuie." #: fdmprinter.json -#, fuzzy msgctxt "support_roof_height label" msgid "Support Roof Thickness" msgstr "Épaisseur du plafond de support" #: fdmprinter.json -#, fuzzy msgctxt "support_roof_height description" msgid "The height of the support roofs." msgstr "La hauteur des plafonds de support. " @@ -1520,7 +1427,6 @@ msgid "Support Roof Density" msgstr "Densité du plafond de support" #: fdmprinter.json -#, fuzzy msgctxt "support_roof_density description" msgid "" "This controls how densely filled the roofs of the support will be. A higher " @@ -1529,25 +1435,21 @@ msgid "" msgstr "Cette option contrôle la densité de remplissage des plafonds de support. Un pourcentage plus élevé apportera un meilleur support aux porte-à-faux mais le support sera plus difficile à enlever." #: fdmprinter.json -#, fuzzy msgctxt "support_roof_line_distance label" msgid "Support Roof Line Distance" msgstr "Distance d'écartement de ligne du plafond de support" #: fdmprinter.json -#, fuzzy msgctxt "support_roof_line_distance description" msgid "Distance between the printed support roof lines." msgstr "Distance entre les lignes imprimées du plafond de support." #: fdmprinter.json -#, fuzzy msgctxt "support_roof_pattern label" msgid "Support Roof Pattern" msgstr "Motif du plafond de support" #: fdmprinter.json -#, fuzzy msgctxt "support_roof_pattern description" msgid "The pattern with which the top of the support is printed." msgstr "Motif d'impression pour le haut des supports." @@ -1578,7 +1480,6 @@ msgid "Zig Zag" msgstr "Zig Zag" #: fdmprinter.json -#, fuzzy msgctxt "support_use_towers label" msgid "Use towers" msgstr "Utilisation de tours" @@ -1592,13 +1493,11 @@ msgid "" msgstr "Utilisation de tours spéciales pour soutenir de petites zones en porte-à-faux. Le diamètre de ces tours est plus large que la zone qu’elles soutiennent. Près du porte-à-faux, le diamètre des tours diminue pour former un toit." #: fdmprinter.json -#, fuzzy msgctxt "support_minimal_diameter label" msgid "Minimum Diameter" msgstr "Diamètre minimal" #: fdmprinter.json -#, fuzzy msgctxt "support_minimal_diameter description" msgid "" "Minimum diameter in the X/Y directions of a small area which is to be " @@ -1611,7 +1510,6 @@ msgid "Tower Diameter" msgstr "Diamètre de la tour" #: fdmprinter.json -#, fuzzy msgctxt "support_tower_diameter description" msgid "The diameter of a special tower." msgstr "Le diamètre d’une tour spéciale." @@ -1622,7 +1520,6 @@ msgid "Tower Roof Angle" msgstr "Angle du toit de la tour" #: fdmprinter.json -#, fuzzy msgctxt "support_tower_roof_angle description" msgid "" "The angle of the rooftop of a tower. Larger angles mean more pointy towers." @@ -1634,7 +1531,6 @@ msgid "Pattern" msgstr "Motif" #: fdmprinter.json -#, fuzzy msgctxt "support_pattern description" msgid "" "Cura can generate 3 distinct types of support structure. First is a grid " @@ -1682,13 +1578,11 @@ msgid "" msgstr "Relie les zigzags. Cela complique leur retrait mais empêche d’étirer les zigzags non reliés." #: fdmprinter.json -#, fuzzy msgctxt "support_infill_rate label" msgid "Fill Amount" msgstr "Quantité de remplissage" #: fdmprinter.json -#, fuzzy msgctxt "support_infill_rate description" msgid "" "The amount of infill structure in the support; less infill gives weaker " @@ -1716,7 +1610,6 @@ msgid "Type" msgstr "Type" #: fdmprinter.json -#, fuzzy msgctxt "adhesion_type description" msgid "" "Different options that help to improve priming your extrusion.\n" @@ -1730,7 +1623,6 @@ msgid "" msgstr "Différentes options permettant d'améliorer la préparation de votre extrusion.\nLa bordure et le radeau empêchent les coins des pièces de se relever à cause du redressement. La bordure ajoute une zone plane à une couche autour de votre objet ; il est facile à découper à la fin de l’impression et il s'agit de l’option recommandée. Le radeau ajoute une grille épaisse en dessous de l’objet et une interface fine entre cette grille et votre objet.\nLa jupe est une ligne dessinée autour de la première couche d'impression qui vous permet de préparer votre extrusion et de vérifier que l'objet tient sur votre plateforme." #: fdmprinter.json -#, fuzzy msgctxt "adhesion_type option skirt" msgid "Skirt" msgstr "Jupe" @@ -1784,13 +1676,11 @@ msgid "" msgstr "Il s’agit de la longueur minimale de la jupe. Si cette longueur minimale n’est pas atteinte, d’autres lignes de jupe seront ajoutées afin d’atteindre la longueur minimale. Veuillez noter que si le nombre de lignes est défini sur 0, cette option est ignorée." #: fdmprinter.json -#, fuzzy msgctxt "brim_width label" msgid "Brim Width" msgstr "Largeur de la bordure" #: fdmprinter.json -#, fuzzy msgctxt "brim_width description" msgid "" "The distance from the model to the end of the brim. A larger brim sticks " @@ -1804,7 +1694,6 @@ msgid "Brim Line Count" msgstr "Nombre de lignes de la bordure" #: fdmprinter.json -#, fuzzy msgctxt "brim_line_count description" msgid "" "The number of lines used for a brim. More lines means a larger brim which " @@ -1839,13 +1728,11 @@ msgid "" msgstr "L’espace entre la dernière couche du radeau et la première couche de l’objet. Seule la première couche est surélevée de cette quantité d’espace pour réduire l’adhérence entre la couche du radeau et l’objet. Cela facilite le décollage du radeau." #: fdmprinter.json -#, fuzzy msgctxt "raft_surface_layers label" msgid "Raft Top Layers" msgstr "Couches supérieures du radeau" #: fdmprinter.json -#, fuzzy msgctxt "raft_surface_layers description" msgid "" "The number of top layers on top of the 2nd raft layer. These are fully " @@ -1854,25 +1741,21 @@ msgid "" msgstr "Nombre de couches de surface au-dessus de la deuxième couche du radeau. Il s’agit des couches entièrement remplies sur lesquelles l’objet est posé. En général, deux couches offrent une surface plus lisse qu'une seule." #: fdmprinter.json -#, fuzzy msgctxt "raft_surface_thickness label" msgid "Raft Top Layer Thickness" msgstr "Épaisseur de la couche supérieure du radeau" #: fdmprinter.json -#, fuzzy msgctxt "raft_surface_thickness description" msgid "Layer thickness of the top raft layers." msgstr "Épaisseur des couches supérieures du radeau." #: fdmprinter.json -#, fuzzy msgctxt "raft_surface_line_width label" msgid "Raft Top Line Width" msgstr "Largeur de la ligne supérieure du radeau" #: fdmprinter.json -#, fuzzy msgctxt "raft_surface_line_width description" msgid "" "Width of the lines in the top surface of the raft. These can be thin lines " @@ -1880,13 +1763,11 @@ msgid "" msgstr "Largeur des lignes de la surface supérieure du radeau. Elles doivent être fines pour rendre le dessus du radeau lisse." #: fdmprinter.json -#, fuzzy msgctxt "raft_surface_line_spacing label" msgid "Raft Top Spacing" msgstr "Interligne supérieur du radeau" #: fdmprinter.json -#, fuzzy msgctxt "raft_surface_line_spacing description" msgid "" "The distance between the raft lines for the top raft layers. The spacing " @@ -1894,25 +1775,21 @@ msgid "" msgstr "La distance entre les lignes du radeau pour les couches supérieures de celui-ci. Cet espace doit être égal à la largeur de ligne afin de créer une surface solide." #: fdmprinter.json -#, fuzzy msgctxt "raft_interface_thickness label" msgid "Raft Middle Thickness" msgstr "Épaisseur intermédiaire du radeau" #: fdmprinter.json -#, fuzzy msgctxt "raft_interface_thickness description" msgid "Layer thickness of the middle raft layer." msgstr "Épaisseur de la couche intermédiaire du radeau." #: fdmprinter.json -#, fuzzy msgctxt "raft_interface_line_width label" msgid "Raft Middle Line Width" msgstr "Largeur de la ligne intermédiaire du radeau" #: fdmprinter.json -#, fuzzy msgctxt "raft_interface_line_width description" msgid "" "Width of the lines in the middle raft layer. Making the second layer extrude " @@ -1920,13 +1797,11 @@ msgid "" msgstr "Largeur des lignes de la couche intermédiaire du radeau. Une plus grande extrusion de la deuxième couche renforce l'adhérence des lignes au plateau." #: fdmprinter.json -#, fuzzy msgctxt "raft_interface_line_spacing label" msgid "Raft Middle Spacing" msgstr "Interligne intermédiaire du radeau" #: fdmprinter.json -#, fuzzy msgctxt "raft_interface_line_spacing description" msgid "" "The distance between the raft lines for the middle raft layer. The spacing " @@ -1940,7 +1815,6 @@ msgid "Raft Base Thickness" msgstr "Épaisseur de la base du radeau" #: fdmprinter.json -#, fuzzy msgctxt "raft_base_thickness description" msgid "" "Layer thickness of the base raft layer. This should be a thick layer which " @@ -1948,13 +1822,11 @@ msgid "" msgstr "Épaisseur de la couche de base du radeau. Cette couche doit être épaisse et adhérer fermement au plateau." #: fdmprinter.json -#, fuzzy msgctxt "raft_base_line_width label" msgid "Raft Base Line Width" msgstr "Largeur de la ligne de base du radeau" #: fdmprinter.json -#, fuzzy msgctxt "raft_base_line_width description" msgid "" "Width of the lines in the base raft layer. These should be thick lines to " @@ -1962,13 +1834,11 @@ msgid "" msgstr "Largeur des lignes de la couche de base du radeau. Elles doivent être épaisses pour permettre l’adhérence au plateau." #: fdmprinter.json -#, fuzzy msgctxt "raft_base_line_spacing label" msgid "Raft Line Spacing" msgstr "Interligne du radeau" #: fdmprinter.json -#, fuzzy msgctxt "raft_base_line_spacing description" msgid "" "The distance between the raft lines for the base raft layer. Wide spacing " @@ -1976,25 +1846,21 @@ msgid "" msgstr "La distance entre les lignes du radeau pour la couche de base de celui-ci. Un interligne large facilite le retrait du radeau du plateau." #: fdmprinter.json -#, fuzzy msgctxt "raft_speed label" msgid "Raft Print Speed" msgstr "Vitesse d’impression du radeau" #: fdmprinter.json -#, fuzzy msgctxt "raft_speed description" msgid "The speed at which the raft is printed." msgstr "La vitesse à laquelle le radeau est imprimé." #: fdmprinter.json -#, fuzzy msgctxt "raft_surface_speed label" msgid "Raft Surface Print Speed" msgstr "Vitesse d’impression de la surface du radeau" #: fdmprinter.json -#, fuzzy msgctxt "raft_surface_speed description" msgid "" "The speed at which the surface raft layers are printed. These should be " @@ -2003,13 +1869,11 @@ msgid "" msgstr "Vitesse à laquelle les couches de surface du radeau sont imprimées. Elles doivent être imprimées légèrement plus lentement afin que la buse puisse lentement lisser les lignes de surface adjacentes." #: fdmprinter.json -#, fuzzy msgctxt "raft_interface_speed label" msgid "Raft Interface Print Speed" msgstr "Vitesse d’impression de la couche d'interface du radeau" #: fdmprinter.json -#, fuzzy msgctxt "raft_interface_speed description" msgid "" "The speed at which the interface raft layer is printed. This should be " @@ -2023,7 +1887,6 @@ msgid "Raft Base Print Speed" msgstr "Vitesse d’impression de la base du radeau" #: fdmprinter.json -#, fuzzy msgctxt "raft_base_speed description" msgid "" "The speed at which the base raft layer is printed. This should be printed " @@ -2032,7 +1895,6 @@ msgid "" msgstr "La vitesse à laquelle la couche de base du radeau est imprimée. Cette couche doit être imprimée suffisamment lentement du fait que la quantité de matériau sortant de la buse est assez importante." #: fdmprinter.json -#, fuzzy msgctxt "raft_fan_speed label" msgid "Raft Fan Speed" msgstr "Vitesse du ventilateur pendant le radeau" @@ -2043,43 +1905,36 @@ msgid "The fan speed for the raft." msgstr "La vitesse du ventilateur pour le radeau." #: fdmprinter.json -#, fuzzy msgctxt "raft_surface_fan_speed label" msgid "Raft Surface Fan Speed" msgstr "Vitesse du ventilateur pendant la surface du radeau" #: fdmprinter.json -#, fuzzy msgctxt "raft_surface_fan_speed description" msgid "The fan speed for the surface raft layers." msgstr "La vitesse du ventilateur pour les couches de surface du radeau." #: fdmprinter.json -#, fuzzy msgctxt "raft_interface_fan_speed label" msgid "Raft Interface Fan Speed" msgstr "Vitesse du ventilateur pour l'interface du radeau" #: fdmprinter.json -#, fuzzy msgctxt "raft_interface_fan_speed description" msgid "The fan speed for the interface raft layer." msgstr "La vitesse du ventilateur pour la couche d'interface du radeau." #: fdmprinter.json -#, fuzzy msgctxt "raft_base_fan_speed label" msgid "Raft Base Fan Speed" msgstr "Vitesse du ventilateur pour la base du radeau" #: fdmprinter.json -#, fuzzy msgctxt "raft_base_fan_speed description" msgid "The fan speed for the base raft layer." msgstr "La vitesse du ventilateur pour la couche de base du radeau." #: fdmprinter.json -#, fuzzy msgctxt "draft_shield_enabled label" msgid "Enable Draft Shield" msgstr "Activer le bouclier" @@ -2093,13 +1948,11 @@ msgid "" msgstr "Active les boucliers extérieurs. Cela créera une paroi autour de l'objet qui retient l'air (chaud) et protège contre les courants d'air. Particulièrement utile pour les matériaux qui se soulèvent facilement." #: fdmprinter.json -#, fuzzy msgctxt "draft_shield_dist label" msgid "Draft Shield X/Y Distance" msgstr "Distance X/Y du bouclier" #: fdmprinter.json -#, fuzzy msgctxt "draft_shield_dist description" msgid "Distance of the draft shield from the print, in the X/Y directions." msgstr "Distance entre la pièce et le bouclier dans les directions X et Y." @@ -2110,7 +1963,6 @@ msgid "Draft Shield Limitation" msgstr "Limite du bouclier" #: fdmprinter.json -#, fuzzy msgctxt "draft_shield_height_limitation description" msgid "Whether or not to limit the height of the draft shield." msgstr "Permet de limiter ou non la hauteur du bouclier." @@ -2126,7 +1978,6 @@ msgid "Limited" msgstr "Limitée" #: fdmprinter.json -#, fuzzy msgctxt "draft_shield_height label" msgid "Draft Shield Height" msgstr "Hauteur du bouclier" @@ -2139,19 +1990,16 @@ msgid "" msgstr "Hauteur limite du bouclier. Au-delà de cette hauteur, aucun bouclier ne sera imprimé." #: fdmprinter.json -#, fuzzy msgctxt "meshfix label" msgid "Mesh Fixes" msgstr "Corrections" #: fdmprinter.json -#, fuzzy msgctxt "meshfix_union_all label" msgid "Union Overlapping Volumes" msgstr "Joindre les volumes se chevauchant" #: fdmprinter.json -#, fuzzy msgctxt "meshfix_union_all description" msgid "" "Ignore the internal geometry arising from overlapping volumes and print the " @@ -2190,7 +2038,6 @@ msgid "Keep Disconnected Faces" msgstr "Conserver les faces disjointes" #: fdmprinter.json -#, fuzzy msgctxt "meshfix_keep_open_polygons description" msgid "" "Normally Cura tries to stitch up small holes in the mesh and remove parts of " @@ -2205,13 +2052,11 @@ msgid "Special Modes" msgstr "Modes spéciaux" #: fdmprinter.json -#, fuzzy msgctxt "print_sequence label" msgid "Print sequence" msgstr "Séquence d'impression" #: fdmprinter.json -#, fuzzy msgctxt "print_sequence description" msgid "" "Whether to print all objects one layer at a time or to wait for one object " @@ -2261,13 +2106,11 @@ msgid "Both" msgstr "Les deux" #: fdmprinter.json -#, fuzzy msgctxt "magic_spiralize label" msgid "Spiralize Outer Contour" msgstr "Spiraliser le contour extérieur" #: fdmprinter.json -#, fuzzy msgctxt "magic_spiralize description" msgid "" "Spiralize smooths out the Z move of the outer edge. This will create a " @@ -2289,7 +2132,6 @@ msgid "" msgstr "Produit une agitation aléatoire lors de l'impression de la paroi extérieure, ce qui lui donne une apparence rugueuse et floue." #: fdmprinter.json -#, fuzzy msgctxt "magic_fuzzy_skin_thickness label" msgid "Fuzzy Skin Thickness" msgstr "Épaisseur de la couche floue" @@ -2315,7 +2157,6 @@ msgid "" msgstr "Densité moyenne de points ajoutée à chaque polygone sur une couche. Notez que les points originaux du polygone ne seront plus pris en compte, une faible densité résultant alors en une diminution de la résolution." #: fdmprinter.json -#, fuzzy msgctxt "magic_fuzzy_skin_point_dist label" msgid "Fuzzy Skin Point Distance" msgstr "Distance entre les points de la couche floue" @@ -2344,13 +2185,11 @@ msgid "" msgstr "Imprime uniquement la surface extérieure avec une structure grillagée et clairsemée. Cette impression est « dans les airs » et est réalisée en imprimant horizontalement les contours du modèle aux intervalles donnés de l’axe Z et en les connectant au moyen de lignes ascendantes et diagonalement descendantes." #: fdmprinter.json -#, fuzzy msgctxt "wireframe_height label" msgid "WP Connection Height" msgstr "Hauteur de connexion pour l'impression filaire" #: fdmprinter.json -#, fuzzy msgctxt "wireframe_height description" msgid "" "The height of the upward and diagonally downward lines between two " @@ -2359,7 +2198,6 @@ msgid "" msgstr "La hauteur des lignes ascendantes et diagonalement descendantes entre deux pièces horizontales. Elle détermine la densité globale de la structure du filet. Uniquement applicable à l'impression filaire." #: fdmprinter.json -#, fuzzy msgctxt "wireframe_roof_inset label" msgid "WP Roof Inset Distance" msgstr "Distance d’insert de toit pour les impressions filaires" @@ -2372,7 +2210,6 @@ msgid "" msgstr "La distance couverte lors de l'impression d'une connexion d'un contour de toit vers l’intérieur. Uniquement applicable à l'impression filaire." #: fdmprinter.json -#, fuzzy msgctxt "wireframe_printspeed label" msgid "WP speed" msgstr "Vitesse d’impression filaire" @@ -2385,7 +2222,6 @@ msgid "" msgstr "Vitesse à laquelle la buse se déplace lorsqu’elle extrude du matériau. Uniquement applicable à l'impression filaire." #: fdmprinter.json -#, fuzzy msgctxt "wireframe_printspeed_bottom label" msgid "WP Bottom Printing Speed" msgstr "Vitesse d’impression filaire du bas" @@ -2398,7 +2234,6 @@ msgid "" msgstr "Vitesse d’impression de la première couche qui constitue la seule couche en contact avec le plateau d'impression. Uniquement applicable à l'impression filaire." #: fdmprinter.json -#, fuzzy msgctxt "wireframe_printspeed_up label" msgid "WP Upward Printing Speed" msgstr "Vitesse d’impression filaire ascendante" @@ -2410,7 +2245,6 @@ msgid "" msgstr "Vitesse d’impression d’une ligne ascendante « dans les airs ». Uniquement applicable à l'impression filaire." #: fdmprinter.json -#, fuzzy msgctxt "wireframe_printspeed_down label" msgid "WP Downward Printing Speed" msgstr "Vitesse d’impression filaire descendante" @@ -2422,7 +2256,6 @@ msgid "" msgstr "Vitesse d’impression d’une ligne diagonalement descendante. Uniquement applicable à l'impression filaire." #: fdmprinter.json -#, fuzzy msgctxt "wireframe_printspeed_flat label" msgid "WP Horizontal Printing Speed" msgstr "Vitesse d’impression filaire horizontale" @@ -2435,7 +2268,6 @@ msgid "" msgstr "Vitesse d'impression du contour horizontal de l'objet. Uniquement applicable à l'impression filaire." #: fdmprinter.json -#, fuzzy msgctxt "wireframe_flow label" msgid "WP Flow" msgstr "Débit de l'impression filaire" @@ -2448,7 +2280,6 @@ msgid "" msgstr "Compensation du débit : la quantité de matériau extrudée est multipliée par cette valeur. Uniquement applicable à l'impression filaire." #: fdmprinter.json -#, fuzzy msgctxt "wireframe_flow_connection label" msgid "WP Connection Flow" msgstr "Débit de connexion de l'impression filaire" @@ -2459,7 +2290,6 @@ msgid "Flow compensation when going up or down. Only applies to Wire Printing." msgstr "Compensation du débit lorsqu’il monte ou descend. Uniquement applicable à l'impression filaire." #: fdmprinter.json -#, fuzzy msgctxt "wireframe_flow_flat label" msgid "WP Flat Flow" msgstr "Débit des fils plats" @@ -2471,7 +2301,6 @@ msgid "" msgstr "Compensation du débit lors de l’impression de lignes planes. Uniquement applicable à l'impression filaire." #: fdmprinter.json -#, fuzzy msgctxt "wireframe_top_delay label" msgid "WP Top Delay" msgstr "Attente pour le haut de l'impression filaire" @@ -2484,25 +2313,21 @@ msgid "" msgstr "Temps d’attente après un déplacement vers le haut, afin que la ligne ascendante puisse durcir. Uniquement applicable à l'impression filaire." #: fdmprinter.json -#, fuzzy msgctxt "wireframe_bottom_delay label" msgid "WP Bottom Delay" msgstr "Attente pour le bas de l'impression filaire" #: fdmprinter.json -#, fuzzy msgctxt "wireframe_bottom_delay description" msgid "Delay time after a downward move. Only applies to Wire Printing." msgstr "Temps d’attente après un déplacement vers le bas. Uniquement applicable à l'impression filaire." #: fdmprinter.json -#, fuzzy msgctxt "wireframe_flat_delay label" msgid "WP Flat Delay" msgstr "Attente horizontale de l'impression filaire" #: fdmprinter.json -#, fuzzy msgctxt "wireframe_flat_delay description" msgid "" "Delay time between two horizontal segments. Introducing such a delay can " @@ -2511,7 +2336,6 @@ msgid "" msgstr "Attente entre deux segments horizontaux. L’introduction d’un tel temps d’attente peut permettre une meilleure adhérence aux couches précédentes au niveau des points de connexion, tandis que des temps d’attente trop longs peuvent provoquer un affaissement. Uniquement applicable à l'impression filaire." #: fdmprinter.json -#, fuzzy msgctxt "wireframe_up_half_speed label" msgid "WP Ease Upward" msgstr "Écart ascendant de l'impression filaire" @@ -2525,7 +2349,6 @@ msgid "" msgstr "Distance d’un déplacement ascendant qui est extrudé à mi-vitesse.\nCela peut permettre une meilleure adhérence aux couches précédentes sans surchauffer le matériau dans ces couches. Uniquement applicable à l'impression filaire." #: fdmprinter.json -#, fuzzy msgctxt "wireframe_top_jump label" msgid "WP Knot Size" msgstr "Taille de nœud de l'impression filaire" @@ -2539,7 +2362,6 @@ msgid "" msgstr "Crée un petit nœud en haut d’une ligne ascendante pour que la couche horizontale suivante s’y accroche davantage. Uniquement applicable à l'impression filaire." #: fdmprinter.json -#, fuzzy msgctxt "wireframe_fall_down label" msgid "WP Fall Down" msgstr "Descente de l'impression filaire" @@ -2552,7 +2374,6 @@ msgid "" msgstr "La distance de laquelle le matériau chute après avoir extrudé vers le haut. Cette distance est compensée. Uniquement applicable à l'impression filaire." #: fdmprinter.json -#, fuzzy msgctxt "wireframe_drag_along label" msgid "WP Drag along" msgstr "Entraînement de l'impression filaire" @@ -2566,13 +2387,11 @@ msgid "" msgstr "Distance sur laquelle le matériau d’une extrusion ascendante est entraîné par l’extrusion diagonalement descendante. La distance est compensée. Uniquement applicable à l'impression filaire." #: fdmprinter.json -#, fuzzy msgctxt "wireframe_strategy label" msgid "WP Strategy" msgstr "Stratégie de l'impression filaire" #: fdmprinter.json -#, fuzzy msgctxt "wireframe_strategy description" msgid "" "Strategy for making sure two consecutive layers connect at each connection " @@ -2595,13 +2414,11 @@ msgid "Knot" msgstr "Nœud" #: fdmprinter.json -#, fuzzy msgctxt "wireframe_strategy option retract" msgid "Retract" msgstr "Rétraction" #: fdmprinter.json -#, fuzzy msgctxt "wireframe_straight_before_down label" msgid "WP Straighten Downward Lines" msgstr "Redresser les lignes descendantes de l'impression filaire" @@ -2615,7 +2432,6 @@ msgid "" msgstr "Pourcentage d’une ligne diagonalement descendante couvert par une pièce à lignes horizontales. Cela peut empêcher le fléchissement du point le plus haut des lignes ascendantes. Uniquement applicable à l'impression filaire." #: fdmprinter.json -#, fuzzy msgctxt "wireframe_roof_fall_down label" msgid "WP Roof Fall Down" msgstr "Affaissement du dessus de l'impression filaire" @@ -2629,7 +2445,6 @@ msgid "" msgstr "La distance d’affaissement lors de l’impression des lignes horizontales du dessus d’une pièce qui sont imprimées « dans les airs ». Cet affaissement est compensé. Uniquement applicable à l'impression filaire." #: fdmprinter.json -#, fuzzy msgctxt "wireframe_roof_drag_along label" msgid "WP Roof Drag Along" msgstr "Entraînement du dessus de l'impression filaire" @@ -2643,13 +2458,11 @@ msgid "" msgstr "La distance parcourue par la pièce finale d’une ligne intérieure qui est entraînée lorsqu’elle retourne sur le contour extérieur du dessus. Cette distance est compensée. Uniquement applicable à l'impression filaire." #: fdmprinter.json -#, fuzzy msgctxt "wireframe_roof_outer_delay label" msgid "WP Roof Outer Delay" msgstr "Délai d'impression filaire de l'extérieur du dessus" #: fdmprinter.json -#, fuzzy msgctxt "wireframe_roof_outer_delay description" msgid "" "Time spent at the outer perimeters of hole which is to become a roof. Longer " @@ -2657,7 +2470,6 @@ msgid "" msgstr "Temps passé sur le périmètre extérieur de l’orifice qui deviendra le dessus. Un temps plus long peut garantir une meilleure connexion. Uniquement applicable pour l'impression filaire." #: fdmprinter.json -#, fuzzy msgctxt "wireframe_nozzle_clearance label" msgid "WP Nozzle Clearance" msgstr "Ecartement de la buse de l'impression filaire" From 47e856c927173f9012a74c6c227c8c85fb8942c4 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 22 Mar 2016 13:35:28 +0100 Subject: [PATCH 12/89] Add period at end for consistency Other plugin descriptions also have a period at the end. Contributes to issue CURA-1190. --- plugins/CuraEngineBackend/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/CuraEngineBackend/__init__.py b/plugins/CuraEngineBackend/__init__.py index 5aa12e6574..86a53d3ada 100644 --- a/plugins/CuraEngineBackend/__init__.py +++ b/plugins/CuraEngineBackend/__init__.py @@ -12,7 +12,7 @@ def getMetaData(): "plugin": { "name": catalog.i18nc("@label", "CuraEngine Backend"), "author": "Ultimaker", - "description": catalog.i18nc("@info:whatsthis", "Provides the link to the CuraEngine slicing backend"), + "description": catalog.i18nc("@info:whatsthis", "Provides the link to the CuraEngine slicing backend."), "api": 2 } } From b67ba04222215aa686421b3b249c42b60d69f4b4 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 22 Mar 2016 15:05:22 +0100 Subject: [PATCH 13/89] Fix key in metadata The description key was broken (typo). Contributes to issue CURA-1190. --- plugins/SolidView/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/SolidView/__init__.py b/plugins/SolidView/__init__.py index a2d874f8cb..0317648e6e 100644 --- a/plugins/SolidView/__init__.py +++ b/plugins/SolidView/__init__.py @@ -12,7 +12,7 @@ def getMetaData(): "name": i18n_catalog.i18nc("@label", "Solid View"), "author": "Ultimaker", "version": "1.0", - "decription": i18n_catalog.i18nc("@info:whatsthis", "Provides a normal solid mesh view."), + "description": i18n_catalog.i18nc("@info:whatsthis", "Provides a normal solid mesh view."), "api": 2 }, "view": { From 94b8ff7492f812d6b376ba063bca7317c2bebb3a Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 22 Mar 2016 15:06:13 +0100 Subject: [PATCH 14/89] Add period at the end The English translation had properly a period at the end of this sentence. German must too, for consistency. Contributes to issue CURA-1190. --- resources/i18n/de/cura.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/i18n/de/cura.po b/resources/i18n/de/cura.po index 67a8ae0bcf..a811b798d4 100644 --- a/resources/i18n/de/cura.po +++ b/resources/i18n/de/cura.po @@ -380,7 +380,7 @@ msgstr "Einstellungstool pro Objekt" #: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/__init__.py:15 msgctxt "@info:whatsthis" msgid "Provides the Per Object Settings." -msgstr "Bietet die Einstellungen pro Objekt" +msgstr "Bietet die Einstellungen pro Objekt." #: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/__init__.py:19 msgctxt "@label" From b457af108174821965ae8e3ee28eb3d34c0fec06 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 22 Mar 2016 15:07:05 +0100 Subject: [PATCH 15/89] Add period at end of plug-in description All other plug-in descriptions have that too. So for consistency. Contributes to issue CURA-1190. --- plugins/GCodeWriter/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/GCodeWriter/__init__.py b/plugins/GCodeWriter/__init__.py index 2c3a47ecef..cd8a5d3418 100644 --- a/plugins/GCodeWriter/__init__.py +++ b/plugins/GCodeWriter/__init__.py @@ -12,7 +12,7 @@ def getMetaData(): "name": catalog.i18nc("@label", "GCode Writer"), "author": "Ultimaker", "version": "1.0", - "description": catalog.i18nc("@info:whatsthis", "Writes GCode to a file"), + "description": catalog.i18nc("@info:whatsthis", "Writes GCode to a file."), "api": 2 }, From a056ddc885d7eb333ab323f7552bfffd35635a8a Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 22 Mar 2016 15:10:57 +0100 Subject: [PATCH 16/89] Add period at end of plug-in description For consistency. All other plug-ins have this (no really, now). Contributes to issue CURA-1190. --- plugins/ChangeLogPlugin/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/ChangeLogPlugin/__init__.py b/plugins/ChangeLogPlugin/__init__.py index 40c0621a63..42683d91dc 100644 --- a/plugins/ChangeLogPlugin/__init__.py +++ b/plugins/ChangeLogPlugin/__init__.py @@ -12,7 +12,7 @@ def getMetaData(): "name": catalog.i18nc("@label", "Changelog"), "author": "Ultimaker", "version": "1.0", - "description": catalog.i18nc("@info:whatsthis", "Shows changes since latest checked version"), + "description": catalog.i18nc("@info:whatsthis", "Shows changes since latest checked version."), "api": 2 } } From a60f63c71b5f4f1d739636bd465550ad03e69ae1 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 22 Mar 2016 15:38:01 +0100 Subject: [PATCH 17/89] Add internationalisation for ChangeLog plug-in Some of these strings were not translated. Contributes to issue CURA-1190. --- plugins/ChangeLogPlugin/ChangeLog.qml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/plugins/ChangeLogPlugin/ChangeLog.qml b/plugins/ChangeLogPlugin/ChangeLog.qml index 3379786493..86f80410d5 100644 --- a/plugins/ChangeLogPlugin/ChangeLog.qml +++ b/plugins/ChangeLogPlugin/ChangeLog.qml @@ -12,8 +12,8 @@ UM.Dialog { id: base minimumWidth: 400 - minimumHeight: 300; - title: "Changelog" + minimumHeight: 300 + title: catalog.i18nc("@label", "Changelog") ScrollView { @@ -28,8 +28,13 @@ UM.Dialog } Button { + UM.I18nCatalog + { + id: catalog + name: "cura" + } anchors.bottom:parent.bottom - text: "close" + text: catalog.i18nc("@action:button", "Close") onClicked: base.hide() anchors.horizontalCenter: parent.horizontalCenter } From a89e128f727f396046d485f6aa9f5c0657d9f06d Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 22 Mar 2016 17:02:42 +0100 Subject: [PATCH 18/89] Add period after description This is in line with most other descriptions. Contributes to issue CURA-1190. --- plugins/RemovableDriveOutputDevice/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/RemovableDriveOutputDevice/__init__.py b/plugins/RemovableDriveOutputDevice/__init__.py index de532ab65f..635bdde008 100644 --- a/plugins/RemovableDriveOutputDevice/__init__.py +++ b/plugins/RemovableDriveOutputDevice/__init__.py @@ -11,7 +11,7 @@ def getMetaData(): "plugin": { "name": catalog.i18nc("@label", "Removable Drive Output Device Plugin"), "author": "Ultimaker B.V.", - "description": catalog.i18nc("@info:whatsthis", "Provides removable drive hotplugging and writing support"), + "description": catalog.i18nc("@info:whatsthis", "Provides removable drive hotplugging and writing support."), "version": "1.0", "api": 2 } From 4725b1b0748b727023de16318e1f0ed486dfcc44 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 22 Mar 2016 18:00:46 +0100 Subject: [PATCH 19/89] Rename 'Other Wall' to 'Inner Wall' This is both more correct and more consistent with the descriptions. Contributes to issue CURA-1212. --- resources/machines/fdmprinter.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index 93b66694bd..e901a3ece2 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -260,7 +260,7 @@ "visible": false }, "wall_line_width_x": { - "label": "Other Walls Line Width", + "label": "Inner Wall(s) Line Width", "description": "Width of a single shell line for all shell lines except the outermost one.", "unit": "mm", "min_value": "0.0001", @@ -458,7 +458,7 @@ "enabled": "False" }, "remove_overlapping_walls_x_enabled": { - "label": "Remove Overlapping Other Wall Parts", + "label": "Remove Overlapping Inner Wall Parts", "description": "Remove parts of an inner wall which share an overlap which would result in overextrusion in some places. These overlaps occur in thin pieces in a model and sharp corners.", "type": "boolean", "default": true, From db628760d87af5c45e80e794ccb11865d2c41596 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 23 Mar 2016 12:04:08 +0100 Subject: [PATCH 20/89] Comment in start g-code for umo now has correct value --- resources/machines/ultimaker_original.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/machines/ultimaker_original.json b/resources/machines/ultimaker_original.json index b7b6055c5f..2662a70fa5 100644 --- a/resources/machines/ultimaker_original.json +++ b/resources/machines/ultimaker_original.json @@ -72,7 +72,7 @@ "machine_gcode_flavor": { "default": "RepRap (Marlin/Sprinter)" }, "machine_start_gcode": { - "default": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E6 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..." + "default": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E6 ;extrude 6 mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..." }, "machine_end_gcode": { "default": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning" From 71721811f574d2d93d05a55704a8ff74dc061083 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 23 Mar 2016 12:14:16 +0100 Subject: [PATCH 21/89] Rename Shell Speed to Wall Speed It only applies to the walls, not the skin, after all. Contributes to issue CURA-1183. --- resources/machines/fdmprinter.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index e901a3ece2..0c5c2ba690 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -847,7 +847,7 @@ "visible": false }, "speed_wall": { - "label": "Shell Speed", + "label": "Wall Speed", "description": "The speed at which the shell is printed. Printing the outer shell at a lower speed improves the final skin quality.", "unit": "mm/s", "type": "float", @@ -858,7 +858,7 @@ "inherit_function": "parent_value / 60 * 30", "children": { "speed_wall_0": { - "label": "Outer Shell Speed", + "label": "Outer Wall Speed", "description": "The speed at which the outer shell is printed. Printing the outer shell at a lower speed improves the final skin quality. However, having a large difference between the inner shell speed and the outer shell speed will effect quality in a negative way.", "unit": "mm/s", "type": "float", @@ -868,7 +868,7 @@ "visible": false }, "speed_wall_x": { - "label": "Inner Shell Speed", + "label": "Inner Wall Speed", "description": "The speed at which all inner shells are printed. Printing the inner shell faster than the outer shell will reduce printing time. It works well to set this in between the outer shell speed and the infill speed.", "unit": "mm/s", "type": "float", From feb1ed4c2ea0c842b67d2015aa40d6c9564b762b Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Wed, 23 Mar 2016 12:40:46 +0100 Subject: [PATCH 22/89] JSON fix: handle fuzzy skin min/max (CURA-1225) --- resources/machines/fdmprinter.json | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index e901a3ece2..1adb21f215 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -1966,9 +1966,10 @@ "type": "float", "unit": "1/mm", "default": 1.25, + "min_value": "0", "min_value_warning": "0.1", "max_value_warning": "10", - "max_value": "10000", + "max_value": "2 / magic_fuzzy_skin_thickness", "visible": false, "enabled": "magic_fuzzy_skin_enabled", "children": { @@ -1978,9 +1979,10 @@ "type": "float", "unit": "mm", "default": 0.8, - "min_value_warning": "0.0001", + "min_value": "magic_fuzzy_skin_thickness / 2", + "min_value_warning": "0.1", "max_value_warning": "10", - "inherit_function": "1/parent_value", + "inherit_function": "10000 if parent_value == 0 else 1 / parent_value", "visible": false, "enabled": "magic_fuzzy_skin_enabled" } From 5037fab1b3134f6cbbc320a18935e652a650fb68 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Wed, 23 Mar 2016 13:26:51 +0100 Subject: [PATCH 23/89] JSON: fixed defaults which should hold for all machines (CURA-1195) --- resources/machines/fdmprinter.json | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index 90ed7e5801..2b026cc4df 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -603,6 +603,7 @@ "unit": "mm", "type": "float", "default": 0.04, + "inherit_function": "wall_line_width_0 / 4 if wall_line_count == 1 else wall_line_width_x / 4", "min_value_warning": "0", "max_value_warning": "machine_nozzle_size", "visible": false @@ -779,6 +780,7 @@ "unit": "mm", "type": "float", "default": 1.5, + "inherit_function": "line_width * 2", "min_value": "0", "max_value_warning": "10", "visible": false, @@ -788,7 +790,7 @@ "retraction_count_max": { "label": "Maximum Retraction Count", "description": "This setting limits the number of retractions occurring within the Minimum Extrusion Distance Window. Further retractions within this window will be ignored. This avoids retracting repeatedly on the same piece of filament, as that can flatten the filament and cause grinding issues.", - "default": 8, + "default": 45, "min_value": "0", "max_value_warning": "100", "type": "int", @@ -971,7 +973,7 @@ "label": "Number of Slower Layers", "description": "The first few layers are printed slower than the rest of the object, this to get better adhesion to the printer bed and improve the overall success rate of prints. The speed is gradually increased over these layers. 4 layers of speed-up is generally right for most materials and printers.", "type": "int", - "default": 4, + "default": 2, "min_value": "0", "max_value_warning": "300", "visible": false, @@ -1007,6 +1009,7 @@ "unit": "mm", "type": "float", "default": 1.5, + "inherit_function": "machine_nozzle_tip_outer_diameter * 1.25", "min_value": "0", "max_value_warning": "machine_nozzle_tip_outer_diameter * 5", "visible": false, @@ -1119,6 +1122,7 @@ "unit": "mm", "type": "float", "default": 0.5, + "inherit_function": "layer_height_0", "min_value": "0", "max_value_warning": "10.0", "visible": false, @@ -1128,7 +1132,7 @@ "label": "Fan Full on at Layer", "description": "The layer number at which the fan is turned on completely. For the layers below this the fan speed is scaled linearly with the fan off for the first layer.", "type": "int", - "default": 4, + "default": 1, "min_value": "0", "max_value_warning": "100", "visible": false, From 6a150b3b7deead7a5a321d33aa512e8763d0fd90 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Wed, 23 Mar 2016 13:28:27 +0100 Subject: [PATCH 24/89] profiles: removed superfluous cool_fan_full=2 (CURA-1195) --- resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile | 1 - resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile | 1 - resources/profiles/ultimaker2+/pla_0.4_high.curaprofile | 1 - resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile | 1 - resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile | 1 - resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile | 1 - resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile | 1 - resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile | 1 - resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile | 1 - resources/profiles/ultimaker2_olsson/0.4_high.curaprofile | 1 - resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile | 1 - resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile | 1 - resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile | 1 - resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile | 1 - 14 files changed, 14 deletions(-) diff --git a/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile index 13790826e9..ba5c844690 100644 --- a/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile @@ -24,5 +24,4 @@ speed_topbottom = 20 speed_layer_0 = 25 speed_slowdown_layers = 2 travel_avoid_distance = 1 -cool_fan_full_layer = 2 cool_min_layer_time_fan_speed_max = 15 diff --git a/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile index 8360656d0e..320eb87682 100644 --- a/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile @@ -23,5 +23,4 @@ speed_travel = 150 speed_layer_0 = 25 speed_slowdown_layers = 2 travel_avoid_distance = 1 -cool_fan_full_layer = 2 cool_min_layer_time_fan_speed_max = 15 diff --git a/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile index 24f0a98c13..727986ebc5 100644 --- a/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile @@ -23,5 +23,4 @@ speed_topbottom = 20 speed_layer_0 = 25 speed_slowdown_layers = 2 travel_avoid_distance = 1 -cool_fan_full_layer = 2 cool_min_layer_time_fan_speed_max = 15 \ No newline at end of file diff --git a/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile index 70027b68b0..225d033f50 100644 --- a/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile @@ -22,5 +22,4 @@ speed_topbottom = 20 speed_layer_0 = 25 speed_slowdown_layers = 2 travel_avoid_distance = 1 -cool_fan_full_layer = 2 cool_min_layer_time_fan_speed_max = 15 diff --git a/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile index 416b85f798..ce4e4c5692 100644 --- a/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile @@ -24,5 +24,4 @@ speed_topbottom = 20 speed_layer_0 = 25 speed_slowdown_layers = 2 travel_avoid_distance = 1 -cool_fan_full_layer = 2 cool_min_layer_time_fan_speed_max = 15 diff --git a/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile index 5edaffb80e..2a129a7cd0 100644 --- a/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile @@ -23,5 +23,4 @@ speed_topbottom = 20 speed_layer_0 = 25 speed_slowdown_layers = 2 travel_avoid_distance = 1.2 -cool_fan_full_layer = 2 cool_min_layer_time_fan_speed_max = 20 diff --git a/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile index 068c11713c..8e8bd8196d 100644 --- a/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile @@ -23,5 +23,4 @@ speed_topbottom = 20 speed_layer_0 = 25 speed_slowdown_layers = 2 travel_avoid_distance = 1.6 -cool_fan_full_layer = 2 cool_min_layer_time_fan_speed_max = 25 diff --git a/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile index 83aa6b2f4b..eed3bb0a9a 100644 --- a/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile @@ -25,5 +25,4 @@ speed_topbottom = 20 speed_layer_0 = 25 speed_slowdown_layers = 2 travel_avoid_distance = 1 -cool_fan_full_layer = 2 cool_min_layer_time_fan_speed_max = 15 diff --git a/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile index e98cb44a55..0e226cd765 100644 --- a/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile @@ -24,5 +24,4 @@ speed_travel = 150 speed_layer_0 = 25 speed_slowdown_layers = 2 travel_avoid_distance = 1 -cool_fan_full_layer = 2 cool_min_layer_time_fan_speed_max = 15 diff --git a/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile index 07266a20e6..d7aa832fc5 100644 --- a/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile @@ -24,5 +24,4 @@ speed_topbottom = 20 speed_layer_0 = 25 speed_slowdown_layers = 2 travel_avoid_distance = 1 -cool_fan_full_layer = 2 cool_min_layer_time_fan_speed_max = 15 diff --git a/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile index b57fa02fb7..8acd8c16d8 100644 --- a/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile @@ -23,5 +23,4 @@ speed_topbottom = 20 speed_layer_0 = 25 speed_slowdown_layers = 2 travel_avoid_distance = 1 -cool_fan_full_layer = 2 cool_min_layer_time_fan_speed_max = 15 \ No newline at end of file diff --git a/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile index 825869e547..ceab9ce274 100644 --- a/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile @@ -24,5 +24,4 @@ speed_topbottom = 20 speed_layer_0 = 25 speed_slowdown_layers = 2 travel_avoid_distance = 1 -cool_fan_full_layer = 2 cool_min_layer_time_fan_speed_max = 15 diff --git a/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile index 406994fb3d..8278ff5882 100644 --- a/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile @@ -24,5 +24,4 @@ speed_topbottom = 20 speed_layer_0 = 25 speed_slowdown_layers = 2 travel_avoid_distance = 1.2 -cool_fan_full_layer = 2 cool_min_layer_time_fan_speed_max = 20 \ No newline at end of file diff --git a/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile index 32dc0f48e4..de2a946c66 100644 --- a/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile @@ -25,5 +25,4 @@ speed_topbottom = 20 speed_layer_0 = 25 speed_slowdown_layers = 2 travel_avoid_distance = 1.6 -cool_fan_full_layer = 2 cool_min_layer_time_fan_speed_max = 25 From 40adb5b7e3b030e7f04c9af8056abf883b397d05 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Wed, 23 Mar 2016 13:42:19 +0100 Subject: [PATCH 25/89] profiles: removed superfluous/outdated retraction_count_max (CURA-1195) --- resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile | 1 - resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile | 1 - resources/profiles/ultimaker2+/pla_0.4_high.curaprofile | 1 - resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile | 1 - resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile | 1 - resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile | 1 - resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile | 1 - resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile | 1 - resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile | 1 - resources/profiles/ultimaker2_olsson/0.4_high.curaprofile | 1 - resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile | 1 - resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile | 1 - resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile | 1 - resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile | 1 - 14 files changed, 14 deletions(-) diff --git a/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile index ba5c844690..1bad40ef8d 100644 --- a/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile @@ -16,7 +16,6 @@ infill_sparse_density = 22 infill_wipe_dist = 0.1 retraction_amount = 6 retraction_min_travel = 0.5 -retraction_count_max = 30 speed_infill = 30 speed_wall_0 = 20 speed_wall_x = 25 diff --git a/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile index 320eb87682..0890c1a672 100644 --- a/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile @@ -16,7 +16,6 @@ infill_sparse_density = 18 infill_wipe_dist = 0.2 retraction_amount = 5.5 retraction_min_travel = 0.5 -retraction_count_max = 30 speed_wall_0 = 40 speed_wall_x = 50 speed_travel = 150 diff --git a/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile index 727986ebc5..5bd29a7f39 100644 --- a/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile @@ -16,7 +16,6 @@ infill_sparse_density = 22 infill_wipe_dist = 0.2 retraction_amount = 5.5 retraction_min_travel = 0.5 -retraction_count_max = 30 speed_infill = 50 speed_wall_x = 40 speed_topbottom = 20 diff --git a/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile index 225d033f50..366f7a83e1 100644 --- a/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile @@ -15,7 +15,6 @@ top_bottom_thickness = 0.8 infill_wipe_dist = 0.2 retraction_amount = 5.5 retraction_min_travel = 0.5 -retraction_count_max = 30 speed_infill = 50 speed_wall_x = 40 speed_topbottom = 20 diff --git a/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile index ce4e4c5692..8b0e42e015 100644 --- a/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile @@ -16,7 +16,6 @@ infill_sparse_density = 25 infill_wipe_dist = 0.2 retraction_amount = 5.5 retraction_min_travel = 0.5 -retraction_count_max = 30 retraction_extrusion_window = 6 speed_infill = 50 speed_wall_x = 40 diff --git a/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile index 2a129a7cd0..14f0f6c9c4 100644 --- a/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile @@ -15,7 +15,6 @@ top_bottom_thickness = 1.2 infill_wipe_dist = 0.3 retraction_amount = 6 retraction_min_travel = 0.5 -retraction_count_max = 30 speed_infill = 55 speed_wall_0 = 25 speed_wall_x = 40 diff --git a/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile index 8e8bd8196d..20bd0a8d39 100644 --- a/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile @@ -15,7 +15,6 @@ top_bottom_thickness = 1.6 infill_wipe_dist = 0.4 retraction_amount = 6 retraction_min_travel = 0.5 -retraction_count_max = 30 speed_infill = 40 speed_wall_0 = 20 speed_wall_x = 30 diff --git a/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile index eed3bb0a9a..21d81fa8c0 100644 --- a/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile @@ -16,7 +16,6 @@ infill_overlap = 0.022 infill_wipe_dist = 0.1 retraction_amount = 6 retraction_min_travel = 0.5 -retraction_count_max = 30 retraction_extrusion_window = 6 speed_infill = 30 speed_wall_0 = 20 diff --git a/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile index 0e226cd765..ed1dce2e32 100644 --- a/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile @@ -16,7 +16,6 @@ infill_overlap = 0.035 infill_wipe_dist = 0.2 retraction_amount = 5.5 retraction_min_travel = 0.5 -retraction_count_max = 30 retraction_extrusion_window = 6 speed_wall_0 = 40 speed_wall_x = 50 diff --git a/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile index d7aa832fc5..8d4a6c6567 100644 --- a/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile @@ -16,7 +16,6 @@ infill_overlap = 0.035 infill_wipe_dist = 0.2 retraction_amount = 5.5 retraction_min_travel = 0.5 -retraction_count_max = 30 retraction_extrusion_window = 6 speed_infill = 50 speed_wall_x = 40 diff --git a/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile index 8acd8c16d8..82efd17096 100644 --- a/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile @@ -15,7 +15,6 @@ infill_overlap = 0.035 infill_wipe_dist = 0.2 retraction_amount = 5.5 retraction_min_travel = 0.5 -retraction_count_max = 30 retraction_extrusion_window = 6 speed_infill = 50 speed_wall_x = 40 diff --git a/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile index ceab9ce274..e72c5ae95d 100644 --- a/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile @@ -16,7 +16,6 @@ infill_overlap = 0.035 infill_wipe_dist = 0.2 retraction_amount = 5.5 retraction_min_travel = 0.5 -retraction_count_max = 30 retraction_extrusion_window = 6 speed_infill = 50 speed_wall_x = 40 diff --git a/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile index 8278ff5882..e4a347618c 100644 --- a/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile @@ -15,7 +15,6 @@ infill_overlap = 0.053 infill_wipe_dist = 0.3 retraction_amount = 6 retraction_min_travel = 0.5 -retraction_count_max = 30 retraction_extrusion_window = 6 speed_infill = 55 speed_wall_0 = 25 diff --git a/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile index de2a946c66..1bd7967620 100644 --- a/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile @@ -16,7 +16,6 @@ infill_overlap = 0.07 infill_wipe_dist = 0.4 retraction_amount = 6 retraction_min_travel = 0.5 -retraction_count_max = 30 retraction_extrusion_window = 6 speed_infill = 40 speed_wall_0 = 20 From 12349d1228a74f65b4da37dc12ee38716a42e18e Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Wed, 23 Mar 2016 13:45:38 +0100 Subject: [PATCH 26/89] profiles: removed superfluous/outdated retraction_min_travel (CURA-1195) --- resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile | 1 - resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile | 1 - resources/profiles/ultimaker2+/pla_0.4_high.curaprofile | 1 - resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile | 1 - resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile | 1 - resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile | 1 - resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile | 1 - resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile | 1 - resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile | 1 - resources/profiles/ultimaker2_olsson/0.4_high.curaprofile | 1 - resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile | 1 - resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile | 1 - resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile | 1 - resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile | 1 - 14 files changed, 14 deletions(-) diff --git a/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile index 1bad40ef8d..9f1f1d2a4e 100644 --- a/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile @@ -15,7 +15,6 @@ top_bottom_thickness = 0.72 infill_sparse_density = 22 infill_wipe_dist = 0.1 retraction_amount = 6 -retraction_min_travel = 0.5 speed_infill = 30 speed_wall_0 = 20 speed_wall_x = 25 diff --git a/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile index 0890c1a672..57ac781c85 100644 --- a/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile @@ -15,7 +15,6 @@ top_bottom_thickness = 0.6 infill_sparse_density = 18 infill_wipe_dist = 0.2 retraction_amount = 5.5 -retraction_min_travel = 0.5 speed_wall_0 = 40 speed_wall_x = 50 speed_travel = 150 diff --git a/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile index 5bd29a7f39..aeea8e9a0f 100644 --- a/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile @@ -15,7 +15,6 @@ top_bottom_thickness = 0.84 infill_sparse_density = 22 infill_wipe_dist = 0.2 retraction_amount = 5.5 -retraction_min_travel = 0.5 speed_infill = 50 speed_wall_x = 40 speed_topbottom = 20 diff --git a/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile index 366f7a83e1..bd5600efcc 100644 --- a/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile @@ -14,7 +14,6 @@ shell_thickness = 1.05 top_bottom_thickness = 0.8 infill_wipe_dist = 0.2 retraction_amount = 5.5 -retraction_min_travel = 0.5 speed_infill = 50 speed_wall_x = 40 speed_topbottom = 20 diff --git a/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile index 8b0e42e015..067327ee18 100644 --- a/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile @@ -15,7 +15,6 @@ top_bottom_thickness = 1.12 infill_sparse_density = 25 infill_wipe_dist = 0.2 retraction_amount = 5.5 -retraction_min_travel = 0.5 retraction_extrusion_window = 6 speed_infill = 50 speed_wall_x = 40 diff --git a/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile index 14f0f6c9c4..c0d98b5b7c 100644 --- a/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile @@ -14,7 +14,6 @@ shell_thickness = 1.59 top_bottom_thickness = 1.2 infill_wipe_dist = 0.3 retraction_amount = 6 -retraction_min_travel = 0.5 speed_infill = 55 speed_wall_0 = 25 speed_wall_x = 40 diff --git a/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile index 20bd0a8d39..551506e500 100644 --- a/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile @@ -14,7 +14,6 @@ shell_thickness = 2.1 top_bottom_thickness = 1.6 infill_wipe_dist = 0.4 retraction_amount = 6 -retraction_min_travel = 0.5 speed_infill = 40 speed_wall_0 = 20 speed_wall_x = 30 diff --git a/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile index 21d81fa8c0..1ecc1abbf9 100644 --- a/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile @@ -15,7 +15,6 @@ infill_sparse_density = 22 infill_overlap = 0.022 infill_wipe_dist = 0.1 retraction_amount = 6 -retraction_min_travel = 0.5 retraction_extrusion_window = 6 speed_infill = 30 speed_wall_0 = 20 diff --git a/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile index ed1dce2e32..b02230cf54 100644 --- a/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile @@ -15,7 +15,6 @@ infill_sparse_density = 18 infill_overlap = 0.035 infill_wipe_dist = 0.2 retraction_amount = 5.5 -retraction_min_travel = 0.5 retraction_extrusion_window = 6 speed_wall_0 = 40 speed_wall_x = 50 diff --git a/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile index 8d4a6c6567..4554b4b969 100644 --- a/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile @@ -15,7 +15,6 @@ infill_sparse_density = 22 infill_overlap = 0.035 infill_wipe_dist = 0.2 retraction_amount = 5.5 -retraction_min_travel = 0.5 retraction_extrusion_window = 6 speed_infill = 50 speed_wall_x = 40 diff --git a/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile index 82efd17096..d3a8a87536 100644 --- a/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile @@ -14,7 +14,6 @@ top_bottom_thickness = 0.8 infill_overlap = 0.035 infill_wipe_dist = 0.2 retraction_amount = 5.5 -retraction_min_travel = 0.5 retraction_extrusion_window = 6 speed_infill = 50 speed_wall_x = 40 diff --git a/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile index e72c5ae95d..bc0a92e6f1 100644 --- a/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile @@ -15,7 +15,6 @@ infill_sparse_density = 25 infill_overlap = 0.035 infill_wipe_dist = 0.2 retraction_amount = 5.5 -retraction_min_travel = 0.5 retraction_extrusion_window = 6 speed_infill = 50 speed_wall_x = 40 diff --git a/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile index e4a347618c..5331bab710 100644 --- a/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile @@ -14,7 +14,6 @@ top_bottom_thickness = 1.2 infill_overlap = 0.053 infill_wipe_dist = 0.3 retraction_amount = 6 -retraction_min_travel = 0.5 retraction_extrusion_window = 6 speed_infill = 55 speed_wall_0 = 25 diff --git a/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile index 1bd7967620..680584531d 100644 --- a/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile @@ -15,7 +15,6 @@ infill_sparse_density = 20 infill_overlap = 0.07 infill_wipe_dist = 0.4 retraction_amount = 6 -retraction_min_travel = 0.5 retraction_extrusion_window = 6 speed_infill = 40 speed_wall_0 = 20 From fc974c25c2f80be79c3c219f1bafe47de1851b64 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Wed, 23 Mar 2016 13:47:12 +0100 Subject: [PATCH 27/89] profiles: removed superfluous/outdated travel_avoid_distance (CURA-1195) --- resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile | 1 - resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile | 1 - resources/profiles/ultimaker2+/pla_0.4_high.curaprofile | 1 - resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile | 1 - resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile | 1 - resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile | 1 - resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile | 1 - resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile | 1 - resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile | 1 - resources/profiles/ultimaker2_olsson/0.4_high.curaprofile | 1 - resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile | 1 - resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile | 1 - resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile | 1 - resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile | 1 - 14 files changed, 14 deletions(-) diff --git a/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile index 9f1f1d2a4e..339b248a10 100644 --- a/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile @@ -21,5 +21,4 @@ speed_wall_x = 25 speed_topbottom = 20 speed_layer_0 = 25 speed_slowdown_layers = 2 -travel_avoid_distance = 1 cool_min_layer_time_fan_speed_max = 15 diff --git a/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile index 57ac781c85..76e563fa92 100644 --- a/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile @@ -20,5 +20,4 @@ speed_wall_x = 50 speed_travel = 150 speed_layer_0 = 25 speed_slowdown_layers = 2 -travel_avoid_distance = 1 cool_min_layer_time_fan_speed_max = 15 diff --git a/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile index aeea8e9a0f..2e668f2155 100644 --- a/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile @@ -20,5 +20,4 @@ speed_wall_x = 40 speed_topbottom = 20 speed_layer_0 = 25 speed_slowdown_layers = 2 -travel_avoid_distance = 1 cool_min_layer_time_fan_speed_max = 15 \ No newline at end of file diff --git a/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile index bd5600efcc..126be39d4d 100644 --- a/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile @@ -19,5 +19,4 @@ speed_wall_x = 40 speed_topbottom = 20 speed_layer_0 = 25 speed_slowdown_layers = 2 -travel_avoid_distance = 1 cool_min_layer_time_fan_speed_max = 15 diff --git a/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile index 067327ee18..c1907a12c5 100644 --- a/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile @@ -21,5 +21,4 @@ speed_wall_x = 40 speed_topbottom = 20 speed_layer_0 = 25 speed_slowdown_layers = 2 -travel_avoid_distance = 1 cool_min_layer_time_fan_speed_max = 15 diff --git a/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile index c0d98b5b7c..ea0f3ce7e7 100644 --- a/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile @@ -20,5 +20,4 @@ speed_wall_x = 40 speed_topbottom = 20 speed_layer_0 = 25 speed_slowdown_layers = 2 -travel_avoid_distance = 1.2 cool_min_layer_time_fan_speed_max = 20 diff --git a/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile index 551506e500..fe799ba5fb 100644 --- a/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile @@ -20,5 +20,4 @@ speed_wall_x = 30 speed_topbottom = 20 speed_layer_0 = 25 speed_slowdown_layers = 2 -travel_avoid_distance = 1.6 cool_min_layer_time_fan_speed_max = 25 diff --git a/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile index 1ecc1abbf9..e2d1a78ce0 100644 --- a/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile @@ -22,5 +22,4 @@ speed_wall_x = 25 speed_topbottom = 20 speed_layer_0 = 25 speed_slowdown_layers = 2 -travel_avoid_distance = 1 cool_min_layer_time_fan_speed_max = 15 diff --git a/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile index b02230cf54..66aeceba4f 100644 --- a/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile @@ -21,5 +21,4 @@ speed_wall_x = 50 speed_travel = 150 speed_layer_0 = 25 speed_slowdown_layers = 2 -travel_avoid_distance = 1 cool_min_layer_time_fan_speed_max = 15 diff --git a/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile index 4554b4b969..4435d510c5 100644 --- a/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile @@ -21,5 +21,4 @@ speed_wall_x = 40 speed_topbottom = 20 speed_layer_0 = 25 speed_slowdown_layers = 2 -travel_avoid_distance = 1 cool_min_layer_time_fan_speed_max = 15 diff --git a/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile index d3a8a87536..fbe6b45e7e 100644 --- a/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile @@ -20,5 +20,4 @@ speed_wall_x = 40 speed_topbottom = 20 speed_layer_0 = 25 speed_slowdown_layers = 2 -travel_avoid_distance = 1 cool_min_layer_time_fan_speed_max = 15 \ No newline at end of file diff --git a/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile index bc0a92e6f1..adbad90b62 100644 --- a/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile @@ -21,5 +21,4 @@ speed_wall_x = 40 speed_topbottom = 20 speed_layer_0 = 25 speed_slowdown_layers = 2 -travel_avoid_distance = 1 cool_min_layer_time_fan_speed_max = 15 diff --git a/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile index 5331bab710..6c6690a762 100644 --- a/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile @@ -21,5 +21,4 @@ speed_wall_x = 40 speed_topbottom = 20 speed_layer_0 = 25 speed_slowdown_layers = 2 -travel_avoid_distance = 1.2 cool_min_layer_time_fan_speed_max = 20 \ No newline at end of file diff --git a/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile index 680584531d..87dfda4de1 100644 --- a/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile @@ -22,5 +22,4 @@ speed_wall_x = 30 speed_topbottom = 20 speed_layer_0 = 25 speed_slowdown_layers = 2 -travel_avoid_distance = 1.6 cool_min_layer_time_fan_speed_max = 25 From a7aafe958b4c543818f773ca53f2a7d039501189 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Wed, 23 Mar 2016 13:49:08 +0100 Subject: [PATCH 28/89] profiles: removed superfluous speed_slowdown_layers (CURA-1195) --- resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile | 1 - resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile | 1 - resources/profiles/ultimaker2+/pla_0.4_high.curaprofile | 1 - resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile | 1 - resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile | 1 - resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile | 1 - resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile | 1 - resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile | 1 - resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile | 1 - resources/profiles/ultimaker2_olsson/0.4_high.curaprofile | 1 - resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile | 1 - resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile | 1 - resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile | 1 - resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile | 1 - 14 files changed, 14 deletions(-) diff --git a/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile index 339b248a10..86e345cfbd 100644 --- a/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile @@ -20,5 +20,4 @@ speed_wall_0 = 20 speed_wall_x = 25 speed_topbottom = 20 speed_layer_0 = 25 -speed_slowdown_layers = 2 cool_min_layer_time_fan_speed_max = 15 diff --git a/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile index 76e563fa92..012f1841b6 100644 --- a/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile @@ -19,5 +19,4 @@ speed_wall_0 = 40 speed_wall_x = 50 speed_travel = 150 speed_layer_0 = 25 -speed_slowdown_layers = 2 cool_min_layer_time_fan_speed_max = 15 diff --git a/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile index 2e668f2155..639b6f40bf 100644 --- a/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile @@ -19,5 +19,4 @@ speed_infill = 50 speed_wall_x = 40 speed_topbottom = 20 speed_layer_0 = 25 -speed_slowdown_layers = 2 cool_min_layer_time_fan_speed_max = 15 \ No newline at end of file diff --git a/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile index 126be39d4d..1dbc1f0e2e 100644 --- a/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile @@ -18,5 +18,4 @@ speed_infill = 50 speed_wall_x = 40 speed_topbottom = 20 speed_layer_0 = 25 -speed_slowdown_layers = 2 cool_min_layer_time_fan_speed_max = 15 diff --git a/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile index c1907a12c5..8fe8298c39 100644 --- a/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile @@ -20,5 +20,4 @@ speed_infill = 50 speed_wall_x = 40 speed_topbottom = 20 speed_layer_0 = 25 -speed_slowdown_layers = 2 cool_min_layer_time_fan_speed_max = 15 diff --git a/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile index ea0f3ce7e7..ca1b92d426 100644 --- a/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile @@ -19,5 +19,4 @@ speed_wall_0 = 25 speed_wall_x = 40 speed_topbottom = 20 speed_layer_0 = 25 -speed_slowdown_layers = 2 cool_min_layer_time_fan_speed_max = 20 diff --git a/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile index fe799ba5fb..c587fe185f 100644 --- a/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile @@ -19,5 +19,4 @@ speed_wall_0 = 20 speed_wall_x = 30 speed_topbottom = 20 speed_layer_0 = 25 -speed_slowdown_layers = 2 cool_min_layer_time_fan_speed_max = 25 diff --git a/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile index e2d1a78ce0..dda2bc2226 100644 --- a/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile @@ -21,5 +21,4 @@ speed_wall_0 = 20 speed_wall_x = 25 speed_topbottom = 20 speed_layer_0 = 25 -speed_slowdown_layers = 2 cool_min_layer_time_fan_speed_max = 15 diff --git a/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile index 66aeceba4f..841e1d8260 100644 --- a/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile @@ -20,5 +20,4 @@ speed_wall_0 = 40 speed_wall_x = 50 speed_travel = 150 speed_layer_0 = 25 -speed_slowdown_layers = 2 cool_min_layer_time_fan_speed_max = 15 diff --git a/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile index 4435d510c5..c693f22a06 100644 --- a/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile @@ -20,5 +20,4 @@ speed_infill = 50 speed_wall_x = 40 speed_topbottom = 20 speed_layer_0 = 25 -speed_slowdown_layers = 2 cool_min_layer_time_fan_speed_max = 15 diff --git a/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile index fbe6b45e7e..2b3cbe2050 100644 --- a/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile @@ -19,5 +19,4 @@ speed_infill = 50 speed_wall_x = 40 speed_topbottom = 20 speed_layer_0 = 25 -speed_slowdown_layers = 2 cool_min_layer_time_fan_speed_max = 15 \ No newline at end of file diff --git a/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile index adbad90b62..4914a8aaf1 100644 --- a/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile @@ -20,5 +20,4 @@ speed_infill = 50 speed_wall_x = 40 speed_topbottom = 20 speed_layer_0 = 25 -speed_slowdown_layers = 2 cool_min_layer_time_fan_speed_max = 15 diff --git a/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile index 6c6690a762..fea68c2333 100644 --- a/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile @@ -20,5 +20,4 @@ speed_wall_0 = 25 speed_wall_x = 40 speed_topbottom = 20 speed_layer_0 = 25 -speed_slowdown_layers = 2 cool_min_layer_time_fan_speed_max = 20 \ No newline at end of file diff --git a/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile index 87dfda4de1..e5aecf6f30 100644 --- a/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile @@ -21,5 +21,4 @@ speed_wall_0 = 20 speed_wall_x = 30 speed_topbottom = 20 speed_layer_0 = 25 -speed_slowdown_layers = 2 cool_min_layer_time_fan_speed_max = 25 From fd27fcb52d1641e294d14b0d4bea674ad8e10cba Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Wed, 23 Mar 2016 13:50:34 +0100 Subject: [PATCH 29/89] profiles: removed superfluous/outdated infill_wipe_dist (CURA-1195) --- resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile | 1 - resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile | 1 - resources/profiles/ultimaker2+/pla_0.4_high.curaprofile | 1 - resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile | 1 - resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile | 1 - resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile | 1 - resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile | 1 - resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile | 1 - resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile | 1 - resources/profiles/ultimaker2_olsson/0.4_high.curaprofile | 1 - resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile | 1 - resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile | 1 - resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile | 1 - resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile | 1 - 14 files changed, 14 deletions(-) diff --git a/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile index 86e345cfbd..d05c74f906 100644 --- a/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile @@ -13,7 +13,6 @@ layer_height_0 = 0.15 shell_thickness = 0.88 top_bottom_thickness = 0.72 infill_sparse_density = 22 -infill_wipe_dist = 0.1 retraction_amount = 6 speed_infill = 30 speed_wall_0 = 20 diff --git a/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile index 012f1841b6..60566f7933 100644 --- a/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile @@ -13,7 +13,6 @@ layer_height_0 = 0.26 shell_thickness = 0.7 top_bottom_thickness = 0.6 infill_sparse_density = 18 -infill_wipe_dist = 0.2 retraction_amount = 5.5 speed_wall_0 = 40 speed_wall_x = 50 diff --git a/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile index 639b6f40bf..a1009af9a9 100644 --- a/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile @@ -13,7 +13,6 @@ layer_height_0 = 0.26 shell_thickness = 1.05 top_bottom_thickness = 0.84 infill_sparse_density = 22 -infill_wipe_dist = 0.2 retraction_amount = 5.5 speed_infill = 50 speed_wall_x = 40 diff --git a/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile index 1dbc1f0e2e..34d1a0ef5d 100644 --- a/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile @@ -12,7 +12,6 @@ layer_height = 0.1 layer_height_0 = 0.26 shell_thickness = 1.05 top_bottom_thickness = 0.8 -infill_wipe_dist = 0.2 retraction_amount = 5.5 speed_infill = 50 speed_wall_x = 40 diff --git a/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile index 8fe8298c39..081d5a2055 100644 --- a/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile @@ -13,7 +13,6 @@ layer_height_0 = 0.26 shell_thickness = 1.4 top_bottom_thickness = 1.12 infill_sparse_density = 25 -infill_wipe_dist = 0.2 retraction_amount = 5.5 retraction_extrusion_window = 6 speed_infill = 50 diff --git a/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile index ca1b92d426..937157e863 100644 --- a/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile @@ -12,7 +12,6 @@ layer_height = 0.15 layer_height_0 = 0.4 shell_thickness = 1.59 top_bottom_thickness = 1.2 -infill_wipe_dist = 0.3 retraction_amount = 6 speed_infill = 55 speed_wall_0 = 25 diff --git a/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile index c587fe185f..e5dbd61841 100644 --- a/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile @@ -12,7 +12,6 @@ layer_height = 0.2 layer_height_0 = 0.5 shell_thickness = 2.1 top_bottom_thickness = 1.6 -infill_wipe_dist = 0.4 retraction_amount = 6 speed_infill = 40 speed_wall_0 = 20 diff --git a/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile index dda2bc2226..bd9fb0eb3f 100644 --- a/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile @@ -13,7 +13,6 @@ shell_thickness = 0.88 top_bottom_thickness = 0.72 infill_sparse_density = 22 infill_overlap = 0.022 -infill_wipe_dist = 0.1 retraction_amount = 6 retraction_extrusion_window = 6 speed_infill = 30 diff --git a/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile index 841e1d8260..80be7f3c63 100644 --- a/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile @@ -13,7 +13,6 @@ shell_thickness = 0.7 top_bottom_thickness = 0.6 infill_sparse_density = 18 infill_overlap = 0.035 -infill_wipe_dist = 0.2 retraction_amount = 5.5 retraction_extrusion_window = 6 speed_wall_0 = 40 diff --git a/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile index c693f22a06..608bd1a198 100644 --- a/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile @@ -13,7 +13,6 @@ shell_thickness = 1.05 top_bottom_thickness = 0.84 infill_sparse_density = 22 infill_overlap = 0.035 -infill_wipe_dist = 0.2 retraction_amount = 5.5 retraction_extrusion_window = 6 speed_infill = 50 diff --git a/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile index 2b3cbe2050..9ac81316c3 100644 --- a/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile @@ -12,7 +12,6 @@ layer_height_0 = 0.26 shell_thickness = 1.05 top_bottom_thickness = 0.8 infill_overlap = 0.035 -infill_wipe_dist = 0.2 retraction_amount = 5.5 retraction_extrusion_window = 6 speed_infill = 50 diff --git a/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile index 4914a8aaf1..bca7de1bee 100644 --- a/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile @@ -13,7 +13,6 @@ shell_thickness = 1.4 top_bottom_thickness = 1.12 infill_sparse_density = 25 infill_overlap = 0.035 -infill_wipe_dist = 0.2 retraction_amount = 5.5 retraction_extrusion_window = 6 speed_infill = 50 diff --git a/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile index fea68c2333..f72dc0bce8 100644 --- a/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile @@ -12,7 +12,6 @@ layer_height_0 = 0.4 shell_thickness = 1.59 top_bottom_thickness = 1.2 infill_overlap = 0.053 -infill_wipe_dist = 0.3 retraction_amount = 6 retraction_extrusion_window = 6 speed_infill = 55 diff --git a/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile index e5aecf6f30..df87e18f42 100644 --- a/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile @@ -13,7 +13,6 @@ shell_thickness = 2.1 top_bottom_thickness = 1.6 infill_sparse_density = 20 infill_overlap = 0.07 -infill_wipe_dist = 0.4 retraction_amount = 6 retraction_extrusion_window = 6 speed_infill = 40 From f7c842dabed8631fad2ea2b924d9bbe91b0404f7 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Wed, 23 Mar 2016 14:02:10 +0100 Subject: [PATCH 30/89] JSON fix: default retraction amount on UM2+ is 6mm (CURA-1195) --- resources/machines/ultimaker2plus.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/machines/ultimaker2plus.json b/resources/machines/ultimaker2plus.json index e3acccad6f..fc1eafb4bb 100644 --- a/resources/machines/ultimaker2plus.json +++ b/resources/machines/ultimaker2plus.json @@ -36,6 +36,7 @@ -34 ] ] - } + }, + "retraction_amount": { "default": 6.0 } } } From 3663f8ca20d25c570036c3275e06737f4b28cb78 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 23 Mar 2016 15:11:56 +0100 Subject: [PATCH 31/89] Backend now logs return codes of processes CURA-1133 --- plugins/CuraEngineBackend/CuraEngineBackend.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/CuraEngineBackend/CuraEngineBackend.py b/plugins/CuraEngineBackend/CuraEngineBackend.py index 867b9d927d..81fc0ab7c2 100644 --- a/plugins/CuraEngineBackend/CuraEngineBackend.py +++ b/plugins/CuraEngineBackend/CuraEngineBackend.py @@ -162,11 +162,12 @@ class CuraEngineBackend(Backend): Logger.log("d", "Killing engine process") try: self._process.terminate() + Logger.log("d", "Engine process is killed. Recieved return code %s", self._process.wait()) self._process = None #self._createSocket() # Re create the socket except Exception as e: # terminating a process that is already terminating causes an exception, silently ignore this. Logger.log("d", "Exception occured while trying to kill the engine %s", str(e)) - Logger.log("d", "Engine process is killed") + def _onStartSliceCompleted(self, job): if job.getError() or job.getResult() != True: @@ -287,7 +288,7 @@ class CuraEngineBackend(Backend): self._terminate() def _onBackendQuit(self): - if not self._restart: - Logger.log("d", "Backend quitted. Resetting process and socket.") + if not self._restart and self._process: + Logger.log("d", "Backend quit with return code %s. Resetting process and socket.", self._process.wait()) self._process = None self._createSocket() From 81fe0ab95829b3316e9a35dea38b2e4beea8f495 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 23 Mar 2016 16:42:29 +0100 Subject: [PATCH 32/89] Update translation templates Includes the new strings after string freeze. Contributes to issue CURA-1190. --- resources/i18n/cura.pot | 1855 ++++++++++++++-------------- resources/i18n/fdmprinter.json.pot | 180 ++- 2 files changed, 1011 insertions(+), 1024 deletions(-) diff --git a/resources/i18n/cura.pot b/resources/i18n/cura.pot index 938eaded7a..7ad208cdd3 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-01-18 11:54+0100\n" +"POT-Creation-Date: 2016-03-23 16:40+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,12 +17,384 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: /home/tamara/2.1/Cura/cura/CrashHandler.py:26 +#: /home/ruben/Projects/Cura/plugins/XRayView/__init__.py:12 +msgctxt "@label" +msgid "X-Ray View" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/XRayView/__init__.py:15 +msgctxt "@info:whatsthis" +msgid "Provides the X-Ray view." +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/XRayView/__init__.py:19 +msgctxt "@item:inlistbox" +msgid "X-Ray" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/GCodeWriter/__init__.py:12 +msgctxt "@label" +msgid "GCode Writer" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/GCodeWriter/__init__.py:15 +msgctxt "@info:whatsthis" +msgid "Writes GCode to a file." +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/GCodeWriter/__init__.py:22 +msgctxt "@item:inlistbox" +msgid "GCode File" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/ChangeLogPlugin/__init__.py:12 +#: /home/ruben/Projects/Cura/plugins/ChangeLogPlugin/ChangeLog.qml:16 +msgctxt "@label" +msgid "Changelog" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/ChangeLogPlugin/__init__.py:15 +msgctxt "@info:whatsthis" +msgid "Shows changes since latest checked version." +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/ChangeLogPlugin/ChangeLog.py:34 +msgctxt "@item:inmenu" +msgid "Show Changelog" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/USBPrinting/__init__.py:13 +msgctxt "@label" +msgid "USB printing" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/USBPrinting/__init__.py:17 +msgctxt "@info:whatsthis" +msgid "" +"Accepts G-Code and sends them to a printer. Plugin can also update firmware." +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/USBPrinting/PrinterConnection.py:35 +msgctxt "@item:inmenu" +msgid "USB printing" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/USBPrinting/PrinterConnection.py:36 +msgctxt "@action:button" +msgid "Print with USB" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/USBPrinting/PrinterConnection.py:37 +msgctxt "@info:tooltip" +msgid "Print with USB" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterManager.py:49 +msgctxt "@title:menu" +msgid "Firmware" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterManager.py:50 +msgctxt "@item:inmenu" +msgid "Update Firmware" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterManager.py:101 +msgctxt "@info" +msgid "Cannot update firmware, there were no connected printers found." +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:21 +msgctxt "@action:button" +msgid "Save to Removable Drive" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:22 +#, python-brace-format +msgctxt "@item:inlistbox" +msgid "Save to Removable Drive {0}" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:66 +#, python-brace-format +msgctxt "@info:progress" +msgid "Saving to Removable Drive {0}" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:94 +#, python-brace-format +msgctxt "@info:status" +msgid "Saved to Removable Drive {0} as {1}" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:95 +msgctxt "@action:button" +msgid "Eject" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:95 +#, python-brace-format +msgctxt "@action" +msgid "Eject removable device {0}" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:100 +#, python-brace-format +msgctxt "@info:status" +msgid "Could not save to removable drive {0}: {1}" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/__init__.py:12 +msgctxt "@label" +msgid "Removable Drive Output Device Plugin" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/__init__.py:14 +msgctxt "@info:whatsthis" +msgid "Provides removable drive hotplugging and writing support." +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDrivePlugin.py:49 +#, python-brace-format +msgctxt "@info:status" +msgid "Ejected {0}. You can now safely remove the drive." +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?" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/WindowsRemovableDrivePlugin.py:69 +msgctxt "@item:intext" +msgid "Removable Drive" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/AutoSave/__init__.py:12 +msgctxt "@label" +msgid "Auto Save" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/AutoSave/__init__.py:15 +msgctxt "@info:whatsthis" +msgid "Automatically saves Preferences, Machines and Profiles after changes." +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/__init__.py:10 +msgctxt "@label" +msgid "Slice info" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/__init__.py:13 +msgctxt "@info:whatsthis" +msgid "Submits anonymous slice info. Can be disabled through preferences." +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:35 +msgctxt "@info" +msgid "" +"Cura automatically sends slice info. You can disable this in preferences" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:36 +msgctxt "@action:button" +msgid "Dismiss" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/LegacyProfileReader/__init__.py:12 +msgctxt "@label" +msgid "Legacy Cura Profile Reader" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/LegacyProfileReader/__init__.py:15 +msgctxt "@info:whatsthis" +msgid "Provides support for importing profiles from legacy Cura versions." +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/LegacyProfileReader/__init__.py:21 +msgctxt "@item:inlistbox" +msgid "Cura 15.04 profiles" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/GCodeProfileReader/__init__.py:12 +msgctxt "@label" +msgid "GCode Profile Reader" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/GCodeProfileReader/__init__.py:15 +msgctxt "@info:whatsthis" +msgid "Provides support for importing profiles from g-code files." +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/GCodeProfileReader/__init__.py:21 +msgctxt "@item:inlistbox" +msgid "G-code File" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/LayerView/__init__.py:13 +msgctxt "@label" +msgid "Layer View" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/LayerView/__init__.py:16 +msgctxt "@info:whatsthis" +msgid "Provides the Layer view." +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/LayerView/__init__.py:20 +msgctxt "@item:inlistbox" +msgid "Layers" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/VersionUpgrade/VersionUpgrade21to22/__init__.py:12 +msgctxt "@label" +msgid "Version Upgrade 2.1 to 2.2" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/VersionUpgrade/VersionUpgrade21to22/__init__.py:15 +msgctxt "@info:whatsthis" +msgid "Upgrades preferences and settings from Cura 2.1 to Cura 2.2." +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/ImageReader/__init__.py:12 +msgctxt "@label" +msgid "Image Reader" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/ImageReader/__init__.py:15 +msgctxt "@info:whatsthis" +msgid "Enables ability to generate printable geometry from 2D image files." +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/ImageReader/__init__.py:21 +msgctxt "@item:inlistbox" +msgid "JPG Image" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/ImageReader/__init__.py:25 +msgctxt "@item:inlistbox" +msgid "JPEG Image" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/ImageReader/__init__.py:29 +msgctxt "@item:inlistbox" +msgid "PNG Image" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/ImageReader/__init__.py:33 +msgctxt "@item:inlistbox" +msgid "BMP Image" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/ImageReader/__init__.py:37 +msgctxt "@item:inlistbox" +msgid "GIF Image" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:135 +msgctxt "@info:status" +msgid "Unable to slice. Please check your setting values for errors." +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/__init__.py:13 +msgctxt "@label" +msgid "CuraEngine Backend" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/__init__.py:15 +msgctxt "@info:whatsthis" +msgid "Provides the link to the CuraEngine slicing backend." +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedObjectListJob.py:42 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedObjectListJob.py:155 +msgctxt "@info:status" +msgid "Processing Layers" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/__init__.py:12 +msgctxt "@label" +msgid "Per Object Settings Tool" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/__init__.py:15 +msgctxt "@info:whatsthis" +msgid "Provides the Per Object Settings." +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/__init__.py:19 +msgctxt "@label" +msgid "Per Object Settings" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/__init__.py:20 +msgctxt "@info:tooltip" +msgid "Configure Per Object Settings" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/3MFReader/__init__.py:12 +msgctxt "@label" +msgid "3MF Reader" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/3MFReader/__init__.py:15 +msgctxt "@info:whatsthis" +msgid "Provides support for reading 3MF files." +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/3MFReader/__init__.py:21 +msgctxt "@item:inlistbox" +msgid "3MF File" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/SolidView/__init__.py:12 +msgctxt "@label" +msgid "Solid View" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/SolidView/__init__.py:15 +msgctxt "@info:whatsthis" +msgid "Provides a normal solid mesh view." +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/SolidView/__init__.py:19 +msgctxt "@item:inmenu" +msgid "Solid" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/CuraProfileWriter/__init__.py:12 +msgctxt "@label" +msgid "Cura Profile Writer" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/CuraProfileWriter/__init__.py:15 +msgctxt "@info:whatsthis" +msgid "Provides support for exporting Cura profiles." +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/CuraProfileWriter/__init__.py:21 +#: /home/ruben/Projects/Cura/plugins/CuraProfileReader/__init__.py:21 +msgctxt "@item:inlistbox" +msgid "Cura Profile" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/CuraProfileReader/__init__.py:12 +msgctxt "@label" +msgid "Cura Profile Reader" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/CuraProfileReader/__init__.py:15 +msgctxt "@info:whatsthis" +msgid "Provides support for importing Cura profiles." +msgstr "" + +#: /home/ruben/Projects/Cura/cura/CrashHandler.py:26 msgctxt "@title:window" msgid "Oops!" msgstr "" -#: /home/tamara/2.1/Cura/cura/CrashHandler.py:32 +#: /home/ruben/Projects/Cura/cura/CrashHandler.py:32 msgctxt "@label" msgid "" "

An uncaught exception has occurred!

Please use the information " @@ -30,489 +402,128 @@ msgid "" "issues\">http://github.com/Ultimaker/Cura/issues

" msgstr "" -#: /home/tamara/2.1/Cura/cura/CrashHandler.py:52 +#: /home/ruben/Projects/Cura/cura/CrashHandler.py:52 msgctxt "@action:button" msgid "Open Web Page" msgstr "" -#: /home/tamara/2.1/Cura/cura/CuraApplication.py:158 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:168 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "" -#: /home/tamara/2.1/Cura/cura/CuraApplication.py:192 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:202 msgctxt "@info:progress" msgid "Loading interface..." msgstr "" -#: /home/tamara/2.1/Cura/cura/CuraApplication.py:253 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:273 #, python-format msgctxt "@info" msgid "%(width).1f x %(depth).1f x %(height).1f mm" msgstr "" -#: /home/tamara/2.1/Cura/plugins/CuraProfileReader/__init__.py:12 -msgctxt "@label" -msgid "Cura Profile Reader" -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/CuraProfileReader/__init__.py:15 -msgctxt "@info:whatsthis" -msgid "Provides support for importing Cura profiles." -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/CuraProfileReader/__init__.py:21 -#: /home/tamara/2.1/Cura/plugins/CuraProfileWriter/__init__.py:21 -msgctxt "@item:inlistbox" -msgid "Cura Profile" -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/XRayView/__init__.py:12 -msgctxt "@label" -msgid "X-Ray View" -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/XRayView/__init__.py:15 -msgctxt "@info:whatsthis" -msgid "Provides the X-Ray view." -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/XRayView/__init__.py:19 -msgctxt "@item:inlistbox" -msgid "X-Ray" -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/3MFReader/__init__.py:12 -msgctxt "@label" -msgid "3MF Reader" -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/3MFReader/__init__.py:15 -msgctxt "@info:whatsthis" -msgid "Provides support for reading 3MF files." -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/3MFReader/__init__.py:21 -msgctxt "@item:inlistbox" -msgid "3MF File" -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:20 -msgctxt "@action:button" -msgid "Save to Removable Drive" -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:21 -#, python-brace-format -msgctxt "@item:inlistbox" -msgid "Save to Removable Drive {0}" -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:57 -#, python-brace-format -msgctxt "@info:progress" -msgid "Saving to Removable Drive {0}" -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:85 -#, python-brace-format -msgctxt "@info:status" -msgid "Saved to Removable Drive {0} as {1}" -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:86 -msgctxt "@action:button" -msgid "Eject" -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:86 -#, python-brace-format -msgctxt "@action" -msgid "Eject removable device {0}" -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:91 -#, python-brace-format -msgctxt "@info:status" -msgid "Could not save to removable drive {0}: {1}" -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/RemovableDriveOutputDevice/WindowsRemovableDrivePlugin.py:58 -msgctxt "@item:intext" -msgid "Removable Drive" -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/RemovableDriveOutputDevice/RemovableDrivePlugin.py:46 -#, python-brace-format -msgctxt "@info:status" -msgid "Ejected {0}. You can now safely remove the drive." -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/RemovableDriveOutputDevice/RemovableDrivePlugin.py:49 -#, python-brace-format -msgctxt "@info:status" -msgid "Failed to eject {0}. Maybe it is still in use?" -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/RemovableDriveOutputDevice/__init__.py:12 -msgctxt "@label" -msgid "Removable Drive Output Device Plugin" -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/RemovableDriveOutputDevice/__init__.py:14 -msgctxt "@info:whatsthis" -msgid "Provides removable drive hotplugging and writing support" -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/ChangeLogPlugin/ChangeLog.py:34 -msgctxt "@item:inmenu" -msgid "Show Changelog" -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/ChangeLogPlugin/__init__.py:12 -msgctxt "@label" -msgid "Changelog" -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/ChangeLogPlugin/__init__.py:15 -msgctxt "@info:whatsthis" -msgid "Shows changes since latest checked version" -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:124 -msgctxt "@info:status" -msgid "Unable to slice. Please check your setting values for errors." -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/CuraEngineBackend/ProcessSlicedObjectListJob.py:30 -#: /home/tamara/2.1/Cura/plugins/CuraEngineBackend/ProcessSlicedObjectListJob.py:120 -msgctxt "@info:status" -msgid "Processing Layers" -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/CuraEngineBackend/__init__.py:13 -msgctxt "@label" -msgid "CuraEngine Backend" -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/CuraEngineBackend/__init__.py:15 -msgctxt "@info:whatsthis" -msgid "Provides the link to the CuraEngine slicing backend" -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/GCodeWriter/__init__.py:12 -msgctxt "@label" -msgid "GCode Writer" -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/GCodeWriter/__init__.py:15 -msgctxt "@info:whatsthis" -msgid "Writes GCode to a file" -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/GCodeWriter/__init__.py:22 -msgctxt "@item:inlistbox" -msgid "GCode File" -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/USBPrinting/USBPrinterManager.py:49 -msgctxt "@title:menu" -msgid "Firmware" -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/USBPrinting/USBPrinterManager.py:50 -msgctxt "@item:inmenu" -msgid "Update Firmware" -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/USBPrinting/USBPrinterManager.py:101 -msgctxt "@info" -msgid "Cannot update firmware, there were no connected printers found." -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/USBPrinting/PrinterConnection.py:35 -msgctxt "@item:inmenu" -msgid "USB printing" -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/USBPrinting/PrinterConnection.py:36 -msgctxt "@action:button" -msgid "Print with USB" -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/USBPrinting/PrinterConnection.py:37 -msgctxt "@info:tooltip" -msgid "Print with USB" -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/USBPrinting/__init__.py:13 -msgctxt "@label" -msgid "USB printing" -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/USBPrinting/__init__.py:17 -msgctxt "@info:whatsthis" -msgid "" -"Accepts G-Code and sends them to a printer. Plugin can also update firmware." -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/SliceInfoPlugin/SliceInfo.py:35 -msgctxt "@info" -msgid "" -"Cura automatically sends slice info. You can disable this in preferences" -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/SliceInfoPlugin/SliceInfo.py:36 -msgctxt "@action:button" -msgid "Dismiss" -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/SliceInfoPlugin/__init__.py:10 -msgctxt "@label" -msgid "Slice info" -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/SliceInfoPlugin/__init__.py:13 -msgctxt "@info:whatsthis" -msgid "Submits anonymous slice info. Can be disabled through preferences." -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/CuraProfileWriter/__init__.py:12 -msgctxt "@label" -msgid "Cura Profile Writer" -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/CuraProfileWriter/__init__.py:15 -msgctxt "@info:whatsthis" -msgid "Provides support for exporting Cura profiles." -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/ImageReader/__init__.py:12 -msgctxt "@label" -msgid "Image Reader" -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/ImageReader/__init__.py:15 -msgctxt "@info:whatsthis" -msgid "Enables ability to generate printable geometry from 2D image files." -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/ImageReader/__init__.py:21 -msgctxt "@item:inlistbox" -msgid "JPG Image" -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/ImageReader/__init__.py:25 -msgctxt "@item:inlistbox" -msgid "JPEG Image" -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/ImageReader/__init__.py:29 -msgctxt "@item:inlistbox" -msgid "PNG Image" -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/ImageReader/__init__.py:33 -msgctxt "@item:inlistbox" -msgid "BMP Image" -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/ImageReader/__init__.py:37 -msgctxt "@item:inlistbox" -msgid "GIF Image" -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/GCodeProfileReader/__init__.py:12 -msgctxt "@label" -msgid "GCode Profile Reader" -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/GCodeProfileReader/__init__.py:15 -msgctxt "@info:whatsthis" -msgid "Provides support for importing profiles from g-code files." -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/GCodeProfileReader/__init__.py:21 -msgctxt "@item:inlistbox" -msgid "G-code File" -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/SolidView/__init__.py:12 -msgctxt "@label" -msgid "Solid View" -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/SolidView/__init__.py:15 -msgctxt "@info:whatsthis" -msgid "Provides a normal solid mesh view." -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/SolidView/__init__.py:19 -msgctxt "@item:inmenu" -msgid "Solid" -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/LayerView/__init__.py:13 -msgctxt "@label" -msgid "Layer View" -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/LayerView/__init__.py:16 -msgctxt "@info:whatsthis" -msgid "Provides the Layer view." -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/LayerView/__init__.py:20 -msgctxt "@item:inlistbox" -msgid "Layers" -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/AutoSave/__init__.py:12 -msgctxt "@label" -msgid "Auto Save" -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/AutoSave/__init__.py:15 -msgctxt "@info:whatsthis" -msgid "Automatically saves Preferences, Machines and Profiles after changes." -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/__init__.py:12 -msgctxt "@label" -msgid "Per Object Settings Tool" -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/__init__.py:15 -msgctxt "@info:whatsthis" -msgid "Provides the Per Object Settings." -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/__init__.py:19 -msgctxt "@label" -msgid "Per Object Settings" -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/__init__.py:20 -msgctxt "@info:tooltip" -msgid "Configure Per Object Settings" -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/LegacyProfileReader/__init__.py:12 -msgctxt "@label" -msgid "Legacy Cura Profile Reader" -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/LegacyProfileReader/__init__.py:15 -msgctxt "@info:whatsthis" -msgid "Provides support for importing profiles from legacy Cura versions." -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/LegacyProfileReader/__init__.py:21 -msgctxt "@item:inlistbox" -msgid "Cura 15.04 profiles" -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:20 -msgctxt "@title:window" -msgid "Firmware Update" -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:38 -msgctxt "@label" -msgid "Starting firmware update, this may take a while." -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:43 -msgctxt "@label" -msgid "Firmware update completed." -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:48 -msgctxt "@label" -msgid "Updating firmware." -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:80 -#: /home/tamara/2.1/Cura/resources/qml/EngineLog.qml:38 -#: /home/tamara/2.1/Cura/resources/qml/AboutDialog.qml:74 +#: /home/ruben/Projects/Cura/plugins/ChangeLogPlugin/ChangeLog.qml:37 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:81 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:74 +#: /home/ruben/Projects/Cura/resources/qml/EngineLog.qml:38 msgctxt "@action:button" msgid "Close" msgstr "" -#: /home/tamara/2.1/Cura/plugins/USBPrinting/ControlWindow.qml:17 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/ControlWindow.qml:17 msgctxt "@title:window" msgid "Print with USB" msgstr "" -#: /home/tamara/2.1/Cura/plugins/USBPrinting/ControlWindow.qml:28 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/ControlWindow.qml:28 msgctxt "@label" msgid "Extruder Temperature %1" msgstr "" -#: /home/tamara/2.1/Cura/plugins/USBPrinting/ControlWindow.qml:33 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/ControlWindow.qml:33 msgctxt "@label" msgid "Bed Temperature %1" msgstr "" -#: /home/tamara/2.1/Cura/plugins/USBPrinting/ControlWindow.qml:60 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/ControlWindow.qml:60 msgctxt "@action:button" msgid "Print" msgstr "" -#: /home/tamara/2.1/Cura/plugins/USBPrinting/ControlWindow.qml:67 -#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:200 -#: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:303 -#: /home/tamara/2.1/Cura/resources/qml/LoadProfileDialog.qml:58 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/ControlWindow.qml:67 +#: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:191 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:273 msgctxt "@action:button" msgid "Cancel" msgstr "" -#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:24 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:20 +msgctxt "@title:window" +msgid "Firmware Update" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:38 +msgctxt "@label" +msgid "Starting firmware update, this may take a while." +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:43 +msgctxt "@label" +msgid "Firmware update completed." +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:48 +msgctxt "@label" +msgid "Updating firmware." +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:21 msgctxt "@title:window" msgid "Convert Image..." msgstr "" -#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:38 +#: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:35 msgctxt "@info:tooltip" msgid "The maximum distance of each pixel from \"Base.\"" msgstr "" -#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:44 +#: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:40 msgctxt "@action:label" msgid "Height (mm)" msgstr "" -#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:62 +#: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:58 msgctxt "@info:tooltip" msgid "The base height from the build plate in millimeters." msgstr "" -#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:68 +#: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:63 msgctxt "@action:label" msgid "Base (mm)" msgstr "" -#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:86 +#: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:81 msgctxt "@info:tooltip" msgid "The width in millimeters on the build plate." msgstr "" -#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:92 +#: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:86 msgctxt "@action:label" msgid "Width (mm)" msgstr "" -#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:111 +#: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:105 msgctxt "@info:tooltip" msgid "The depth in millimeters on the build plate" msgstr "" -#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:117 +#: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:110 msgctxt "@action:label" msgid "Depth (mm)" msgstr "" -#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:135 +#: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:128 msgctxt "@info:tooltip" msgid "" "By default, white pixels represent high points on the mesh and black pixels " @@ -521,411 +532,178 @@ msgid "" "represent low points on the mesh." msgstr "" -#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:149 +#: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:141 msgctxt "@item:inlistbox" msgid "Lighter is higher" msgstr "" -#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:149 +#: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:141 msgctxt "@item:inlistbox" msgid "Darker is higher" msgstr "" -#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:159 +#: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:151 msgctxt "@info:tooltip" msgid "The amount of smoothing to apply to the image." msgstr "" -#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:165 +#: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:156 msgctxt "@action:label" msgid "Smoothing" msgstr "" -#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:193 +#: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:184 msgctxt "@action:button" msgid "OK" msgstr "" -#: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:31 -msgctxt "@label" -msgid "" -"Per Object Settings behavior may be unexpected when 'Print sequence' is set " -"to 'All at Once'." -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:42 -msgctxt "@label" -msgid "Object profile" -msgstr "" - -#: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:126 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:95 msgctxt "@action:button" msgid "Add Setting" msgstr "" -#: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:166 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:135 msgctxt "@title:window" msgid "Pick a Setting to Customize" msgstr "" -#: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:177 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:146 msgctxt "@label:textbox" msgid "Filter..." msgstr "" -#: /home/tamara/2.1/Cura/resources/qml/JobSpecs.qml:198 -msgctxt "@label" -msgid "00h 00min" -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/JobSpecs.qml:218 -msgctxt "@label" -msgid "0.0 m" -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/JobSpecs.qml:218 -msgctxt "@label" -msgid "%1 m" -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/SidebarHeader.qml:29 -msgctxt "@label:listbox" -msgid "Print Job" -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/SidebarHeader.qml:50 -msgctxt "@label:listbox" -msgid "Printer:" -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/SidebarHeader.qml:107 -msgctxt "@label" -msgid "Nozzle:" -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/Sidebar.qml:89 -msgctxt "@label:listbox" -msgid "Setup" -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/Sidebar.qml:215 -msgctxt "@title:tab" -msgid "Simple" -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/Sidebar.qml:216 -msgctxt "@title:tab" -msgid "Advanced" -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/AddMachineWizard.qml:18 +#: /home/ruben/Projects/Cura/resources/qml/AddMachineWizard.qml:18 msgctxt "@title:window" msgid "Add Printer" msgstr "" -#: /home/tamara/2.1/Cura/resources/qml/AddMachineWizard.qml:25 -#: /home/tamara/2.1/Cura/resources/qml/WizardPages/AddMachine.qml:99 +#: /home/ruben/Projects/Cura/resources/qml/AddMachineWizard.qml:25 +#: /home/ruben/Projects/Cura/resources/qml/WizardPages/AddMachine.qml:63 msgctxt "@title" msgid "Add Printer" msgstr "" -#: /home/tamara/2.1/Cura/resources/qml/LoadProfileDialog.qml:15 -msgctxt "@title:window" -msgid "Load profile" +#: /home/ruben/Projects/Cura/resources/qml/JobSpecs.qml:195 +msgctxt "@label" +msgid "00h 00min" msgstr "" -#: /home/tamara/2.1/Cura/resources/qml/LoadProfileDialog.qml:24 +#: /home/ruben/Projects/Cura/resources/qml/JobSpecs.qml:215 msgctxt "@label" +msgid "0.0 m" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/JobSpecs.qml:215 +msgctxt "@label" +msgid "%1 m" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:15 +msgctxt "@title:window" +msgid "About Cura" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:54 +msgctxt "@label" +msgid "End-to-end solution for fused filament 3D printing." +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:66 +msgctxt "@info:credit" msgid "" -"Selecting this profile overwrites some of your customised settings. Do you " -"want to merge the new settings into your current profile or do you want to " -"load a clean copy of the profile?" +"Cura has been developed by Ultimaker B.V. in cooperation with the community." msgstr "" -#: /home/tamara/2.1/Cura/resources/qml/LoadProfileDialog.qml:38 -msgctxt "@label" -msgid "Show details." -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/LoadProfileDialog.qml:50 -msgctxt "@action:button" -msgid "Merge settings" -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/LoadProfileDialog.qml:54 -msgctxt "@action:button" -msgid "Reset profile" -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/ProfileSetup.qml:28 -msgctxt "@label" -msgid "Profile:" -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/EngineLog.qml:15 -msgctxt "@title:window" -msgid "Engine Log" -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/Actions.qml:50 -msgctxt "@action:inmenu" -msgid "Toggle Fu&ll Screen" -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/Actions.qml:57 -msgctxt "@action:inmenu menubar:edit" -msgid "&Undo" -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/Actions.qml:65 -msgctxt "@action:inmenu menubar:edit" -msgid "&Redo" -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/Actions.qml:73 -msgctxt "@action:inmenu menubar:file" -msgid "&Quit" -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/Actions.qml:81 -msgctxt "@action:inmenu menubar:settings" -msgid "&Preferences..." -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/Actions.qml:88 -msgctxt "@action:inmenu menubar:printer" -msgid "&Add Printer..." -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/Actions.qml:94 -msgctxt "@action:inmenu menubar:printer" -msgid "Manage Pr&inters..." -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/Actions.qml:101 -msgctxt "@action:inmenu menubar:profile" -msgid "Manage Profiles..." -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/Actions.qml:108 -msgctxt "@action:inmenu menubar:help" -msgid "Show Online &Documentation" -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/Actions.qml:115 -msgctxt "@action:inmenu menubar:help" -msgid "Report a &Bug" -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/Actions.qml:122 -msgctxt "@action:inmenu menubar:help" -msgid "&About..." -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/Actions.qml:129 -msgctxt "@action:inmenu menubar:edit" -msgid "Delete &Selection" -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/Actions.qml:137 -msgctxt "@action:inmenu" -msgid "Delete Object" -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/Actions.qml:144 -msgctxt "@action:inmenu" -msgid "Ce&nter Object on Platform" -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/Actions.qml:150 -msgctxt "@action:inmenu menubar:edit" -msgid "&Group Objects" -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/Actions.qml:158 -msgctxt "@action:inmenu menubar:edit" -msgid "Ungroup Objects" -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/Actions.qml:166 -msgctxt "@action:inmenu menubar:edit" -msgid "&Merge Objects" -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/Actions.qml:174 -msgctxt "@action:inmenu" -msgid "&Duplicate Object" -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/Actions.qml:181 -msgctxt "@action:inmenu menubar:edit" -msgid "&Clear Build Platform" -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/Actions.qml:189 -msgctxt "@action:inmenu menubar:file" -msgid "Re&load All Objects" -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/Actions.qml:196 -msgctxt "@action:inmenu menubar:edit" -msgid "Reset All Object Positions" -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/Actions.qml:202 -msgctxt "@action:inmenu menubar:edit" -msgid "Reset All Object &Transformations" -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/Actions.qml:208 -msgctxt "@action:inmenu menubar:file" -msgid "&Open File..." -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/Actions.qml:216 -msgctxt "@action:inmenu menubar:help" -msgid "Show Engine &Log..." -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/SidebarSimple.qml:135 -msgctxt "@label" -msgid "Infill:" -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/SidebarSimple.qml:237 -msgctxt "@label" -msgid "Hollow" -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/SidebarSimple.qml:239 -msgctxt "@label" -msgid "No (0%) infill will leave your model hollow at the cost of low strength" -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/SidebarSimple.qml:243 -msgctxt "@label" -msgid "Light" -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/SidebarSimple.qml:245 -msgctxt "@label" -msgid "Light (20%) infill will give your model an average strength" -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/SidebarSimple.qml:249 -msgctxt "@label" -msgid "Dense" -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/SidebarSimple.qml:251 -msgctxt "@label" -msgid "Dense (50%) infill will give your model an above average strength" -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/SidebarSimple.qml:255 -msgctxt "@label" -msgid "Solid" -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/SidebarSimple.qml:257 -msgctxt "@label" -msgid "Solid (100%) infill will make your model completely solid" -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/SidebarSimple.qml:276 +#: /home/ruben/Projects/Cura/resources/qml/Sidebar.qml:96 msgctxt "@label:listbox" -msgid "Helpers:" +msgid "Setup" msgstr "" -#: /home/tamara/2.1/Cura/resources/qml/SidebarSimple.qml:296 -msgctxt "@option:check" -msgid "Generate Brim" +#: /home/ruben/Projects/Cura/resources/qml/Sidebar.qml:250 +msgctxt "@title:tab" +msgid "Simple" msgstr "" -#: /home/tamara/2.1/Cura/resources/qml/SidebarSimple.qml:312 -msgctxt "@label" -msgid "" -"Enable printing a brim. This will add a single-layer-thick flat area around " -"your object which is easy to cut off afterwards." +#: /home/ruben/Projects/Cura/resources/qml/Sidebar.qml:251 +msgctxt "@title:tab" +msgid "Advanced" msgstr "" -#: /home/tamara/2.1/Cura/resources/qml/SidebarSimple.qml:330 -msgctxt "@option:check" -msgid "Generate Support Structure" -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/SidebarSimple.qml:346 -msgctxt "@label" -msgid "" -"Enable printing support structures. This will build up supporting structures " -"below the model to prevent the model from sagging or printing in mid air." -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/GeneralPage.qml:14 -#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:492 +#: /home/ruben/Projects/Cura/resources/qml/GeneralPage.qml:14 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:515 msgctxt "@title:tab" msgid "General" msgstr "" -#: /home/tamara/2.1/Cura/resources/qml/GeneralPage.qml:51 +#: /home/ruben/Projects/Cura/resources/qml/GeneralPage.qml:51 msgctxt "@label" msgid "Language:" msgstr "" -#: /home/tamara/2.1/Cura/resources/qml/GeneralPage.qml:64 +#: /home/ruben/Projects/Cura/resources/qml/GeneralPage.qml:62 msgctxt "@item:inlistbox" msgid "English" msgstr "" -#: /home/tamara/2.1/Cura/resources/qml/GeneralPage.qml:65 +#: /home/ruben/Projects/Cura/resources/qml/GeneralPage.qml:63 msgctxt "@item:inlistbox" msgid "Finnish" msgstr "" -#: /home/tamara/2.1/Cura/resources/qml/GeneralPage.qml:66 +#: /home/ruben/Projects/Cura/resources/qml/GeneralPage.qml:64 msgctxt "@item:inlistbox" msgid "French" msgstr "" -#: /home/tamara/2.1/Cura/resources/qml/GeneralPage.qml:67 +#: /home/ruben/Projects/Cura/resources/qml/GeneralPage.qml:65 msgctxt "@item:inlistbox" msgid "German" msgstr "" -#: /home/tamara/2.1/Cura/resources/qml/GeneralPage.qml:69 +#: /home/ruben/Projects/Cura/resources/qml/GeneralPage.qml:66 msgctxt "@item:inlistbox" -msgid "Polish" +msgid "Italian" msgstr "" -#: /home/tamara/2.1/Cura/resources/qml/GeneralPage.qml:109 +#: /home/ruben/Projects/Cura/resources/qml/GeneralPage.qml:67 +msgctxt "@item:inlistbox" +msgid "Dutch" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/GeneralPage.qml:68 +msgctxt "@item:inlistbox" +msgid "Spanish" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/GeneralPage.qml:106 msgctxt "@label" msgid "" "You will need to restart the application for language changes to have effect." msgstr "" -#: /home/tamara/2.1/Cura/resources/qml/GeneralPage.qml:117 +#: /home/ruben/Projects/Cura/resources/qml/GeneralPage.qml:114 msgctxt "@info:tooltip" msgid "" "Should objects on the platform be moved so that they no longer intersect." msgstr "" -#: /home/tamara/2.1/Cura/resources/qml/GeneralPage.qml:122 +#: /home/ruben/Projects/Cura/resources/qml/GeneralPage.qml:119 msgctxt "@option:check" msgid "Ensure objects are kept apart" msgstr "" -#: /home/tamara/2.1/Cura/resources/qml/GeneralPage.qml:131 +#: /home/ruben/Projects/Cura/resources/qml/GeneralPage.qml:128 msgctxt "@info:tooltip" msgid "" "Should opened files be scaled to the build volume if they are too large?" msgstr "" -#: /home/tamara/2.1/Cura/resources/qml/GeneralPage.qml:136 +#: /home/ruben/Projects/Cura/resources/qml/GeneralPage.qml:133 msgctxt "@option:check" msgid "Scale large files" msgstr "" -#: /home/tamara/2.1/Cura/resources/qml/GeneralPage.qml:145 +#: /home/ruben/Projects/Cura/resources/qml/GeneralPage.qml:142 msgctxt "@info:tooltip" msgid "" "Should anonymous data about your print be sent to Ultimaker? Note, no " @@ -933,167 +711,545 @@ msgid "" "stored." msgstr "" -#: /home/tamara/2.1/Cura/resources/qml/GeneralPage.qml:150 +#: /home/ruben/Projects/Cura/resources/qml/GeneralPage.qml:147 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "" -#: /home/tamara/2.1/Cura/resources/qml/ViewPage.qml:16 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:51 +msgctxt "@action:inmenu" +msgid "Toggle Fu&ll Screen" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:58 +msgctxt "@action:inmenu menubar:edit" +msgid "&Undo" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:66 +msgctxt "@action:inmenu menubar:edit" +msgid "&Redo" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:74 +msgctxt "@action:inmenu menubar:file" +msgid "&Quit" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:82 +msgctxt "@action:inmenu menubar:settings" +msgid "&Preferences..." +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:89 +msgctxt "@action:inmenu menubar:printer" +msgid "&Add Printer..." +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:95 +msgctxt "@action:inmenu menubar:printer" +msgid "Manage Pr&inters..." +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:102 +msgctxt "@action:inmenu menubar:profile" +msgid "&Add Profile..." +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:108 +msgctxt "@action:inmenu menubar:profile" +msgid "Manage Profiles..." +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:115 +msgctxt "@action:inmenu menubar:help" +msgid "Show Online &Documentation" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:122 +msgctxt "@action:inmenu menubar:help" +msgid "Report a &Bug" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:129 +msgctxt "@action:inmenu menubar:help" +msgid "&About..." +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:136 +msgctxt "@action:inmenu menubar:edit" +msgid "Delete &Selection" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:145 +msgctxt "@action:inmenu" +msgid "Delete Object" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:153 +msgctxt "@action:inmenu" +msgid "Ce&nter Object on Platform" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:159 +msgctxt "@action:inmenu menubar:edit" +msgid "&Group Objects" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:167 +msgctxt "@action:inmenu menubar:edit" +msgid "Ungroup Objects" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:175 +msgctxt "@action:inmenu menubar:edit" +msgid "&Merge Objects" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:183 +msgctxt "@action:inmenu" +msgid "&Duplicate Object" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:190 +msgctxt "@action:inmenu menubar:edit" +msgid "&Clear Build Platform" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:199 +msgctxt "@action:inmenu menubar:file" +msgid "Re&load All Objects" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:206 +msgctxt "@action:inmenu menubar:edit" +msgid "Reset All Object Positions" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:212 +msgctxt "@action:inmenu menubar:edit" +msgid "Reset All Object &Transformations" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:218 +msgctxt "@action:inmenu menubar:file" +msgid "&Open File..." +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:226 +msgctxt "@action:inmenu menubar:help" +msgid "Show Engine &Log..." +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/SaveButton.qml:24 +msgctxt "@label:PrintjobStatus" +msgid "Please load a 3d model" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/SaveButton.qml:26 +msgctxt "@label:PrintjobStatus" +msgid "Preparing to slice..." +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/SaveButton.qml:29 +msgctxt "@label:PrintjobStatus" +msgid "Slicing..." +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/SaveButton.qml:31 +msgctxt "@label:PrintjobStatus" +msgid "Ready to " +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/SaveButton.qml:123 +msgctxt "@info:tooltip" +msgid "Select the active output device" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ProfileSetup.qml:29 +msgctxt "@label" +msgid "Profile:" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:16 +msgctxt "@title:window" +msgid "Cura" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:53 +msgctxt "@title:menu menubar:toplevel" +msgid "&File" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:62 +msgctxt "@title:menu menubar:file" +msgid "Open &Recent" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:92 +msgctxt "@action:inmenu menubar:file" +msgid "&Save Selection to File" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:100 +msgctxt "@title:menu menubar:file" +msgid "Save &All" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:128 +msgctxt "@title:menu menubar:toplevel" +msgid "&Edit" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:145 +msgctxt "@title:menu menubar:toplevel" +msgid "&View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:167 +msgctxt "@title:menu menubar:toplevel" +msgid "&Printer" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:213 +msgctxt "@title:menu menubar:toplevel" +msgid "P&rofile" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:252 +msgctxt "@title:menu menubar:toplevel" +msgid "E&xtensions" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:285 +msgctxt "@title:menu menubar:toplevel" +msgid "&Settings" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:293 +msgctxt "@title:menu menubar:toplevel" +msgid "&Help" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:378 +msgctxt "@action:button" +msgid "Open File" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:422 +msgctxt "@action:button" +msgid "View Mode" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:518 +msgctxt "@title:tab" +msgid "View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:665 +msgctxt "@title:window" +msgid "Open file" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:36 +msgctxt "@label" +msgid "Infill:" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:146 +msgctxt "@label" +msgid "Hollow" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:150 +msgctxt "@label" +msgid "No (0%) infill will leave your model hollow at the cost of low strength" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:154 +msgctxt "@label" +msgid "Light" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:158 +msgctxt "@label" +msgid "Light (20%) infill will give your model an average strength" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:162 +msgctxt "@label" +msgid "Dense" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:166 +msgctxt "@label" +msgid "Dense (50%) infill will give your model an above average strength" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:170 +msgctxt "@label" +msgid "Solid" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:174 +msgctxt "@label" +msgid "Solid (100%) infill will make your model completely solid" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:193 +msgctxt "@label:listbox" +msgid "Helpers:" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:213 +msgctxt "@option:check" +msgid "Generate Brim" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:228 +msgctxt "@label" +msgid "" +"Enable printing a brim. This will add a single-layer-thick flat area around " +"your object which is easy to cut off afterwards." +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:246 +msgctxt "@option:check" +msgid "Generate Support Structure" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:261 +msgctxt "@label" +msgid "" +"Enable printing support structures. This will build up supporting structures " +"below the model to prevent the model from sagging or printing in mid air." +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/EngineLog.qml:15 +msgctxt "@title:window" +msgid "Engine Log" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ViewPage.qml:16 msgctxt "@title:window" msgid "View" msgstr "" -#: /home/tamara/2.1/Cura/resources/qml/ViewPage.qml:33 +#: /home/ruben/Projects/Cura/resources/qml/ViewPage.qml:33 msgctxt "@info:tooltip" msgid "" "Highlight unsupported areas of the model in red. Without support these areas " "will nog print properly." msgstr "" -#: /home/tamara/2.1/Cura/resources/qml/ViewPage.qml:42 +#: /home/ruben/Projects/Cura/resources/qml/ViewPage.qml:42 msgctxt "@option:check" msgid "Display overhang" msgstr "" -#: /home/tamara/2.1/Cura/resources/qml/ViewPage.qml:49 +#: /home/ruben/Projects/Cura/resources/qml/ViewPage.qml:49 msgctxt "@info:tooltip" msgid "" "Moves the camera so the object is in the center of the view when an object " "is selected" msgstr "" -#: /home/tamara/2.1/Cura/resources/qml/ViewPage.qml:54 +#: /home/ruben/Projects/Cura/resources/qml/ViewPage.qml:54 msgctxt "@action:button" msgid "Center camera when item is selected" msgstr "" -#: /home/tamara/2.1/Cura/resources/qml/WizardPages/UltimakerCheckup.qml:72 -#: /home/tamara/2.1/Cura/resources/qml/WizardPages/AddMachine.qml:275 +#: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:29 +msgctxt "@label:listbox" +msgid "Print Job" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:50 +msgctxt "@label:listbox" +msgid "Printer:" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:107 +msgctxt "@label" +msgid "Nozzle:" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:171 +msgctxt "@label" +msgid "Material:" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/WizardPages/UltimakerCheckup.qml:72 +#: /home/ruben/Projects/Cura/resources/qml/WizardPages/AddMachine.qml:242 msgctxt "@title" msgid "Check Printer" msgstr "" -#: /home/tamara/2.1/Cura/resources/qml/WizardPages/UltimakerCheckup.qml:84 +#: /home/ruben/Projects/Cura/resources/qml/WizardPages/UltimakerCheckup.qml:84 msgctxt "@label" msgid "" "It's a good idea to do a few sanity checks on your Ultimaker. You can skip " "this step if you know your machine is functional" msgstr "" -#: /home/tamara/2.1/Cura/resources/qml/WizardPages/UltimakerCheckup.qml:100 +#: /home/ruben/Projects/Cura/resources/qml/WizardPages/UltimakerCheckup.qml:100 msgctxt "@action:button" msgid "Start Printer Check" msgstr "" -#: /home/tamara/2.1/Cura/resources/qml/WizardPages/UltimakerCheckup.qml:116 +#: /home/ruben/Projects/Cura/resources/qml/WizardPages/UltimakerCheckup.qml:116 msgctxt "@action:button" msgid "Skip Printer Check" msgstr "" -#: /home/tamara/2.1/Cura/resources/qml/WizardPages/UltimakerCheckup.qml:136 +#: /home/ruben/Projects/Cura/resources/qml/WizardPages/UltimakerCheckup.qml:136 msgctxt "@label" msgid "Connection: " msgstr "" -#: /home/tamara/2.1/Cura/resources/qml/WizardPages/UltimakerCheckup.qml:145 +#: /home/ruben/Projects/Cura/resources/qml/WizardPages/UltimakerCheckup.qml:145 msgctxt "@info:status" msgid "Done" msgstr "" -#: /home/tamara/2.1/Cura/resources/qml/WizardPages/UltimakerCheckup.qml:145 +#: /home/ruben/Projects/Cura/resources/qml/WizardPages/UltimakerCheckup.qml:145 msgctxt "@info:status" msgid "Incomplete" msgstr "" -#: /home/tamara/2.1/Cura/resources/qml/WizardPages/UltimakerCheckup.qml:155 +#: /home/ruben/Projects/Cura/resources/qml/WizardPages/UltimakerCheckup.qml:155 msgctxt "@label" msgid "Min endstop X: " msgstr "" -#: /home/tamara/2.1/Cura/resources/qml/WizardPages/UltimakerCheckup.qml:164 -#: /home/tamara/2.1/Cura/resources/qml/WizardPages/UltimakerCheckup.qml:183 -#: /home/tamara/2.1/Cura/resources/qml/WizardPages/UltimakerCheckup.qml:202 -#: /home/tamara/2.1/Cura/resources/qml/WizardPages/UltimakerCheckup.qml:357 -#: /home/tamara/2.1/Cura/resources/qml/WizardPages/UltimakerCheckup.qml:368 +#: /home/ruben/Projects/Cura/resources/qml/WizardPages/UltimakerCheckup.qml:164 +#: /home/ruben/Projects/Cura/resources/qml/WizardPages/UltimakerCheckup.qml:183 +#: /home/ruben/Projects/Cura/resources/qml/WizardPages/UltimakerCheckup.qml:202 +#: /home/ruben/Projects/Cura/resources/qml/WizardPages/UltimakerCheckup.qml:357 +#: /home/ruben/Projects/Cura/resources/qml/WizardPages/UltimakerCheckup.qml:368 msgctxt "@info:status" msgid "Works" msgstr "" -#: /home/tamara/2.1/Cura/resources/qml/WizardPages/UltimakerCheckup.qml:164 -#: /home/tamara/2.1/Cura/resources/qml/WizardPages/UltimakerCheckup.qml:183 -#: /home/tamara/2.1/Cura/resources/qml/WizardPages/UltimakerCheckup.qml:202 -#: /home/tamara/2.1/Cura/resources/qml/WizardPages/UltimakerCheckup.qml:221 -#: /home/tamara/2.1/Cura/resources/qml/WizardPages/UltimakerCheckup.qml:277 +#: /home/ruben/Projects/Cura/resources/qml/WizardPages/UltimakerCheckup.qml:164 +#: /home/ruben/Projects/Cura/resources/qml/WizardPages/UltimakerCheckup.qml:183 +#: /home/ruben/Projects/Cura/resources/qml/WizardPages/UltimakerCheckup.qml:202 +#: /home/ruben/Projects/Cura/resources/qml/WizardPages/UltimakerCheckup.qml:221 +#: /home/ruben/Projects/Cura/resources/qml/WizardPages/UltimakerCheckup.qml:277 msgctxt "@info:status" msgid "Not checked" msgstr "" -#: /home/tamara/2.1/Cura/resources/qml/WizardPages/UltimakerCheckup.qml:174 +#: /home/ruben/Projects/Cura/resources/qml/WizardPages/UltimakerCheckup.qml:174 msgctxt "@label" msgid "Min endstop Y: " msgstr "" -#: /home/tamara/2.1/Cura/resources/qml/WizardPages/UltimakerCheckup.qml:193 +#: /home/ruben/Projects/Cura/resources/qml/WizardPages/UltimakerCheckup.qml:193 msgctxt "@label" msgid "Min endstop Z: " msgstr "" -#: /home/tamara/2.1/Cura/resources/qml/WizardPages/UltimakerCheckup.qml:212 +#: /home/ruben/Projects/Cura/resources/qml/WizardPages/UltimakerCheckup.qml:212 msgctxt "@label" msgid "Nozzle temperature check: " msgstr "" -#: /home/tamara/2.1/Cura/resources/qml/WizardPages/UltimakerCheckup.qml:236 -#: /home/tamara/2.1/Cura/resources/qml/WizardPages/UltimakerCheckup.qml:292 +#: /home/ruben/Projects/Cura/resources/qml/WizardPages/UltimakerCheckup.qml:236 +#: /home/ruben/Projects/Cura/resources/qml/WizardPages/UltimakerCheckup.qml:292 msgctxt "@action:button" msgid "Start Heating" msgstr "" -#: /home/tamara/2.1/Cura/resources/qml/WizardPages/UltimakerCheckup.qml:241 -#: /home/tamara/2.1/Cura/resources/qml/WizardPages/UltimakerCheckup.qml:297 +#: /home/ruben/Projects/Cura/resources/qml/WizardPages/UltimakerCheckup.qml:241 +#: /home/ruben/Projects/Cura/resources/qml/WizardPages/UltimakerCheckup.qml:297 msgctxt "@info:progress" msgid "Checking" msgstr "" -#: /home/tamara/2.1/Cura/resources/qml/WizardPages/UltimakerCheckup.qml:267 +#: /home/ruben/Projects/Cura/resources/qml/WizardPages/UltimakerCheckup.qml:267 msgctxt "@label" msgid "bed temperature check:" msgstr "" -#: /home/tamara/2.1/Cura/resources/qml/WizardPages/UltimakerCheckup.qml:324 +#: /home/ruben/Projects/Cura/resources/qml/WizardPages/UltimakerCheckup.qml:324 msgctxt "@label" msgid "Everything is in order! You're done with your CheckUp." msgstr "" -#: /home/tamara/2.1/Cura/resources/qml/WizardPages/SelectUpgradedParts.qml:31 -#: /home/tamara/2.1/Cura/resources/qml/WizardPages/AddMachine.qml:269 +#: /home/ruben/Projects/Cura/resources/qml/WizardPages/SelectUpgradedPartsUM2.qml:48 +#: /home/ruben/Projects/Cura/resources/qml/WizardPages/SelectUpgradedParts.qml:31 +#: /home/ruben/Projects/Cura/resources/qml/WizardPages/AddMachine.qml:233 +#: /home/ruben/Projects/Cura/resources/qml/WizardPages/AddMachine.qml:236 msgctxt "@title" msgid "Select Upgraded Parts" msgstr "" -#: /home/tamara/2.1/Cura/resources/qml/WizardPages/SelectUpgradedParts.qml:42 +#: /home/ruben/Projects/Cura/resources/qml/WizardPages/SelectUpgradedPartsUM2.qml:59 +#: /home/ruben/Projects/Cura/resources/qml/WizardPages/SelectUpgradedParts.qml:42 msgctxt "@label" msgid "" "To assist you in having better default settings for your Ultimaker. Cura " "would like to know which upgrades you have in your machine:" msgstr "" -#: /home/tamara/2.1/Cura/resources/qml/WizardPages/SelectUpgradedParts.qml:57 +#: /home/ruben/Projects/Cura/resources/qml/WizardPages/SelectUpgradedPartsUM2.qml:74 +msgctxt "@option:check" +msgid "Olsson Block" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/WizardPages/Bedleveling.qml:46 +msgctxt "@title" +msgid "Bed Leveling" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/WizardPages/Bedleveling.qml:58 +msgctxt "@label" +msgid "" +"To make sure your prints will come out great, you can now adjust your " +"buildplate. When you click 'Move to Next Position' the nozzle will move to " +"the different positions that can be adjusted." +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/WizardPages/Bedleveling.qml:67 +msgctxt "@label" +msgid "" +"For every postition; insert a piece of paper under the nozzle and adjust the " +"print bed height. The print bed height is right when the paper is slightly " +"gripped by the tip of the nozzle." +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/WizardPages/Bedleveling.qml:82 +msgctxt "@action:button" +msgid "Move to Next Position" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/WizardPages/Bedleveling.qml:122 +msgctxt "@action:button" +msgid "Skip Bedleveling" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/WizardPages/Bedleveling.qml:147 +msgctxt "@label" +msgid "Everything is in order! You're done with bedleveling." +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/WizardPages/SelectUpgradedParts.qml:57 msgctxt "@option:check" msgid "Extruder driver ugrades" msgstr "" -#: /home/tamara/2.1/Cura/resources/qml/WizardPages/SelectUpgradedParts.qml:63 +#: /home/ruben/Projects/Cura/resources/qml/WizardPages/SelectUpgradedParts.qml:63 msgctxt "@option:check" msgid "Heated printer bed" msgstr "" -#: /home/tamara/2.1/Cura/resources/qml/WizardPages/SelectUpgradedParts.qml:74 +#: /home/ruben/Projects/Cura/resources/qml/WizardPages/SelectUpgradedParts.qml:74 msgctxt "@option:check" msgid "Heated printer bed (self built)" msgstr "" -#: /home/tamara/2.1/Cura/resources/qml/WizardPages/SelectUpgradedParts.qml:90 +#: /home/ruben/Projects/Cura/resources/qml/WizardPages/SelectUpgradedParts.qml:90 msgctxt "@label" msgid "" "If you bought your Ultimaker after october 2012 you will have the Extruder " @@ -1102,71 +1258,13 @@ msgid "" "or found on thingiverse as thing:26094" msgstr "" -#: /home/tamara/2.1/Cura/resources/qml/WizardPages/AddMachine.qml:108 -msgctxt "@label" -msgid "Please select the type of printer:" -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/WizardPages/AddMachine.qml:235 -msgctxt "@label" -msgid "" -"This printer name has already been used. Please choose a different printer " -"name." -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/WizardPages/AddMachine.qml:245 -msgctxt "@label:textbox" -msgid "Printer Name:" -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/WizardPages/AddMachine.qml:272 -#: /home/tamara/2.1/Cura/resources/qml/WizardPages/UpgradeFirmware.qml:22 +#: /home/ruben/Projects/Cura/resources/qml/WizardPages/UpgradeFirmware.qml:22 +#: /home/ruben/Projects/Cura/resources/qml/WizardPages/AddMachine.qml:239 msgctxt "@title" msgid "Upgrade Firmware" msgstr "" -#: /home/tamara/2.1/Cura/resources/qml/WizardPages/AddMachine.qml:278 -msgctxt "@title" -msgid "Bed Levelling" -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/WizardPages/Bedleveling.qml:41 -msgctxt "@title" -msgid "Bed Leveling" -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/WizardPages/Bedleveling.qml:53 -msgctxt "@label" -msgid "" -"To make sure your prints will come out great, you can now adjust your " -"buildplate. When you click 'Move to Next Position' the nozzle will move to " -"the different positions that can be adjusted." -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/WizardPages/Bedleveling.qml:62 -msgctxt "@label" -msgid "" -"For every postition; insert a piece of paper under the nozzle and adjust the " -"print bed height. The print bed height is right when the paper is slightly " -"gripped by the tip of the nozzle." -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/WizardPages/Bedleveling.qml:77 -msgctxt "@action:button" -msgid "Move to Next Position" -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/WizardPages/Bedleveling.qml:109 -msgctxt "@action:button" -msgid "Skip Bedleveling" -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/WizardPages/Bedleveling.qml:123 -msgctxt "@label" -msgid "Everything is in order! You're done with bedleveling." -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/WizardPages/UpgradeFirmware.qml:33 +#: /home/ruben/Projects/Cura/resources/qml/WizardPages/UpgradeFirmware.qml:33 msgctxt "@label" msgid "" "Firmware is the piece of software running directly on your 3D printer. This " @@ -1174,147 +1272,48 @@ msgid "" "makes your printer work." msgstr "" -#: /home/tamara/2.1/Cura/resources/qml/WizardPages/UpgradeFirmware.qml:43 +#: /home/ruben/Projects/Cura/resources/qml/WizardPages/UpgradeFirmware.qml:43 msgctxt "@label" msgid "" "The firmware shipping with new Ultimakers works, but upgrades have been made " "to make better prints, and make calibration easier." msgstr "" -#: /home/tamara/2.1/Cura/resources/qml/WizardPages/UpgradeFirmware.qml:53 +#: /home/ruben/Projects/Cura/resources/qml/WizardPages/UpgradeFirmware.qml:53 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/tamara/2.1/Cura/resources/qml/WizardPages/UpgradeFirmware.qml:64 +#: /home/ruben/Projects/Cura/resources/qml/WizardPages/UpgradeFirmware.qml:64 msgctxt "@action:button" msgid "Upgrade to Marlin Firmware" msgstr "" -#: /home/tamara/2.1/Cura/resources/qml/WizardPages/UpgradeFirmware.qml:73 +#: /home/ruben/Projects/Cura/resources/qml/WizardPages/UpgradeFirmware.qml:73 msgctxt "@action:button" msgid "Skip Upgrade" msgstr "" -#: /home/tamara/2.1/Cura/resources/qml/SaveButton.qml:23 -msgctxt "@label:PrintjobStatus" -msgid "Please load a 3d model" -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/SaveButton.qml:25 -msgctxt "@label:PrintjobStatus" -msgid "Preparing to slice..." -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/SaveButton.qml:28 -msgctxt "@label:PrintjobStatus" -msgid "Slicing..." -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/SaveButton.qml:30 -msgctxt "@label:PrintjobStatus" -msgid "Ready to " -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/SaveButton.qml:122 -msgctxt "@info:tooltip" -msgid "Select the active output device" -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/AboutDialog.qml:15 -msgctxt "@title:window" -msgid "About Cura" -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/AboutDialog.qml:54 +#: /home/ruben/Projects/Cura/resources/qml/WizardPages/AddMachine.qml:72 msgctxt "@label" -msgid "End-to-end solution for fused filament 3D printing." +msgid "Please select the type of printer:" msgstr "" -#: /home/tamara/2.1/Cura/resources/qml/AboutDialog.qml:66 -msgctxt "@info:credit" +#: /home/ruben/Projects/Cura/resources/qml/WizardPages/AddMachine.qml:198 +msgctxt "@label" msgid "" -"Cura has been developed by Ultimaker B.V. in cooperation with the community." +"This printer name has already been used. Please choose a different printer " +"name." msgstr "" -#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:16 -msgctxt "@title:window" -msgid "Cura" +#: /home/ruben/Projects/Cura/resources/qml/WizardPages/AddMachine.qml:208 +msgctxt "@label:textbox" +msgid "Printer Name:" msgstr "" -#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:53 -msgctxt "@title:menu menubar:toplevel" -msgid "&File" -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:62 -msgctxt "@title:menu menubar:file" -msgid "Open &Recent" -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:92 -msgctxt "@action:inmenu menubar:file" -msgid "&Save Selection to File" -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:100 -msgctxt "@title:menu menubar:file" -msgid "Save &All" -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:128 -msgctxt "@title:menu menubar:toplevel" -msgid "&Edit" -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:145 -msgctxt "@title:menu menubar:toplevel" -msgid "&View" -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:167 -msgctxt "@title:menu menubar:toplevel" -msgid "&Printer" -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:213 -msgctxt "@title:menu menubar:toplevel" -msgid "P&rofile" -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:240 -msgctxt "@title:menu menubar:toplevel" -msgid "E&xtensions" -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:273 -msgctxt "@title:menu menubar:toplevel" -msgid "&Settings" -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:281 -msgctxt "@title:menu menubar:toplevel" -msgid "&Help" -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:366 -msgctxt "@action:button" -msgid "Open File" -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:410 -msgctxt "@action:button" -msgid "View Mode" -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:495 -msgctxt "@title:tab" -msgid "View" -msgstr "" - -#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:644 -msgctxt "@title:window" -msgid "Open file" +#: /home/ruben/Projects/Cura/resources/qml/WizardPages/AddMachine.qml:245 +msgctxt "@title" +msgid "Bed Levelling" msgstr "" diff --git a/resources/i18n/fdmprinter.json.pot b/resources/i18n/fdmprinter.json.pot index cd3af3004b..b16ad8c617 100644 --- a/resources/i18n/fdmprinter.json.pot +++ b/resources/i18n/fdmprinter.json.pot @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: Uranium json setting files\n" "Report-Msgid-Bugs-To: http://github.com/ultimaker/uranium\n" -"POT-Creation-Date: 2016-01-18 11:54+0000\n" +"POT-Creation-Date: 2016-03-23 16:40+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE\n" @@ -97,7 +97,7 @@ msgstr "" #: fdmprinter.json msgctxt "wall_line_width_x label" -msgid "Other Walls Line Width" +msgid "Inner Wall(s) Line Width" msgstr "" #: fdmprinter.json @@ -203,19 +203,6 @@ msgid "" "and impact the strength and structural integrity of your print." msgstr "" -#: fdmprinter.json -msgctxt "alternate_extra_perimeter label" -msgid "Alternate Extra Wall" -msgstr "" - -#: fdmprinter.json -msgctxt "alternate_extra_perimeter description" -msgid "" -"Make an extra wall at every second layer, so that infill will be caught " -"between an extra wall above and one below. This results in a better cohesion " -"between infill and walls, but might have an impact on the surface quality." -msgstr "" - #: fdmprinter.json msgctxt "top_bottom_thickness label" msgid "Bottom/Top Thickness" @@ -278,6 +265,19 @@ msgctxt "bottom_layers description" msgid "This controls the amount of bottom layers." msgstr "" +#: fdmprinter.json +msgctxt "alternate_extra_perimeter label" +msgid "Alternate Extra Wall" +msgstr "" + +#: fdmprinter.json +msgctxt "alternate_extra_perimeter description" +msgid "" +"Make an extra wall at every second layer, so that infill will be caught " +"between an extra wall above and one below. This results in a better cohesion " +"between infill and walls, but might have an impact on the surface quality." +msgstr "" + #: fdmprinter.json msgctxt "remove_overlapping_walls_enabled label" msgid "Remove Overlapping Wall Parts" @@ -306,7 +306,7 @@ msgstr "" #: fdmprinter.json msgctxt "remove_overlapping_walls_x_enabled label" -msgid "Remove Overlapping Other Wall Parts" +msgid "Remove Overlapping Inner Wall Parts" msgstr "" #: fdmprinter.json @@ -629,18 +629,6 @@ msgid "" "Celsius)." msgstr "" -#: fdmprinter.json -msgctxt "material_standby_temperature label" -msgid "Standby Temperature" -msgstr "" - -#: fdmprinter.json -msgctxt "material_standby_temperature description" -msgid "" -"The temperature of the nozzle when another nozzle is currently used for " -"printing." -msgstr "" - #: fdmprinter.json msgctxt "material_extrusion_cool_down_speed label" msgid "Extrusion Cool Down Speed Modifier" @@ -848,7 +836,7 @@ msgstr "" #: fdmprinter.json msgctxt "speed_wall label" -msgid "Shell Speed" +msgid "Wall Speed" msgstr "" #: fdmprinter.json @@ -860,7 +848,7 @@ msgstr "" #: fdmprinter.json msgctxt "speed_wall_0 label" -msgid "Outer Shell Speed" +msgid "Outer Wall Speed" msgstr "" #: fdmprinter.json @@ -874,7 +862,7 @@ msgstr "" #: fdmprinter.json msgctxt "speed_wall_x label" -msgid "Inner Shell Speed" +msgid "Inner Wall Speed" msgstr "" #: fdmprinter.json @@ -1210,6 +1198,61 @@ msgid "" "minimum layer time is used up." msgstr "" +#: fdmprinter.json +msgctxt "draft_shield_enabled label" +msgid "Enable Draft Shield" +msgstr "" + +#: fdmprinter.json +msgctxt "draft_shield_enabled description" +msgid "" +"Enable exterior draft shield. This will create a wall around the object " +"which traps (hot) air and shields against gusts of wind. Especially useful " +"for materials which warp easily." +msgstr "" + +#: fdmprinter.json +msgctxt "draft_shield_dist label" +msgid "Draft Shield X/Y Distance" +msgstr "" + +#: fdmprinter.json +msgctxt "draft_shield_dist description" +msgid "Distance of the draft shield from the print, in the X/Y directions." +msgstr "" + +#: fdmprinter.json +msgctxt "draft_shield_height_limitation label" +msgid "Draft Shield Limitation" +msgstr "" + +#: fdmprinter.json +msgctxt "draft_shield_height_limitation description" +msgid "Whether or not to limit the height of the draft shield." +msgstr "" + +#: fdmprinter.json +msgctxt "draft_shield_height_limitation option full" +msgid "Full" +msgstr "" + +#: fdmprinter.json +msgctxt "draft_shield_height_limitation option limited" +msgid "Limited" +msgstr "" + +#: fdmprinter.json +msgctxt "draft_shield_height label" +msgid "Draft Shield Height" +msgstr "" + +#: fdmprinter.json +msgctxt "draft_shield_height description" +msgid "" +"Height limitation on the draft shield. Above this height no draft shield " +"will be printed." +msgstr "" + #: fdmprinter.json msgctxt "support label" msgid "Support" @@ -1492,6 +1535,16 @@ msgid "" "diameter decreases, forming a roof." msgstr "" +#: fdmprinter.json +msgctxt "support_tower_diameter label" +msgid "Tower Diameter" +msgstr "" + +#: fdmprinter.json +msgctxt "support_tower_diameter description" +msgid "The diameter of a special tower." +msgstr "" + #: fdmprinter.json msgctxt "support_minimal_diameter label" msgid "Minimum Diameter" @@ -1504,16 +1557,6 @@ msgid "" "supported by a specialized support tower." msgstr "" -#: fdmprinter.json -msgctxt "support_tower_diameter label" -msgid "Tower Diameter" -msgstr "" - -#: fdmprinter.json -msgctxt "support_tower_diameter description" -msgid "The diameter of a special tower." -msgstr "" - #: fdmprinter.json msgctxt "support_tower_roof_angle label" msgid "Tower Roof Angle" @@ -1934,61 +1977,6 @@ msgctxt "raft_base_fan_speed description" msgid "The fan speed for the base raft layer." msgstr "" -#: fdmprinter.json -msgctxt "draft_shield_enabled label" -msgid "Enable Draft Shield" -msgstr "" - -#: fdmprinter.json -msgctxt "draft_shield_enabled description" -msgid "" -"Enable exterior draft shield. This will create a wall around the object " -"which traps (hot) air and shields against gusts of wind. Especially useful " -"for materials which warp easily." -msgstr "" - -#: fdmprinter.json -msgctxt "draft_shield_dist label" -msgid "Draft Shield X/Y Distance" -msgstr "" - -#: fdmprinter.json -msgctxt "draft_shield_dist description" -msgid "Distance of the draft shield from the print, in the X/Y directions." -msgstr "" - -#: fdmprinter.json -msgctxt "draft_shield_height_limitation label" -msgid "Draft Shield Limitation" -msgstr "" - -#: fdmprinter.json -msgctxt "draft_shield_height_limitation description" -msgid "Whether or not to limit the height of the draft shield." -msgstr "" - -#: fdmprinter.json -msgctxt "draft_shield_height_limitation option full" -msgid "Full" -msgstr "" - -#: fdmprinter.json -msgctxt "draft_shield_height_limitation option limited" -msgid "Limited" -msgstr "" - -#: fdmprinter.json -msgctxt "draft_shield_height label" -msgid "Draft Shield Height" -msgstr "" - -#: fdmprinter.json -msgctxt "draft_shield_height description" -msgid "" -"Height limitation on the draft shield. Above this height no draft shield " -"will be printed." -msgstr "" - #: fdmprinter.json msgctxt "meshfix label" msgid "Mesh Fixes" From 25390428582d0253c14178d45aac4fd4319e48f1 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Wed, 23 Mar 2016 17:43:09 +0100 Subject: [PATCH 33/89] profiles: did all profiles ABS and CPE with Paul by hand (CURA-1195) also reordered settings to match Pauls sheet --- .../ultimaker2+/abs_0.25_normal.curaprofile | 17 ++++++++-------- .../ultimaker2+/abs_0.4_fast.curaprofile | 15 +++++++------- .../ultimaker2+/abs_0.4_high.curaprofile | 16 ++++++++------- .../ultimaker2+/abs_0.4_normal.curaprofile | 16 +++++++++------ .../ultimaker2+/abs_0.6_normal.curaprofile | 18 +++++++++-------- .../ultimaker2+/abs_0.8_normal.curaprofile | 17 +++++++++------- .../ultimaker2+/cpe_0.25_normal.curaprofile | 17 ++++++++-------- .../ultimaker2+/cpe_0.4_fast.curaprofile | 20 ++++++++++--------- .../ultimaker2+/cpe_0.4_high.curaprofile | 18 ++++++++++------- .../ultimaker2+/cpe_0.4_normal.curaprofile | 18 +++++++++++------ .../ultimaker2+/cpe_0.6_normal.curaprofile | 18 +++++++++-------- .../ultimaker2+/cpe_0.8_normal.curaprofile | 18 +++++++++-------- 12 files changed, 119 insertions(+), 89 deletions(-) diff --git a/resources/profiles/ultimaker2+/abs_0.25_normal.curaprofile b/resources/profiles/ultimaker2+/abs_0.25_normal.curaprofile index e248b71b98..a313dea610 100644 --- a/resources/profiles/ultimaker2+/abs_0.25_normal.curaprofile +++ b/resources/profiles/ultimaker2+/abs_0.25_normal.curaprofile @@ -8,18 +8,19 @@ weight = -2 [settings] layer_height = 0.06 -top_bottom_thickness = 0.72 -layer_height_0 = 0.15 -speed_wall_x = 25 wall_thickness = 0.88 +line_width = 0.22 +top_bottom_thickness = 0.72 +infill_sparse_density = 22 +speed_print = 20 +layer_height_0 = 0.15 +speed_layer_0 = 20 speed_infill = 30 speed_topbottom = 20 -speed_print = 20 -cool_min_speed = 25 -line_width = 0.22 -infill_sparse_density = 22 speed_wall_0 = 20 +speed_wall_x = 25 cool_min_layer_time = 2 +cool_min_speed = 10 cool_lift_head = True -cool_fan_speed_min = 50 +cool_fan_speed_min = 20 diff --git a/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile b/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile index ad2e1fce75..969fd46563 100644 --- a/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile +++ b/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile @@ -8,18 +8,19 @@ weight = -1 [settings] layer_height = 0.15 -top_bottom_thickness = 0.75 -layer_height_0 = 0.26 -speed_print = 40 wall_thickness = 0.7 +line_width = 0.35 +top_bottom_thickness = 0.75 +infill_sparse_density = 18 +speed_print = 40 +layer_height_0 = 0.26 +speed_travel = 150 speed_infill = 55 speed_topbottom = 30 +speed_wall_0 = 30 +speed_wall_x = 40 cool_min_layer_time = 3 cool_min_speed = 20 -line_width = 0.35 -infill_sparse_density = 18 -speed_travel = 150 -speed_wall_0 = 30 cool_lift_head = True cool_fan_speed_min = 50 diff --git a/resources/profiles/ultimaker2+/abs_0.4_high.curaprofile b/resources/profiles/ultimaker2+/abs_0.4_high.curaprofile index e76ca76b51..c4e256e088 100644 --- a/resources/profiles/ultimaker2+/abs_0.4_high.curaprofile +++ b/resources/profiles/ultimaker2+/abs_0.4_high.curaprofile @@ -8,17 +8,19 @@ weight = -3 [settings] layer_height = 0.06 -top_bottom_thickness = 0.72 -layer_height_0 = 0.26 -speed_print = 30 wall_thickness = 1.05 +line_width = 0.35 +top_bottom_thickness = 0.72 +infill_sparse_density = 22 +speed_print = 30 +layer_height_0 = 0.26 +speed_layer_0 = 20 speed_infill = 45 speed_topbottom = 20 -cool_min_speed = 20 -line_width = 0.35 -infill_sparse_density = 22 speed_wall_0 = 20 +speed_wall_x = 30 cool_min_layer_time = 3 +cool_min_speed = 10 +cool_fan_speed_min = 20 cool_lift_head = True -cool_fan_speed_min = 50 diff --git a/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile b/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile index 9fc4ab5be0..b8c491f0ed 100644 --- a/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile +++ b/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile @@ -7,15 +7,19 @@ material = ABS weight = -2 [settings] -layer_height_0 = 0.26 -speed_print = 30 +layer_height = 0.1 wall_thickness = 1.05 +line_width = 0.35 +top_bottom_thickness = 0.8 +speed_print = 30 +layer_height_0 = 0.26 +speed_layer_0 = 20 speed_infill = 45 speed_topbottom = 20 -cool_min_layer_time = 3 -cool_min_speed = 20 -line_width = 0.35 speed_wall_0 = 20 -cool_lift_head = True +speed_wall_x = 30 +cool_min_layer_time = 3 cool_fan_speed_min = 50 +cool_min_speed = 10 +cool_lift_head = True diff --git a/resources/profiles/ultimaker2+/abs_0.6_normal.curaprofile b/resources/profiles/ultimaker2+/abs_0.6_normal.curaprofile index 182f4484c2..7f14ef04a2 100644 --- a/resources/profiles/ultimaker2+/abs_0.6_normal.curaprofile +++ b/resources/profiles/ultimaker2+/abs_0.6_normal.curaprofile @@ -8,17 +8,19 @@ weight = -2 [settings] layer_height = 0.15 -top_bottom_thickness = 1.2 -layer_height_0 = 0.39 -speed_print = 25 -speed_wall_x = 30 wall_thickness = 1.59 -speed_infill = 55 -speed_topbottom = 20 -cool_min_speed = 20 line_width = 0.53 +top_bottom_thickness = 1.2 +infill_sparse_density = 20 +speed_print = 25 +layer_height_0 = 0.39 +speed_layer_0 = 20 +speed_infill = 40 +speed_topbottom = 20 speed_wall_0 = 20 +speed_wall_x = 30 cool_min_layer_time = 3 -cool_lift_head = True cool_fan_speed_min = 50 +cool_min_speed = 20 +cool_lift_head = True diff --git a/resources/profiles/ultimaker2+/abs_0.8_normal.curaprofile b/resources/profiles/ultimaker2+/abs_0.8_normal.curaprofile index 4bb0fd6ad8..1f3f8c8b0b 100644 --- a/resources/profiles/ultimaker2+/abs_0.8_normal.curaprofile +++ b/resources/profiles/ultimaker2+/abs_0.8_normal.curaprofile @@ -8,17 +8,20 @@ weight = -2 [settings] layer_height = 0.2 -top_bottom_thickness = 1.2 -layer_height_0 = 0.5 -speed_print = 20 -speed_wall_x = 30 wall_thickness = 2.1 +line_width = 0.7 +speed_print = 20 +top_bottom_thickness = 1.2 +infill_sparse_density = 20 +layer_height_0 = 0.5 +speed_wall_x = 30 +speed_layer_0 = 20 speed_infill = 40 speed_topbottom = 20 -cool_min_speed = 15 -line_width = 0.7 speed_wall_0 = 20 +speed_wall_x = 30 cool_min_layer_time = 3 -cool_lift_head = True cool_fan_speed_min = 50 +cool_min_speed = 15 +cool_lift_head = True diff --git a/resources/profiles/ultimaker2+/cpe_0.25_normal.curaprofile b/resources/profiles/ultimaker2+/cpe_0.25_normal.curaprofile index 1e597f0720..0a1a9d5298 100644 --- a/resources/profiles/ultimaker2+/cpe_0.25_normal.curaprofile +++ b/resources/profiles/ultimaker2+/cpe_0.25_normal.curaprofile @@ -7,19 +7,20 @@ material = CPE weight = -2 [settings] -infill_overlap = 17 layer_height = 0.06 wall_thickness = 0.88 -layer_height_0 = 0.15 -speed_wall_x = 25 +line_width = 0.22 top_bottom_thickness = 0.72 +infill_sparse_density = 22 +speed_print = 20 +layer_height_0 = 0.15 +speed_layer_0 = 20 speed_infill = 30 speed_topbottom = 20 -cool_min_layer_time = 2 -speed_print = 20 -line_width = 0.22 -infill_sparse_density = 22 speed_wall_0 = 20 -cool_lift_head = True +speed_wall_x = 25 +cool_min_layer_time = 2 cool_fan_speed_min = 50 +cool_lift_head = True +infill_overlap = 17 diff --git a/resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile b/resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile index 950c0040f1..649a43827d 100644 --- a/resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile +++ b/resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile @@ -7,20 +7,22 @@ material = CPE weight = -1 [settings] -infill_overlap = 17 -cool_min_layer_time = 3 layer_height = 0.15 wall_thickness = 0.7 -layer_height_0 = 0.26 -speed_print = 30 -speed_wall_x = 40 +line_width = 0.35 top_bottom_thickness = 0.75 +infill_sparse_density = 18 +speed_print = 40 +layer_height_0 = 0.26 +speed_travel = 150 +speed_layer_0 = 30 speed_infill = 45 speed_topbottom = 20 -speed_travel = 150 -line_width = 0.35 -infill_sparse_density = 18 speed_wall_0 = 30 -cool_lift_head = True +speed_wall_x = 40 +cool_min_layer_time = 3 cool_fan_speed_min = 50 +cool_min_speed = 10 +cool_lift_head = True +infill_overlap = 17 diff --git a/resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile b/resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile index de2fb2bf2d..81a1956ce1 100644 --- a/resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile +++ b/resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile @@ -8,17 +8,21 @@ weight = -3 [settings] layer_height = 0.06 -top_bottom_thickness = 0.72 -layer_height_0 = 0.26 -speed_print = 20 -speed_wall_x = 30 wall_thickness = 1.05 +line_width = 0.35 +top_bottom_thickness = 0.72 +infill_sparse_density = 22 +speed_print = 20 +layer_height_0 = 0.26 +speed_layer_0 = 20 speed_infill = 45 speed_topbottom = 20 -line_width = 0.35 -infill_sparse_density = 22 speed_wall_0 = 20 +speed_wall_x = 30 cool_min_layer_time = 3 -cool_lift_head = True cool_fan_speed_min = 50 +cool_min_speed = 10 +cool_lift_head = True +infill_overlap = 15 + diff --git a/resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile b/resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile index 2b93010a90..dac242098d 100644 --- a/resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile +++ b/resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile @@ -7,15 +7,21 @@ material = CPE weight = -2 [settings] -layer_height_0 = 0.26 -speed_print = 20 -speed_wall_x = 30 +layer_height = 0.1 wall_thickness = 1.05 +line_width = 0.35 +top_bottom_thickness = 0.8 +infill_sparse_density = 20 +speed_print = 30 +layer_height_0 = 0.26 +speed_layer_0 = 20 speed_infill = 45 speed_topbottom = 20 -cool_min_layer_time = 3 -line_width = 0.35 speed_wall_0 = 20 -cool_lift_head = True +speed_wall_x = 30 +cool_min_layer_time = 3 cool_fan_speed_min = 50 +cool_min_speed = 10 +cool_lift_head = True +infill_overlap = 15 diff --git a/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile b/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile index 27f72e5d1c..9d7319492c 100644 --- a/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile +++ b/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile @@ -7,18 +7,20 @@ material = CPE weight = -2 [settings] -infill_overlap = 17 layer_height = 0.15 -top_bottom_thickness = 1.2 -layer_height_0 = 0.39 -speed_wall_x = 30 wall_thickness = 1.59 +line_width = 0.53 +top_bottom_thickness = 1.2 +infill_sparse_density = 20 +speed_print = 25 +layer_height_0 = 0.4 +speed_layer_0 = 20 speed_infill = 40 speed_topbottom = 20 -cool_min_layer_time = 3 -speed_print = 20 -line_width = 0.53 speed_wall_0 = 20 -cool_lift_head = True +speed_wall_x = 30 +cool_min_layer_time = 3 cool_fan_speed_min = 50 +cool_lift_head = True +infill_overlap = 17 diff --git a/resources/profiles/ultimaker2+/cpe_0.8_normal.curaprofile b/resources/profiles/ultimaker2+/cpe_0.8_normal.curaprofile index a043d9270b..9e50205d01 100644 --- a/resources/profiles/ultimaker2+/cpe_0.8_normal.curaprofile +++ b/resources/profiles/ultimaker2+/cpe_0.8_normal.curaprofile @@ -7,18 +7,20 @@ material = CPE weight = -2 [settings] -infill_overlap = 17 layer_height = 0.2 -top_bottom_thickness = 1.2 -layer_height_0 = 0.5 -speed_wall_x = 30 wall_thickness = 2.1 +line_width = 0.7 +top_bottom_thickness = 1.2 +infill_sparse_density = 20 +speed_print = 20 +layer_height_0 = 0.5 +speed_layer_o = 20 speed_infill = 40 speed_topbottom = 20 -cool_min_layer_time = 3 -speed_print = 20 -line_width = 0.7 speed_wall_0 = 20 -cool_lift_head = True +speed_wall_x = 30 +cool_min_layer_time = 3 cool_fan_speed_min = 50 +cool_lift_head = True +infill_overlap = 17 From 47b04efcfec8f10b0f5629ea610a0e140d605a25 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Wed, 23 Mar 2016 18:09:59 +0100 Subject: [PATCH 34/89] profiles fixes: removed double settings, introduced missing ones (CURA-1195) I've made it such that all ABS and CPE profiles contain the same settings and also all PLA profiles contain the same settings. This is to verify that no settings have been overlooked. --- resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile | 1 + resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile | 1 + resources/profiles/ultimaker2+/abs_0.8_normal.curaprofile | 1 - resources/profiles/ultimaker2+/cpe_0.25_normal.curaprofile | 1 + resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile | 1 + resources/profiles/ultimaker2+/cpe_0.8_normal.curaprofile | 3 ++- resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile | 2 ++ resources/profiles/ultimaker2+/pla_0.4_high.curaprofile | 1 + resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile | 2 ++ resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile | 1 + resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile | 1 + resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile | 1 + 12 files changed, 14 insertions(+), 2 deletions(-) diff --git a/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile b/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile index 969fd46563..effb1ce35a 100644 --- a/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile +++ b/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile @@ -14,6 +14,7 @@ top_bottom_thickness = 0.75 infill_sparse_density = 18 speed_print = 40 layer_height_0 = 0.26 +speed_layer_0 = 30 speed_travel = 150 speed_infill = 55 speed_topbottom = 30 diff --git a/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile b/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile index b8c491f0ed..d409d8ac5c 100644 --- a/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile +++ b/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile @@ -11,6 +11,7 @@ layer_height = 0.1 wall_thickness = 1.05 line_width = 0.35 top_bottom_thickness = 0.8 +infill_sparse_density = 20 speed_print = 30 layer_height_0 = 0.26 speed_layer_0 = 20 diff --git a/resources/profiles/ultimaker2+/abs_0.8_normal.curaprofile b/resources/profiles/ultimaker2+/abs_0.8_normal.curaprofile index 1f3f8c8b0b..60eee772b1 100644 --- a/resources/profiles/ultimaker2+/abs_0.8_normal.curaprofile +++ b/resources/profiles/ultimaker2+/abs_0.8_normal.curaprofile @@ -14,7 +14,6 @@ speed_print = 20 top_bottom_thickness = 1.2 infill_sparse_density = 20 layer_height_0 = 0.5 -speed_wall_x = 30 speed_layer_0 = 20 speed_infill = 40 speed_topbottom = 20 diff --git a/resources/profiles/ultimaker2+/cpe_0.25_normal.curaprofile b/resources/profiles/ultimaker2+/cpe_0.25_normal.curaprofile index 0a1a9d5298..fba8e96cd7 100644 --- a/resources/profiles/ultimaker2+/cpe_0.25_normal.curaprofile +++ b/resources/profiles/ultimaker2+/cpe_0.25_normal.curaprofile @@ -20,6 +20,7 @@ speed_topbottom = 20 speed_wall_0 = 20 speed_wall_x = 25 cool_min_layer_time = 2 +cool_min_speed = 10 cool_fan_speed_min = 50 cool_lift_head = True infill_overlap = 17 diff --git a/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile b/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile index 9d7319492c..bbeffc9659 100644 --- a/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile +++ b/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile @@ -20,6 +20,7 @@ speed_topbottom = 20 speed_wall_0 = 20 speed_wall_x = 30 cool_min_layer_time = 3 +cool_min_speed = 10 cool_fan_speed_min = 50 cool_lift_head = True infill_overlap = 17 diff --git a/resources/profiles/ultimaker2+/cpe_0.8_normal.curaprofile b/resources/profiles/ultimaker2+/cpe_0.8_normal.curaprofile index 9e50205d01..b73869646d 100644 --- a/resources/profiles/ultimaker2+/cpe_0.8_normal.curaprofile +++ b/resources/profiles/ultimaker2+/cpe_0.8_normal.curaprofile @@ -14,12 +14,13 @@ top_bottom_thickness = 1.2 infill_sparse_density = 20 speed_print = 20 layer_height_0 = 0.5 -speed_layer_o = 20 +speed_layer_0 = 20 speed_infill = 40 speed_topbottom = 20 speed_wall_0 = 20 speed_wall_x = 30 cool_min_layer_time = 3 +cool_min_speed = 10 cool_fan_speed_min = 50 cool_lift_head = True infill_overlap = 17 diff --git a/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile index 60566f7933..8e78fd20c8 100644 --- a/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile @@ -14,8 +14,10 @@ shell_thickness = 0.7 top_bottom_thickness = 0.6 infill_sparse_density = 18 retraction_amount = 5.5 +speed_infill = 60 speed_wall_0 = 40 speed_wall_x = 50 speed_travel = 150 +speed_topbottom = 30 speed_layer_0 = 25 cool_min_layer_time_fan_speed_max = 15 diff --git a/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile index a1009af9a9..77a374251b 100644 --- a/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile @@ -15,6 +15,7 @@ top_bottom_thickness = 0.84 infill_sparse_density = 22 retraction_amount = 5.5 speed_infill = 50 +speed_wall_0 = 30 speed_wall_x = 40 speed_topbottom = 20 speed_layer_0 = 25 diff --git a/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile index 34d1a0ef5d..66d4ac6360 100644 --- a/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile @@ -12,8 +12,10 @@ layer_height = 0.1 layer_height_0 = 0.26 shell_thickness = 1.05 top_bottom_thickness = 0.8 +infill_sparse_density = 20 retraction_amount = 5.5 speed_infill = 50 +speed_wall_0 = 30 speed_wall_x = 40 speed_topbottom = 20 speed_layer_0 = 25 diff --git a/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile index 081d5a2055..c716457f0d 100644 --- a/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile @@ -16,6 +16,7 @@ infill_sparse_density = 25 retraction_amount = 5.5 retraction_extrusion_window = 6 speed_infill = 50 +speed_wall_0 = 30 speed_wall_x = 40 speed_topbottom = 20 speed_layer_0 = 25 diff --git a/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile index 937157e863..e29973a441 100644 --- a/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile @@ -12,6 +12,7 @@ layer_height = 0.15 layer_height_0 = 0.4 shell_thickness = 1.59 top_bottom_thickness = 1.2 +infill_sparse_density = 20 retraction_amount = 6 speed_infill = 55 speed_wall_0 = 25 diff --git a/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile index e5dbd61841..124164dc00 100644 --- a/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile @@ -12,6 +12,7 @@ layer_height = 0.2 layer_height_0 = 0.5 shell_thickness = 2.1 top_bottom_thickness = 1.6 +infill_sparse_density = 20 retraction_amount = 6 speed_infill = 40 speed_wall_0 = 20 From 978cf3e82488bd87eefadd5d15547bc6a2f0c1bb Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Wed, 23 Mar 2016 18:19:50 +0100 Subject: [PATCH 35/89] JSON fix: removed inherit cause it already had an inherit_function (CURA-1195) --- resources/machines/fdmprinter.json | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index 2b026cc4df..fc9fc98866 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -927,7 +927,6 @@ "min_value": "0.1", "max_value_warning": "150", "visible": false, - "inherit": false, "enabled": "support_roof_enable", "inherit_function": "parent_value / 60 * 40", "global_only": true From 6e7be5995c28253d7baf57b067391337c0be6000 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Wed, 23 Mar 2016 18:26:03 +0100 Subject: [PATCH 36/89] profiles: got print speed from old cura (CURA-1195) --- resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile | 1 + resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile | 1 + resources/profiles/ultimaker2+/pla_0.4_high.curaprofile | 1 + resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile | 1 + resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile | 1 + resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile | 1 + resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile | 1 + 7 files changed, 7 insertions(+) diff --git a/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile index d05c74f906..e127b04c41 100644 --- a/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile @@ -14,6 +14,7 @@ shell_thickness = 0.88 top_bottom_thickness = 0.72 infill_sparse_density = 22 retraction_amount = 6 +speed_print = 20 speed_infill = 30 speed_wall_0 = 20 speed_wall_x = 25 diff --git a/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile index 8e78fd20c8..b22032b7ed 100644 --- a/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile @@ -14,6 +14,7 @@ shell_thickness = 0.7 top_bottom_thickness = 0.6 infill_sparse_density = 18 retraction_amount = 5.5 +speed_print = 40 speed_infill = 60 speed_wall_0 = 40 speed_wall_x = 50 diff --git a/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile index 77a374251b..e0b85b137c 100644 --- a/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile @@ -14,6 +14,7 @@ shell_thickness = 1.05 top_bottom_thickness = 0.84 infill_sparse_density = 22 retraction_amount = 5.5 +speed_print = 30 speed_infill = 50 speed_wall_0 = 30 speed_wall_x = 40 diff --git a/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile index 66d4ac6360..3e2c39ed82 100644 --- a/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile @@ -14,6 +14,7 @@ shell_thickness = 1.05 top_bottom_thickness = 0.8 infill_sparse_density = 20 retraction_amount = 5.5 +speed_print = 30 speed_infill = 50 speed_wall_0 = 30 speed_wall_x = 40 diff --git a/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile index c716457f0d..b825f62e47 100644 --- a/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile @@ -15,6 +15,7 @@ top_bottom_thickness = 1.12 infill_sparse_density = 25 retraction_amount = 5.5 retraction_extrusion_window = 6 +speed_print = 30 speed_infill = 50 speed_wall_0 = 30 speed_wall_x = 40 diff --git a/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile index e29973a441..256fa3070e 100644 --- a/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile @@ -14,6 +14,7 @@ shell_thickness = 1.59 top_bottom_thickness = 1.2 infill_sparse_density = 20 retraction_amount = 6 +speed_print = 25 speed_infill = 55 speed_wall_0 = 25 speed_wall_x = 40 diff --git a/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile index 124164dc00..be9d2a512d 100644 --- a/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile @@ -14,6 +14,7 @@ shell_thickness = 2.1 top_bottom_thickness = 1.6 infill_sparse_density = 20 retraction_amount = 6 +speed_print = 20 speed_infill = 40 speed_wall_0 = 20 speed_wall_x = 30 From c1af2c4ae0dd4428f27146314f26aa3988da749c Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 24 Mar 2016 09:46:28 +0100 Subject: [PATCH 37/89] 3mf reader now uses correct coordinate frame --- plugins/3MFReader/ThreeMFReader.py | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/plugins/3MFReader/ThreeMFReader.py b/plugins/3MFReader/ThreeMFReader.py index ee86f720d8..9721117068 100644 --- a/plugins/3MFReader/ThreeMFReader.py +++ b/plugins/3MFReader/ThreeMFReader.py @@ -67,6 +67,11 @@ class ThreeMFReader(MeshReader): mesh.addFace(vertex_list[v1][0],vertex_list[v1][1],vertex_list[v1][2],vertex_list[v2][0],vertex_list[v2][1],vertex_list[v2][2],vertex_list[v3][0],vertex_list[v3][1],vertex_list[v3][2]) Job.yieldThread() + # Rotate the model; We use a different coordinate frame. + rotation = Matrix() + rotation.setByRotationAxis(-0.5 * math.pi, Vector(1,0,0)) + mesh = mesh.getTransformed(rotation) + #TODO: We currently do not check for normals and simply recalculate them. mesh.calculateNormals() node.setMeshData(mesh) @@ -101,22 +106,8 @@ class ThreeMFReader(MeshReader): temp_mat._data[1,3] = splitted_transformation[10] temp_mat._data[2,3] = splitted_transformation[11] - node.setPosition(Vector(temp_mat.at(0,3), temp_mat.at(1,3), temp_mat.at(2,3))) + node.setTransformation(temp_mat) - temp_quaternion = Quaternion() - temp_quaternion.setByMatrix(temp_mat) - node.setOrientation(temp_quaternion) - - # Magical scale extraction - scale = temp_mat.getTransposed().multiply(temp_mat) - scale_x = math.sqrt(scale.at(0,0)) - scale_y = math.sqrt(scale.at(1,1)) - scale_z = math.sqrt(scale.at(2,2)) - node.setScale(Vector(scale_x,scale_y,scale_z)) - - # We use a different coordinate frame, so rotate. - #rotation = Quaternion.fromAngleAxis(-0.5 * math.pi, Vector(1,0,0)) - #node.rotate(rotation) result.addChild(node) Job.yieldThread() From 2e7d370497eef147be403bd6e0c8dbb1632d20ce Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Thu, 24 Mar 2016 13:49:13 +0100 Subject: [PATCH 38/89] JSON: include Olsson nozzle tip outer diameter (CURA-1281) --- resources/machines/ultimaker2_extended_olsson_025.json | 3 ++- resources/machines/ultimaker2_extended_olsson_040.json | 3 ++- resources/machines/ultimaker2_extended_olsson_060.json | 3 ++- resources/machines/ultimaker2_extended_olsson_080.json | 3 ++- resources/machines/ultimaker2_extended_plus_025.json | 3 ++- resources/machines/ultimaker2_extended_plus_040.json | 3 ++- resources/machines/ultimaker2_extended_plus_060.json | 3 ++- resources/machines/ultimaker2_extended_plus_080.json | 3 ++- resources/machines/ultimaker2_olsson_025.json | 1 + resources/machines/ultimaker2_olsson_040.json | 3 ++- resources/machines/ultimaker2_olsson_060.json | 1 + resources/machines/ultimaker2_olsson_080.json | 1 + resources/machines/ultimaker2plus_025.json | 1 + resources/machines/ultimaker2plus_040.json | 3 ++- resources/machines/ultimaker2plus_060.json | 1 + resources/machines/ultimaker2plus_080.json | 1 + 16 files changed, 26 insertions(+), 10 deletions(-) diff --git a/resources/machines/ultimaker2_extended_olsson_025.json b/resources/machines/ultimaker2_extended_olsson_025.json index 7d5e1ba384..ea09020363 100644 --- a/resources/machines/ultimaker2_extended_olsson_025.json +++ b/resources/machines/ultimaker2_extended_olsson_025.json @@ -12,6 +12,7 @@ "variant": "0.25 mm", "profiles_machine": "ultimaker2_olsson", "machine_settings": { - "machine_nozzle_size": { "default": 0.25 } + "machine_nozzle_size": { "default": 0.25 }, + "machine_nozzle_tip_outer_diameter": { "default": 0.8 } } } diff --git a/resources/machines/ultimaker2_extended_olsson_040.json b/resources/machines/ultimaker2_extended_olsson_040.json index c031c5a7f4..dfbd4a94d9 100644 --- a/resources/machines/ultimaker2_extended_olsson_040.json +++ b/resources/machines/ultimaker2_extended_olsson_040.json @@ -13,6 +13,7 @@ "variant": "0.4 mm", "profiles_machine": "ultimaker2_olsson", "machine_settings": { - "machine_nozzle_size": { "default": 0.40 } + "machine_nozzle_size": { "default": 0.40 }, + "machine_nozzle_tip_outer_diameter": { "default": 1.05 } } } diff --git a/resources/machines/ultimaker2_extended_olsson_060.json b/resources/machines/ultimaker2_extended_olsson_060.json index ce811fa556..30d1cc082c 100644 --- a/resources/machines/ultimaker2_extended_olsson_060.json +++ b/resources/machines/ultimaker2_extended_olsson_060.json @@ -13,6 +13,7 @@ "variant": "0.6 mm", "profiles_machine": "ultimaker2_olsson", "machine_settings": { - "machine_nozzle_size": { "default": 0.60 } + "machine_nozzle_size": { "default": 0.60 }, + "machine_nozzle_tip_outer_diameter": { "default": 1.25 } } } diff --git a/resources/machines/ultimaker2_extended_olsson_080.json b/resources/machines/ultimaker2_extended_olsson_080.json index a7b703f051..04fe80337c 100644 --- a/resources/machines/ultimaker2_extended_olsson_080.json +++ b/resources/machines/ultimaker2_extended_olsson_080.json @@ -13,6 +13,7 @@ "variant": "0.8 mm", "profiles_machine": "ultimaker2_olsson", "machine_settings": { - "machine_nozzle_size": { "default": 0.80 } + "machine_nozzle_size": { "default": 0.80 }, + "machine_nozzle_tip_outer_diameter": { "default": 1.35 } } } diff --git a/resources/machines/ultimaker2_extended_plus_025.json b/resources/machines/ultimaker2_extended_plus_025.json index 06c98a2c95..187079aa33 100644 --- a/resources/machines/ultimaker2_extended_plus_025.json +++ b/resources/machines/ultimaker2_extended_plus_025.json @@ -11,6 +11,7 @@ "variant": "0.25 mm", "profiles_machine": "ultimaker2plus", "machine_settings": { - "machine_nozzle_size": { "default": 0.25 } + "machine_nozzle_size": { "default": 0.25 }, + "machine_nozzle_tip_outer_diameter": { "default": 0.8 } } } diff --git a/resources/machines/ultimaker2_extended_plus_040.json b/resources/machines/ultimaker2_extended_plus_040.json index 6ad7be488e..b548bbe423 100644 --- a/resources/machines/ultimaker2_extended_plus_040.json +++ b/resources/machines/ultimaker2_extended_plus_040.json @@ -11,6 +11,7 @@ "variant": "0.4 mm", "profiles_machine": "ultimaker2plus", "machine_settings": { - "machine_nozzle_size": { "default": 0.40 } + "machine_nozzle_size": { "default": 0.40 }, + "machine_nozzle_tip_outer_diameter": { "default": 1.05 } } } diff --git a/resources/machines/ultimaker2_extended_plus_060.json b/resources/machines/ultimaker2_extended_plus_060.json index 490a68e89c..9d39c267ba 100644 --- a/resources/machines/ultimaker2_extended_plus_060.json +++ b/resources/machines/ultimaker2_extended_plus_060.json @@ -11,6 +11,7 @@ "variant": "0.6 mm", "profiles_machine": "ultimaker2plus", "machine_settings": { - "machine_nozzle_size": { "default": 0.60 } + "machine_nozzle_size": { "default": 0.60 }, + "machine_nozzle_tip_outer_diameter": { "default": 1.25 } } } diff --git a/resources/machines/ultimaker2_extended_plus_080.json b/resources/machines/ultimaker2_extended_plus_080.json index e92064a54b..bf74998f57 100644 --- a/resources/machines/ultimaker2_extended_plus_080.json +++ b/resources/machines/ultimaker2_extended_plus_080.json @@ -11,6 +11,7 @@ "variant": "0.8 mm", "profiles_machine": "ultimaker2plus", "machine_settings": { - "machine_nozzle_size": { "default": 0.80 } + "machine_nozzle_size": { "default": 0.80 }, + "machine_nozzle_tip_outer_diameter": { "default": 1.35 } } } diff --git a/resources/machines/ultimaker2_olsson_025.json b/resources/machines/ultimaker2_olsson_025.json index cc70c21624..71552cddfd 100644 --- a/resources/machines/ultimaker2_olsson_025.json +++ b/resources/machines/ultimaker2_olsson_025.json @@ -14,6 +14,7 @@ "overrides": { "machine_nozzle_size": { "default": 0.25 }, + "machine_nozzle_tip_outer_diameter": { "default": 0.8 }, "coasting_volume": { "default": 0.1 }, "coasting_min_volume": { "default": 0.17 } diff --git a/resources/machines/ultimaker2_olsson_040.json b/resources/machines/ultimaker2_olsson_040.json index 481ff00b3a..ae1c3073d0 100644 --- a/resources/machines/ultimaker2_olsson_040.json +++ b/resources/machines/ultimaker2_olsson_040.json @@ -13,6 +13,7 @@ "variant": "0.4 mm", "overrides": { - "machine_nozzle_size": { "default": 0.40 } + "machine_nozzle_size": { "default": 0.40 }, + "machine_nozzle_tip_outer_diameter": { "default": 1.05 } } } diff --git a/resources/machines/ultimaker2_olsson_060.json b/resources/machines/ultimaker2_olsson_060.json index a0e2af8ee9..f87b79b64e 100644 --- a/resources/machines/ultimaker2_olsson_060.json +++ b/resources/machines/ultimaker2_olsson_060.json @@ -14,6 +14,7 @@ "overrides": { "machine_nozzle_size": { "default": 0.60 }, + "machine_nozzle_tip_outer_diameter": { "default": 1.25 }, "coasting_volume": { "default": 1.36 } } } diff --git a/resources/machines/ultimaker2_olsson_080.json b/resources/machines/ultimaker2_olsson_080.json index 9ab0497651..e3018e42ad 100644 --- a/resources/machines/ultimaker2_olsson_080.json +++ b/resources/machines/ultimaker2_olsson_080.json @@ -14,6 +14,7 @@ "overrides": { "machine_nozzle_size": { "default": 0.80 }, + "machine_nozzle_tip_outer_diameter": { "default": 1.35 }, "coasting_volume": { "default": 3.22 } } } diff --git a/resources/machines/ultimaker2plus_025.json b/resources/machines/ultimaker2plus_025.json index 0e13d8c34d..22bb33cb55 100644 --- a/resources/machines/ultimaker2plus_025.json +++ b/resources/machines/ultimaker2plus_025.json @@ -13,6 +13,7 @@ "overrides": { "machine_nozzle_size": { "default": 0.25 }, + "machine_nozzle_tip_outer_diameter": { "default": 0.8 }, "coasting_volume": { "default": 0.1 }, "coasting_min_volume": { "default": 0.17 } } diff --git a/resources/machines/ultimaker2plus_040.json b/resources/machines/ultimaker2plus_040.json index c98bde63d3..29fc1a75f3 100644 --- a/resources/machines/ultimaker2plus_040.json +++ b/resources/machines/ultimaker2plus_040.json @@ -12,6 +12,7 @@ "variant": "0.4 mm", "overrides": { - "machine_nozzle_size": { "default": 0.40 } + "machine_nozzle_size": { "default": 0.40 }, + "machine_nozzle_tip_outer_diameter": { "default": 1.05 } } } diff --git a/resources/machines/ultimaker2plus_060.json b/resources/machines/ultimaker2plus_060.json index 243241cb4c..cfcc2ab4f2 100644 --- a/resources/machines/ultimaker2plus_060.json +++ b/resources/machines/ultimaker2plus_060.json @@ -13,6 +13,7 @@ "overrides": { "machine_nozzle_size": { "default": 0.60 }, + "machine_nozzle_tip_outer_diameter": { "default": 1.25 }, "coasting_volume": { "default": 1.36 } } } diff --git a/resources/machines/ultimaker2plus_080.json b/resources/machines/ultimaker2plus_080.json index be08f5c5a3..2f2cd2571c 100644 --- a/resources/machines/ultimaker2plus_080.json +++ b/resources/machines/ultimaker2plus_080.json @@ -13,6 +13,7 @@ "overrides": { "machine_nozzle_size": { "default": 0.80 }, + "machine_nozzle_tip_outer_diameter": { "default": 1.35 }, "coasting_volume": { "default": 3.22 } } } From 1f4763fca2ea56ae7805b069e015e9416f527cb5 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Thu, 24 Mar 2016 13:53:22 +0100 Subject: [PATCH 39/89] JSON: edit machine height based on longer olsson nozzle (CURA-1281) --- resources/machines/ultimaker2_extended_olsson.json | 2 +- resources/machines/ultimaker2_extended_plus.json | 2 +- resources/machines/ultimaker2_olsson.json | 3 ++- resources/machines/ultimaker2plus.json | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/resources/machines/ultimaker2_extended_olsson.json b/resources/machines/ultimaker2_extended_olsson.json index 50e95b7f67..84ab6a648c 100644 --- a/resources/machines/ultimaker2_extended_olsson.json +++ b/resources/machines/ultimaker2_extended_olsson.json @@ -13,7 +13,7 @@ "machine_settings": { "machine_width": { "default": 230 }, "machine_depth": { "default": 225 }, - "machine_height": { "default": 310 }, + "machine_height": { "default": 313 }, "machine_show_variants": { "default": true }, "gantry_height": { "default": 50 } } diff --git a/resources/machines/ultimaker2_extended_plus.json b/resources/machines/ultimaker2_extended_plus.json index 89efeddabe..99bfebc186 100644 --- a/resources/machines/ultimaker2_extended_plus.json +++ b/resources/machines/ultimaker2_extended_plus.json @@ -13,7 +13,7 @@ "machine_settings": { "machine_width": { "default": 230 }, "machine_depth": { "default": 225 }, - "machine_height": { "default": 310 }, + "machine_height": { "default": 313 }, "machine_show_variants": { "default": true }, "gantry_height": { "default": 50 } } diff --git a/resources/machines/ultimaker2_olsson.json b/resources/machines/ultimaker2_olsson.json index ec6acd1a18..350e5db687 100644 --- a/resources/machines/ultimaker2_olsson.json +++ b/resources/machines/ultimaker2_olsson.json @@ -11,6 +11,7 @@ "inherits": "ultimaker2.json", "overrides": { - "machine_show_variants": { "default": true } + "machine_show_variants": { "default": true }, + "machine_height": { "default": 203 } } } diff --git a/resources/machines/ultimaker2plus.json b/resources/machines/ultimaker2plus.json index fc1eafb4bb..1dbcad1a4d 100644 --- a/resources/machines/ultimaker2plus.json +++ b/resources/machines/ultimaker2plus.json @@ -13,7 +13,7 @@ "overrides": { "machine_width": { "default": 230 }, "machine_depth": { "default": 225 }, - "machine_height": { "default": 200 }, + "machine_height": { "default": 203 }, "machine_show_variants": { "default": true }, "gantry_height": { "default": 50 }, "machine_head_with_fans_polygon": From 7edb9ab3a0e355718d50087e8756682e2af67c7e Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Thu, 24 Mar 2016 13:54:17 +0100 Subject: [PATCH 40/89] JSON: introduce basic Olsson nozzle stats (CURA-1281) --- resources/machines/ultimaker2_extended_olsson.json | 4 +++- resources/machines/ultimaker2_extended_plus.json | 4 +++- resources/machines/ultimaker2_olsson.json | 2 ++ resources/machines/ultimaker2plus.json | 2 ++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/resources/machines/ultimaker2_extended_olsson.json b/resources/machines/ultimaker2_extended_olsson.json index 84ab6a648c..fc91e9d1e4 100644 --- a/resources/machines/ultimaker2_extended_olsson.json +++ b/resources/machines/ultimaker2_extended_olsson.json @@ -15,6 +15,8 @@ "machine_depth": { "default": 225 }, "machine_height": { "default": 313 }, "machine_show_variants": { "default": true }, - "gantry_height": { "default": 50 } + "gantry_height": { "default": 50 }, + "machine_nozzle_head_distance": { "default": 5 }, + "machine_nozzle_expansion_angle": { "default": 45 } } } diff --git a/resources/machines/ultimaker2_extended_plus.json b/resources/machines/ultimaker2_extended_plus.json index 99bfebc186..7733c47fa5 100644 --- a/resources/machines/ultimaker2_extended_plus.json +++ b/resources/machines/ultimaker2_extended_plus.json @@ -15,6 +15,8 @@ "machine_depth": { "default": 225 }, "machine_height": { "default": 313 }, "machine_show_variants": { "default": true }, - "gantry_height": { "default": 50 } + "gantry_height": { "default": 50 }, + "machine_nozzle_head_distance": { "default": 5 }, + "machine_nozzle_expansion_angle": { "default": 45 } } } diff --git a/resources/machines/ultimaker2_olsson.json b/resources/machines/ultimaker2_olsson.json index 350e5db687..3a872caa2f 100644 --- a/resources/machines/ultimaker2_olsson.json +++ b/resources/machines/ultimaker2_olsson.json @@ -12,6 +12,8 @@ "overrides": { "machine_show_variants": { "default": true }, + "machine_nozzle_head_distance": { "default": 5 }, + "machine_nozzle_expansion_angle": { "default": 45 }, "machine_height": { "default": 203 } } } diff --git a/resources/machines/ultimaker2plus.json b/resources/machines/ultimaker2plus.json index 1dbcad1a4d..0fa4147427 100644 --- a/resources/machines/ultimaker2plus.json +++ b/resources/machines/ultimaker2plus.json @@ -16,6 +16,8 @@ "machine_height": { "default": 203 }, "machine_show_variants": { "default": true }, "gantry_height": { "default": 50 }, + "machine_nozzle_head_distance": { "default": 5 }, + "machine_nozzle_expansion_angle": { "default": 45 }, "machine_head_with_fans_polygon": { "default": [ From 2cda0283c7114acf55138b4ce67a49e085bd05f3 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 24 Mar 2016 14:00:23 +0100 Subject: [PATCH 41/89] Increased width of sidebar a bit to improve readability for other languages CURA-1268 --- resources/themes/cura/theme.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/themes/cura/theme.json b/resources/themes/cura/theme.json index ca8390179c..729fbe404f 100644 --- a/resources/themes/cura/theme.json +++ b/resources/themes/cura/theme.json @@ -185,7 +185,7 @@ "default_arrow": [0.8, 0.8], "logo": [9.5, 2.0], - "sidebar": [30.0, 10.0], + "sidebar": [35.0, 10.0], "sidebar_header": [0.0, 4.0], "sidebar_header_mode_toggle": [0.0, 2.0], "sidebar_lining": [0.5, 0.5], From 78e844ef1852b0d9c001c778ded00ac250065b37 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Thu, 24 Mar 2016 14:08:58 +0100 Subject: [PATCH 42/89] JSON: made UM2E_olsson inherit from UM2_olsson (CURA-1281) --- resources/machines/ultimaker2_extended_olsson.json | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/resources/machines/ultimaker2_extended_olsson.json b/resources/machines/ultimaker2_extended_olsson.json index fc91e9d1e4..a118d08fd2 100644 --- a/resources/machines/ultimaker2_extended_olsson.json +++ b/resources/machines/ultimaker2_extended_olsson.json @@ -8,15 +8,13 @@ "platform_texture": "Ultimaker2backplate.png", "visible": false, "file_formats": "text/x-gcode", - "inherits": "ultimaker2.json", + "inherits": "ultimaker2_olsson.json", "machine_settings": { "machine_width": { "default": 230 }, "machine_depth": { "default": 225 }, "machine_height": { "default": 313 }, "machine_show_variants": { "default": true }, - "gantry_height": { "default": 50 }, - "machine_nozzle_head_distance": { "default": 5 }, - "machine_nozzle_expansion_angle": { "default": 45 } + "gantry_height": { "default": 50 } } } From 178943aa59ee12b3ccbb1c37aa86ace47b312124 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Thu, 24 Mar 2016 14:11:10 +0100 Subject: [PATCH 43/89] JSON: introduce machine_heat_zone_length for Olsson block based on guessing (CURA-1281) The heat zone length is only used in dual extrusion settings, which are unavailable for UM2+ and UM2 with olsson block --- resources/machines/ultimaker2_olsson.json | 3 ++- resources/machines/ultimaker2plus.json | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/resources/machines/ultimaker2_olsson.json b/resources/machines/ultimaker2_olsson.json index 3a872caa2f..83302bdcaf 100644 --- a/resources/machines/ultimaker2_olsson.json +++ b/resources/machines/ultimaker2_olsson.json @@ -14,6 +14,7 @@ "machine_show_variants": { "default": true }, "machine_nozzle_head_distance": { "default": 5 }, "machine_nozzle_expansion_angle": { "default": 45 }, - "machine_height": { "default": 203 } + "machine_height": { "default": 203 }, + "machine_heat_zone_length": { "default": 16 } } } diff --git a/resources/machines/ultimaker2plus.json b/resources/machines/ultimaker2plus.json index 0fa4147427..1ff47211be 100644 --- a/resources/machines/ultimaker2plus.json +++ b/resources/machines/ultimaker2plus.json @@ -18,6 +18,7 @@ "gantry_height": { "default": 50 }, "machine_nozzle_head_distance": { "default": 5 }, "machine_nozzle_expansion_angle": { "default": 45 }, + "machine_heat_zone_length": { "default": 16 }, "machine_head_with_fans_polygon": { "default": [ From 90e81de8cdff9bcdbfc8ee5882232f9a0abcdcdc Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Thu, 24 Mar 2016 14:19:53 +0100 Subject: [PATCH 44/89] JSON: fixed gantry heights of Olsson block machines to match difference with UM2 nozzle (CURA-1281) --- resources/machines/ultimaker2_extended_olsson.json | 3 +-- resources/machines/ultimaker2_extended_plus.json | 1 - resources/machines/ultimaker2_olsson.json | 3 ++- resources/machines/ultimaker2plus.json | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/resources/machines/ultimaker2_extended_olsson.json b/resources/machines/ultimaker2_extended_olsson.json index a118d08fd2..4398e4efb6 100644 --- a/resources/machines/ultimaker2_extended_olsson.json +++ b/resources/machines/ultimaker2_extended_olsson.json @@ -14,7 +14,6 @@ "machine_width": { "default": 230 }, "machine_depth": { "default": 225 }, "machine_height": { "default": 313 }, - "machine_show_variants": { "default": true }, - "gantry_height": { "default": 50 } + "machine_show_variants": { "default": true } } } diff --git a/resources/machines/ultimaker2_extended_plus.json b/resources/machines/ultimaker2_extended_plus.json index 7733c47fa5..e6813fcce3 100644 --- a/resources/machines/ultimaker2_extended_plus.json +++ b/resources/machines/ultimaker2_extended_plus.json @@ -15,7 +15,6 @@ "machine_depth": { "default": 225 }, "machine_height": { "default": 313 }, "machine_show_variants": { "default": true }, - "gantry_height": { "default": 50 }, "machine_nozzle_head_distance": { "default": 5 }, "machine_nozzle_expansion_angle": { "default": 45 } } diff --git a/resources/machines/ultimaker2_olsson.json b/resources/machines/ultimaker2_olsson.json index 83302bdcaf..106c1c5f78 100644 --- a/resources/machines/ultimaker2_olsson.json +++ b/resources/machines/ultimaker2_olsson.json @@ -15,6 +15,7 @@ "machine_nozzle_head_distance": { "default": 5 }, "machine_nozzle_expansion_angle": { "default": 45 }, "machine_height": { "default": 203 }, - "machine_heat_zone_length": { "default": 16 } + "machine_heat_zone_length": { "default": 16 }, + "gantry_height": { "default": 52 } } } diff --git a/resources/machines/ultimaker2plus.json b/resources/machines/ultimaker2plus.json index 1ff47211be..e9114b769f 100644 --- a/resources/machines/ultimaker2plus.json +++ b/resources/machines/ultimaker2plus.json @@ -15,7 +15,7 @@ "machine_depth": { "default": 225 }, "machine_height": { "default": 203 }, "machine_show_variants": { "default": true }, - "gantry_height": { "default": 50 }, + "gantry_height": { "default": 52 }, "machine_nozzle_head_distance": { "default": 5 }, "machine_nozzle_expansion_angle": { "default": 45 }, "machine_heat_zone_length": { "default": 16 }, From 11a65e249dcc51e7e6e22ab9851b612d6f00ad05 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Wed, 10 Feb 2016 17:22:57 +0100 Subject: [PATCH 45/89] JSON: changed description and name of cooling settings (CURA-863) --- resources/machines/fdmprinter.json | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index fc9fc98866..b74fe4f03c 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -1090,12 +1090,13 @@ "global_only": "True", "children": { "cool_fan_speed_min": { - "label": "Minimum Fan Speed", - "description": "Normally the fan runs at the minimum fan speed. If the layer is slowed down due to minimum layer time, the fan speed adjusts between minimum and maximum fan speed.", + "label": "Normal Fan Speed", + "description": "Normally the fan runs at the minimum fan speed. If a layer takes less than Shortest Layer Time Normal Fan Speed, the fan speed adjusts from Normal Fan Speed towards Maximum Fan Speed.", "unit": "%", "type": "float", "min_value": "0", - "max_value": "100", + "max_value": "min(100, cool_fan_speed_max)", + "inherit_function": "parent_value", "default": 100, "visible": false, "enabled": "cool_fan_enabled", @@ -1103,10 +1104,10 @@ }, "cool_fan_speed_max": { "label": "Maximum Fan Speed", - "description": "Normally the fan runs at the minimum fan speed. If the layer is slowed down due to minimum layer time, the fan speed adjusts between minimum and maximum fan speed.", + "description": "If a layer is slowed down due to minimum layer time, the fan speed will be the Maximum Fan Speed.", "unit": "%", "type": "float", - "min_value": "0", + "min_value": "max(0, cool_fan_speed_min)", "max_value": "100", "default": 100, "visible": false, @@ -1116,8 +1117,8 @@ } }, "cool_fan_full_at_height": { - "label": "Fan Full on at Height", - "description": "The height at which the fan is turned on completely. For the layers below this the fan speed is scaled linearly with the fan off for the first layer.", + "label": "Slow Fan Down Below Height", + "description": "The height at which the fan is set to Normal Fan Speed. For the layers below this the fan speed is scaled linearly with the fan off on the first layer.", "unit": "mm", "type": "float", "default": 0.5, @@ -1128,8 +1129,8 @@ "global_only": "True", "children": { "cool_fan_full_layer": { - "label": "Fan Full on at Layer", - "description": "The layer number at which the fan is turned on completely. For the layers below this the fan speed is scaled linearly with the fan off for the first layer.", + "label": "Slow Fan Down Below Layer", + "description": "The layer number at which the fan is set to Normal Fan Speed. For the layers below this the fan speed is scaled linearly with the fan off on the first layer.", "type": "int", "default": 1, "min_value": "0", @@ -1142,7 +1143,7 @@ }, "cool_min_layer_time": { "label": "Minimum Layer Time", - "description": "The minimum time spent in a layer: Gives the layer time to cool down before the next one is put on top. If a layer would print in less time, then the printer will slow down to make sure it has spent at least this many seconds printing the layer.", + "description": "The minimum time spent in a layer. Gives fast layers extra time to cool down before printing the next layer. If a layer would print in less time, then the printer will slow down to make sure it has spent at least this many seconds printing the layer.", "unit": "sec", "type": "float", "default": 5, @@ -1152,8 +1153,8 @@ "global_only": "True" }, "cool_min_layer_time_fan_speed_max": { - "label": "Minimum Layer Time Full Fan Speed", - "description": "The minimum time spent in a layer which will cause the fan to be at maximum speed. The fan speed increases linearly from minimum fan speed for layers taking the minimum layer time to maximum fan speed for layers taking the time specified here.", + "label": "Shortest Layer Time Normal Fan Speed", + "description": "The minimum time spent in a layer which will cause the fan to be at normal speed. All layers taking shorter than this time will get increased fan speeds, up to Maximum Fan Speed for layers taking Minmal Layer Time. All layers taking longer than this time will have Normal Fan Speed.", "unit": "sec", "type": "float", "default": 10, @@ -1164,7 +1165,7 @@ }, "cool_min_speed": { "label": "Minimum Speed", - "description": "The minimum layer time can cause the print to slow down so much it starts to droop. The minimum feedrate protects against this. Even if a print gets slowed down it will never be slower than this minimum speed.", + "description": "The minimum layer time can cause the print to slow down so much it starts to droop. The Minimum Speed protects against this. Even if a print gets slowed down it will never be slower than this minimum speed.", "unit": "mm/s", "type": "float", "default": 10, @@ -1175,7 +1176,7 @@ }, "cool_lift_head": { "label": "Lift Head", - "description": "Lift the head away from the print if the minimum speed is hit because of cool slowdown, and wait the extra time away from the print surface until the minimum layer time is used up.", + "description": "When the Minimum Speed is hit because of Minimum Layer Time, lift the head away from the print and wait the extra time until the minimum layer time is reached.", "type": "boolean", "default": false, "visible": false, From d3a6f63d1f55e274cc078cd7b5a792aae8a6d4e3 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 24 Mar 2016 16:41:25 +0100 Subject: [PATCH 46/89] 3MF no longer fails when there is no transformation matrix --- plugins/3MFReader/ThreeMFReader.py | 52 ++++++++++++++++-------------- 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/plugins/3MFReader/ThreeMFReader.py b/plugins/3MFReader/ThreeMFReader.py index 9721117068..abb4900554 100644 --- a/plugins/3MFReader/ThreeMFReader.py +++ b/plugins/3MFReader/ThreeMFReader.py @@ -80,33 +80,35 @@ class ThreeMFReader(MeshReader): transformation = root.findall("./3mf:build/3mf:item[@objectid='{0}']".format(object.get("id")), self._namespaces) if transformation: transformation = transformation[0] + try: + if transformation.get("transform"): + splitted_transformation = transformation.get("transform").split() + ## Transformation is saved as: + ## M00 M01 M02 0.0 + ## M10 M11 M12 0.0 + ## M20 M21 M22 0.0 + ## M30 M31 M32 1.0 + ## We switch the row & cols as that is how everyone else uses matrices! + temp_mat = Matrix() + # Rotation & Scale + temp_mat._data[0,0] = splitted_transformation[0] + temp_mat._data[1,0] = splitted_transformation[1] + temp_mat._data[2,0] = splitted_transformation[2] + temp_mat._data[0,1] = splitted_transformation[3] + temp_mat._data[1,1] = splitted_transformation[4] + temp_mat._data[2,1] = splitted_transformation[5] + temp_mat._data[0,2] = splitted_transformation[6] + temp_mat._data[1,2] = splitted_transformation[7] + temp_mat._data[2,2] = splitted_transformation[8] - if transformation.get("transform"): - splitted_transformation = transformation.get("transform").split() - ## Transformation is saved as: - ## M00 M01 M02 0.0 - ## M10 M11 M12 0.0 - ## M20 M21 M22 0.0 - ## M30 M31 M32 1.0 - ## We switch the row & cols as that is how everyone else uses matrices! - temp_mat = Matrix() - # Rotation & Scale - temp_mat._data[0,0] = splitted_transformation[0] - temp_mat._data[1,0] = splitted_transformation[1] - temp_mat._data[2,0] = splitted_transformation[2] - temp_mat._data[0,1] = splitted_transformation[3] - temp_mat._data[1,1] = splitted_transformation[4] - temp_mat._data[2,1] = splitted_transformation[5] - temp_mat._data[0,2] = splitted_transformation[6] - temp_mat._data[1,2] = splitted_transformation[7] - temp_mat._data[2,2] = splitted_transformation[8] + # Translation + temp_mat._data[0,3] = splitted_transformation[9] + temp_mat._data[1,3] = splitted_transformation[10] + temp_mat._data[2,3] = splitted_transformation[11] - # Translation - temp_mat._data[0,3] = splitted_transformation[9] - temp_mat._data[1,3] = splitted_transformation[10] - temp_mat._data[2,3] = splitted_transformation[11] - - node.setTransformation(temp_mat) + node.setTransformation(temp_mat) + except AttributeError: + pass # Empty list was found. Getting transformation is not possible result.addChild(node) From 355f5210c9c57dcd4675878e34056454ce898182 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Thu, 24 Mar 2016 17:29:46 +0100 Subject: [PATCH 47/89] JSON: travel_avoid_distance should default to nozzle_outer radius, not diameter (CURA-1195) --- resources/machines/fdmprinter.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index b74fe4f03c..f83b1e6807 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -1008,7 +1008,7 @@ "unit": "mm", "type": "float", "default": 1.5, - "inherit_function": "machine_nozzle_tip_outer_diameter * 1.25", + "inherit_function": "machine_nozzle_tip_outer_diameter / 2 * 1.25", "min_value": "0", "max_value_warning": "machine_nozzle_tip_outer_diameter * 5", "visible": false, From 6c2878221d18c23277e8421a488a8a8fb532b13b Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 25 Mar 2016 10:49:09 +0100 Subject: [PATCH 48/89] Removed color from convex hull node when it has profile / setting CURA-1251 --- cura/ConvexHullNode.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/cura/ConvexHullNode.py b/cura/ConvexHullNode.py index 7f0f87ade5..107dbebe5c 100644 --- a/cura/ConvexHullNode.py +++ b/cura/ConvexHullNode.py @@ -91,8 +91,4 @@ class ConvexHullNode(SceneNode): if not node: return - if node.hasDecoration("getProfile"): - self._color.setR(0.75) - - if node.hasDecoration("getSetting"): - self._color.setG(0.75) + \ No newline at end of file From 99de21fba77e8766ea74b4f18a2e15751912ebff Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 25 Mar 2016 10:59:11 +0100 Subject: [PATCH 49/89] Setting one at a time mode now decreases size of build volume CURA-1245 CURA-1224 --- cura/BuildVolume.py | 17 ++++++++++++++--- cura/ConvexHullNode.py | 4 +--- cura/PlatformPhysics.py | 5 ----- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/cura/BuildVolume.py b/cura/BuildVolume.py index 8750cbe03f..cc1411e52d 100644 --- a/cura/BuildVolume.py +++ b/cura/BuildVolume.py @@ -165,7 +165,10 @@ class BuildVolume(SceneNode): if self._active_instance: self._width = self._active_instance.getMachineSettingValue("machine_width") - self._height = self._active_instance.getMachineSettingValue("machine_height") + if Application.getInstance().getMachineManager().getWorkingProfile().getSettingValue("print_sequence") == "one_at_a_time": + self._height = Application.getInstance().getMachineManager().getWorkingProfile().getSettingValue("gantry_height") + else: + self._height = self._active_instance.getMachineSettingValue("machine_depth") self._depth = self._active_instance.getMachineSettingValue("machine_depth") self._updateDisallowedAreas() @@ -182,11 +185,19 @@ class BuildVolume(SceneNode): self._updateDisallowedAreas() self.rebuild() - def _onSettingValueChanged(self, setting): - if setting in self._skirt_settings: + def _onSettingValueChanged(self, setting_key): + if setting_key == "print_sequence": + if Application.getInstance().getMachineManager().getWorkingProfile().getSettingValue("print_sequence") == "one_at_a_time": + self._height = Application.getInstance().getMachineManager().getWorkingProfile().getSettingValue("gantry_height") + else: + self._height = self._active_instance.getMachineSettingValue("machine_depth") + self.rebuild() + if setting_key in self._skirt_settings: self._updateDisallowedAreas() self.rebuild() + + def _updateDisallowedAreas(self): if not self._active_instance or not self._active_profile: return diff --git a/cura/ConvexHullNode.py b/cura/ConvexHullNode.py index 107dbebe5c..dc02a97dc6 100644 --- a/cura/ConvexHullNode.py +++ b/cura/ConvexHullNode.py @@ -89,6 +89,4 @@ class ConvexHullNode(SceneNode): self._color = Color(35, 35, 35, 0.5) if not node: - return - - \ No newline at end of file + return \ No newline at end of file diff --git a/cura/PlatformPhysics.py b/cura/PlatformPhysics.py index 95951f78dd..5299f4c5d0 100644 --- a/cura/PlatformPhysics.py +++ b/cura/PlatformPhysics.py @@ -65,11 +65,6 @@ class PlatformPhysics: # Mark the node as outside the build volume if the bounding box test fails. if build_volume_bounding_box.intersectsBox(bbox) != AxisAlignedBox.IntersectionResult.FullIntersection: node._outside_buildarea = True - else: - # When printing one at a time too high objects are not printable. - if Application.getInstance().getMachineManager().getWorkingProfile().getSettingValue("print_sequence") == "one_at_a_time": - if node.getBoundingBox().height > Application.getInstance().getMachineManager().getWorkingProfile().getSettingValue("gantry_height"): - node._outside_buildarea = True # Move it downwards if bottom is above platform move_vector = Vector() From 918d8005bce017013e2074d4a7a8e840d44f9677 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 25 Mar 2016 13:59:43 +0100 Subject: [PATCH 50/89] Removing unneeded overwritten settings --- resources/profiles/ultimaker2+/abs_0.25_normal.curaprofile | 1 - resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile | 1 - resources/profiles/ultimaker2+/abs_0.4_high.curaprofile | 1 - resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile | 1 - resources/profiles/ultimaker2+/abs_0.8_normal.curaprofile | 1 - resources/profiles/ultimaker2+/cpe_0.25_normal.curaprofile | 1 - resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile | 2 -- resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile | 1 - resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile | 2 -- resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile | 1 - resources/profiles/ultimaker2+/cpe_0.8_normal.curaprofile | 2 -- resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile | 1 - resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile | 1 - resources/profiles/ultimaker2+/pla_0.4_high.curaprofile | 1 - resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile | 2 -- resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile | 1 - resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile | 2 -- resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile | 1 - 18 files changed, 23 deletions(-) diff --git a/resources/profiles/ultimaker2+/abs_0.25_normal.curaprofile b/resources/profiles/ultimaker2+/abs_0.25_normal.curaprofile index a313dea610..15632a183b 100644 --- a/resources/profiles/ultimaker2+/abs_0.25_normal.curaprofile +++ b/resources/profiles/ultimaker2+/abs_0.25_normal.curaprofile @@ -17,7 +17,6 @@ layer_height_0 = 0.15 speed_layer_0 = 20 speed_infill = 30 speed_topbottom = 20 -speed_wall_0 = 20 speed_wall_x = 25 cool_min_layer_time = 2 cool_min_speed = 10 diff --git a/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile b/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile index effb1ce35a..03c5cad45f 100644 --- a/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile +++ b/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile @@ -19,7 +19,6 @@ speed_travel = 150 speed_infill = 55 speed_topbottom = 30 speed_wall_0 = 30 -speed_wall_x = 40 cool_min_layer_time = 3 cool_min_speed = 20 cool_lift_head = True diff --git a/resources/profiles/ultimaker2+/abs_0.4_high.curaprofile b/resources/profiles/ultimaker2+/abs_0.4_high.curaprofile index c4e256e088..30867e8605 100644 --- a/resources/profiles/ultimaker2+/abs_0.4_high.curaprofile +++ b/resources/profiles/ultimaker2+/abs_0.4_high.curaprofile @@ -18,7 +18,6 @@ speed_layer_0 = 20 speed_infill = 45 speed_topbottom = 20 speed_wall_0 = 20 -speed_wall_x = 30 cool_min_layer_time = 3 cool_min_speed = 10 cool_fan_speed_min = 20 diff --git a/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile b/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile index d409d8ac5c..a073713649 100644 --- a/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile +++ b/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile @@ -18,7 +18,6 @@ speed_layer_0 = 20 speed_infill = 45 speed_topbottom = 20 speed_wall_0 = 20 -speed_wall_x = 30 cool_min_layer_time = 3 cool_fan_speed_min = 50 cool_min_speed = 10 diff --git a/resources/profiles/ultimaker2+/abs_0.8_normal.curaprofile b/resources/profiles/ultimaker2+/abs_0.8_normal.curaprofile index 60eee772b1..7851f82cee 100644 --- a/resources/profiles/ultimaker2+/abs_0.8_normal.curaprofile +++ b/resources/profiles/ultimaker2+/abs_0.8_normal.curaprofile @@ -17,7 +17,6 @@ layer_height_0 = 0.5 speed_layer_0 = 20 speed_infill = 40 speed_topbottom = 20 -speed_wall_0 = 20 speed_wall_x = 30 cool_min_layer_time = 3 cool_fan_speed_min = 50 diff --git a/resources/profiles/ultimaker2+/cpe_0.25_normal.curaprofile b/resources/profiles/ultimaker2+/cpe_0.25_normal.curaprofile index fba8e96cd7..7003b825b5 100644 --- a/resources/profiles/ultimaker2+/cpe_0.25_normal.curaprofile +++ b/resources/profiles/ultimaker2+/cpe_0.25_normal.curaprofile @@ -17,7 +17,6 @@ layer_height_0 = 0.15 speed_layer_0 = 20 speed_infill = 30 speed_topbottom = 20 -speed_wall_0 = 20 speed_wall_x = 25 cool_min_layer_time = 2 cool_min_speed = 10 diff --git a/resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile b/resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile index 649a43827d..41da312634 100644 --- a/resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile +++ b/resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile @@ -17,9 +17,7 @@ layer_height_0 = 0.26 speed_travel = 150 speed_layer_0 = 30 speed_infill = 45 -speed_topbottom = 20 speed_wall_0 = 30 -speed_wall_x = 40 cool_min_layer_time = 3 cool_fan_speed_min = 50 cool_min_speed = 10 diff --git a/resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile b/resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile index 81a1956ce1..bfa93ff46c 100644 --- a/resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile +++ b/resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile @@ -17,7 +17,6 @@ layer_height_0 = 0.26 speed_layer_0 = 20 speed_infill = 45 speed_topbottom = 20 -speed_wall_0 = 20 speed_wall_x = 30 cool_min_layer_time = 3 cool_fan_speed_min = 50 diff --git a/resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile b/resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile index dac242098d..b725a17713 100644 --- a/resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile +++ b/resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile @@ -7,11 +7,9 @@ material = CPE weight = -2 [settings] -layer_height = 0.1 wall_thickness = 1.05 line_width = 0.35 top_bottom_thickness = 0.8 -infill_sparse_density = 20 speed_print = 30 layer_height_0 = 0.26 speed_layer_0 = 20 diff --git a/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile b/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile index bbeffc9659..e45bf7ef3f 100644 --- a/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile +++ b/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile @@ -11,7 +11,6 @@ layer_height = 0.15 wall_thickness = 1.59 line_width = 0.53 top_bottom_thickness = 1.2 -infill_sparse_density = 20 speed_print = 25 layer_height_0 = 0.4 speed_layer_0 = 20 diff --git a/resources/profiles/ultimaker2+/cpe_0.8_normal.curaprofile b/resources/profiles/ultimaker2+/cpe_0.8_normal.curaprofile index b73869646d..19cbc9a18e 100644 --- a/resources/profiles/ultimaker2+/cpe_0.8_normal.curaprofile +++ b/resources/profiles/ultimaker2+/cpe_0.8_normal.curaprofile @@ -11,13 +11,11 @@ layer_height = 0.2 wall_thickness = 2.1 line_width = 0.7 top_bottom_thickness = 1.2 -infill_sparse_density = 20 speed_print = 20 layer_height_0 = 0.5 speed_layer_0 = 20 speed_infill = 40 speed_topbottom = 20 -speed_wall_0 = 20 speed_wall_x = 30 cool_min_layer_time = 3 cool_min_speed = 10 diff --git a/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile index e127b04c41..8eacab211f 100644 --- a/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile @@ -16,7 +16,6 @@ infill_sparse_density = 22 retraction_amount = 6 speed_print = 20 speed_infill = 30 -speed_wall_0 = 20 speed_wall_x = 25 speed_topbottom = 20 speed_layer_0 = 25 diff --git a/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile index b22032b7ed..f2051858cb 100644 --- a/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile @@ -16,7 +16,6 @@ infill_sparse_density = 18 retraction_amount = 5.5 speed_print = 40 speed_infill = 60 -speed_wall_0 = 40 speed_wall_x = 50 speed_travel = 150 speed_topbottom = 30 diff --git a/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile index e0b85b137c..3889ff5da0 100644 --- a/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile @@ -16,7 +16,6 @@ infill_sparse_density = 22 retraction_amount = 5.5 speed_print = 30 speed_infill = 50 -speed_wall_0 = 30 speed_wall_x = 40 speed_topbottom = 20 speed_layer_0 = 25 diff --git a/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile index 3e2c39ed82..174cc9d947 100644 --- a/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile @@ -8,7 +8,6 @@ weight = -2 [settings] line_width = 0.35 -layer_height = 0.1 layer_height_0 = 0.26 shell_thickness = 1.05 top_bottom_thickness = 0.8 @@ -16,7 +15,6 @@ infill_sparse_density = 20 retraction_amount = 5.5 speed_print = 30 speed_infill = 50 -speed_wall_0 = 30 speed_wall_x = 40 speed_topbottom = 20 speed_layer_0 = 25 diff --git a/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile index b825f62e47..72388e94b6 100644 --- a/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile @@ -17,7 +17,6 @@ retraction_amount = 5.5 retraction_extrusion_window = 6 speed_print = 30 speed_infill = 50 -speed_wall_0 = 30 speed_wall_x = 40 speed_topbottom = 20 speed_layer_0 = 25 diff --git a/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile index 256fa3070e..4e86a6aab2 100644 --- a/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile @@ -12,11 +12,9 @@ layer_height = 0.15 layer_height_0 = 0.4 shell_thickness = 1.59 top_bottom_thickness = 1.2 -infill_sparse_density = 20 retraction_amount = 6 speed_print = 25 speed_infill = 55 -speed_wall_0 = 25 speed_wall_x = 40 speed_topbottom = 20 speed_layer_0 = 25 diff --git a/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile index be9d2a512d..6a34ecb59c 100644 --- a/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile @@ -16,7 +16,6 @@ infill_sparse_density = 20 retraction_amount = 6 speed_print = 20 speed_infill = 40 -speed_wall_0 = 20 speed_wall_x = 30 speed_topbottom = 20 speed_layer_0 = 25 From 637f793f48d2f53e7ee6f1b71068a247dce734bb Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 25 Mar 2016 14:03:49 +0100 Subject: [PATCH 51/89] Simplified some of the inheritance functions --- resources/machines/fdmprinter.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index f83b1e6807..78a98394ae 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -857,7 +857,7 @@ "max_value_warning": "150", "default": 30, "visible": false, - "inherit_function": "parent_value / 60 * 30", + "inherit_function": "parent_value / 2", "children": { "speed_wall_0": { "label": "Outer Wall Speed", @@ -878,7 +878,7 @@ "max_value_warning": "150", "default": 60, "visible": false, - "inherit_function": "speed_print" + "inherit_function": "parent_value * 2" } } }, @@ -891,7 +891,7 @@ "max_value_warning": "150", "default": 30, "visible": false, - "inherit_function": "parent_value / 60 * 30" + "inherit_function": "parent_value / 2" }, "speed_support": { "label": "Support Speed", @@ -928,7 +928,7 @@ "max_value_warning": "150", "visible": false, "enabled": "support_roof_enable", - "inherit_function": "parent_value / 60 * 40", + "inherit_function": "parent_value / 1.5", "global_only": true } } From 89162e328624accf44339fae9722f0fd08d9c4cb Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 25 Mar 2016 14:08:50 +0100 Subject: [PATCH 52/89] Fixed crash caused by circular dependency --- resources/machines/fdmprinter.json | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index 78a98394ae..b413492a44 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -1095,7 +1095,6 @@ "unit": "%", "type": "float", "min_value": "0", - "max_value": "min(100, cool_fan_speed_max)", "inherit_function": "parent_value", "default": 100, "visible": false, From 51b9ac78bdd51c9532a38fac064ffdbb68addaa0 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 25 Mar 2016 15:18:18 +0100 Subject: [PATCH 53/89] Added speed of light as max value for speed CURA-1252 --- resources/machines/fdmprinter.json | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index b413492a44..f84a899d37 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -836,6 +836,7 @@ "type": "float", "min_value": "0.1", "max_value_warning": "150", + "max_value": "299792458000", "default": 60, "children": { "speed_infill": { From 7e339ce512e42b4036016e38564bd6f20b772fe2 Mon Sep 17 00:00:00 2001 From: Thomas-Karl Pietrowski Date: Tue, 29 Mar 2016 10:16:50 +0200 Subject: [PATCH 54/89] CMake: Remove all slashes from language codes Related to: https://github.com/Ultimaker/Uranium/pull/119/commits/6833363b531c265ef17f78055c9ed8d6e546e914 --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index bb6a72bd1d..dc9f37c76e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,6 +17,7 @@ MACRO(SUBDIRLIST result curdir) SET(dirlist "") FOREACH(child ${children}) IF(IS_DIRECTORY ${curdir}/${child}) + STRING(REPLACE "/" "" child ${child}) LIST(APPEND dirlist ${child}) ENDIF() ENDFOREACH() From 3a3c7fbbc87ff728d408f7de69ea7f2a1a3dd8bd Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Tue, 29 Mar 2016 10:31:33 +0200 Subject: [PATCH 55/89] JSON: updated Olsson block heat zone length (CURA-1281) --- resources/machines/ultimaker2_olsson.json | 2 +- resources/machines/ultimaker2plus.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/machines/ultimaker2_olsson.json b/resources/machines/ultimaker2_olsson.json index 106c1c5f78..eac32e88a2 100644 --- a/resources/machines/ultimaker2_olsson.json +++ b/resources/machines/ultimaker2_olsson.json @@ -15,7 +15,7 @@ "machine_nozzle_head_distance": { "default": 5 }, "machine_nozzle_expansion_angle": { "default": 45 }, "machine_height": { "default": 203 }, - "machine_heat_zone_length": { "default": 16 }, + "machine_heat_zone_length": { "default": 20 }, "gantry_height": { "default": 52 } } } diff --git a/resources/machines/ultimaker2plus.json b/resources/machines/ultimaker2plus.json index e9114b769f..56635f915f 100644 --- a/resources/machines/ultimaker2plus.json +++ b/resources/machines/ultimaker2plus.json @@ -18,7 +18,7 @@ "gantry_height": { "default": 52 }, "machine_nozzle_head_distance": { "default": 5 }, "machine_nozzle_expansion_angle": { "default": 45 }, - "machine_heat_zone_length": { "default": 16 }, + "machine_heat_zone_length": { "default": 20 }, "machine_head_with_fans_polygon": { "default": [ From 981e3f38511a1ff143e835be4c351533c1946af8 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Tue, 29 Mar 2016 10:42:13 +0200 Subject: [PATCH 56/89] JSON: fix: max_value for call_fan_speed_min (CURA-863) --- resources/machines/fdmprinter.json | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index f84a899d37..fe485fb8ea 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -1096,6 +1096,7 @@ "unit": "%", "type": "float", "min_value": "0", + "max_value": "100", "inherit_function": "parent_value", "default": 100, "visible": false, From ced748495375ce3082b56217ee79c5967ec7bf66 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 29 Mar 2016 15:43:45 +0200 Subject: [PATCH 57/89] Misclicking tool panel no longer hides it --- resources/qml/Toolbar.qml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/resources/qml/Toolbar.qml b/resources/qml/Toolbar.qml index 631445d987..feca007514 100644 --- a/resources/qml/Toolbar.qml +++ b/resources/qml/Toolbar.qml @@ -87,7 +87,11 @@ Item { anchors.margins: UM.Theme.getSize("default_lining").width target: Qt.point(-UM.Theme.getSize("default_margin").width, UM.Theme.getSize("button").height/2) - arrowSize: parent.arrowSize + arrowSize: parent.arrowSize + MouseArea //Catch all mouse events (so scene doesnt handle them) + { + anchors.fill: parent + } } Loader { From 82d3c19fe1df9cb682d8770ba7984aba1fcce6d9 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Tue, 29 Mar 2016 16:58:44 +0200 Subject: [PATCH 58/89] JSON: fix min_value for magic_fuzzy_skin_point_density (CURA-1225) value is based on firmware flood limit based on baudrate --- resources/machines/fdmprinter.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index fe485fb8ea..7db1583a96 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -1971,7 +1971,7 @@ "type": "float", "unit": "1/mm", "default": 1.25, - "min_value": "0", + "min_value": "0.008", "min_value_warning": "0.1", "max_value_warning": "10", "max_value": "2 / magic_fuzzy_skin_thickness", From ffe1b4bc1e7178ff581e58d6c497cfb42590c8dd Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Wed, 30 Mar 2016 18:26:36 +0200 Subject: [PATCH 59/89] JSON: updated settings descriptions (CURA-1309) Changes made by Jeroen to settings which didn't change order --- resources/machines/fdmprinter.json | 170 ++++++++++++++--------------- 1 file changed, 85 insertions(+), 85 deletions(-) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index 7db1583a96..4ab6a26ea4 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -186,7 +186,7 @@ "settings": { "machine_nozzle_size": { "label": "Nozzle Diameter", - "description": "The inner diameter of the nozzle.", + "description": "The inner diameter of the nozzle. Change this setting when using a non-standard nozzle size.", "unit": "mm", "type": "float", "default": 0.4, @@ -204,7 +204,7 @@ "settings": { "layer_height": { "label": "Layer Height", - "description": "The height of each layer, in mm. Normal quality prints are 0.1mm, high quality is 0.06mm. You can go up to 0.25mm with an Ultimaker for very fast prints at low quality. For most purposes, layer heights between 0.1 and 0.2mm give a good tradeoff of speed and surface finish.", + "description": "The height of each layer in mm. Higher values produce faster prints in lower resolution, lower values produce slower prints in higher resolution.", "unit": "mm", "type": "float", "default": 0.1, @@ -215,7 +215,7 @@ }, "layer_height_0": { "label": "Initial Layer Height", - "description": "The layer height of the bottom layer. A thicker bottom layer makes sticking to the bed easier.", + "description": "The height of the initial layer in mm. A thicker initial layer makes adhesion to the build plate easier.", "unit": "mm", "type": "float", "default": 0.3, @@ -227,7 +227,7 @@ }, "line_width": { "label": "Line Width", - "description": "Width of a single line. Each line will be printed with this width in mind. Generally the width of each line should correspond to the width of your nozzle, but for the outer wall and top/bottom surface smaller line widths may be chosen, for higher quality.", + "description": "Width of a single line. Generally, the width of each line should correspond to the width of the nozzle. Slightly reducing this value could produce better prints.", "unit": "mm", "min_value": "0.0001", "min_value_warning": "0.2", @@ -239,7 +239,7 @@ "children": { "wall_line_width": { "label": "Wall Line Width", - "description": "Width of a single shell line. Each line of the shell will be printed with this width in mind.", + "description": "Width of a single wall line.", "unit": "mm", "min_value": "0.0001", "min_value_warning": "0.2", @@ -250,7 +250,7 @@ "children": { "wall_line_width_0": { "label": "Outer Wall Line Width", - "description": "Width of the outermost shell line. By printing a thinner outermost wall line you can print higher details with a larger nozzle.", + "description": "Width of the outermost wall line. By lowering this value, higher levels of detail can be printed.", "unit": "mm", "min_value": "0.0001", "min_value_warning": "0.2", @@ -261,7 +261,7 @@ }, "wall_line_width_x": { "label": "Inner Wall(s) Line Width", - "description": "Width of a single shell line for all shell lines except the outermost one.", + "description": "Width of a single wall line for all wall lines except the outermost one.", "unit": "mm", "min_value": "0.0001", "min_value_warning": "0.2", @@ -308,7 +308,7 @@ }, "support_line_width": { "label": "Support line width", - "description": "Width of the printed support structures lines.", + "description": "Width of a single support structure line.", "unit": "mm", "min_value": "0.0001", "min_value_warning": "0.2", @@ -321,7 +321,7 @@ }, "support_roof_line_width": { "label": "Support Roof line width", - "description": "Width of a single support roof line, used to fill the top of the support.", + "description": "Width of a single support roof line.", "unit": "mm", "default": 0.4, "min_value": "0.0001", @@ -354,7 +354,7 @@ "children": { "wall_thickness": { "label": "Wall Thickness", - "description": "The thickness of the outside walls in the horizontal direction. This is used in combination with the nozzle size to define the number of perimeter lines and the thickness of those perimeter lines.", + "description": "The thickness of the outside walls in the horizontal direction. This value divided by the wall line width defines the number of walls.", "unit": "mm", "default": 0.8, "min_value": "0", @@ -365,7 +365,7 @@ "children": { "wall_line_count": { "label": "Wall Line Count", - "description": "Number of shell lines. These lines are called perimeter lines in other tools and impact the strength and structural integrity of your print.", + "description": "The number of walls. When calculated by the wall thickness, this value is rounded to a whole number.", "default": 2, "min_value": "0", "type": "int", @@ -375,8 +375,8 @@ } }, "top_bottom_thickness": { - "label": "Bottom/Top Thickness", - "description": "This controls the thickness of the bottom and top layers. The number of solid layers put down is calculated from the layer thickness and this value. Having this value a multiple of the layer thickness makes sense. Keep it near your wall thickness to make an evenly strong part.", + "label": "Top/Bottom Thickness", + "description": " The thickness of the top/bottom layers in the print. This value divided by the layer height defines the number of top/bottom layers.", "unit": "mm", "default": 0.8, "min_value": "0", @@ -387,7 +387,7 @@ "children": { "top_thickness": { "label": "Top Thickness", - "description": "This controls the thickness of the top layers. The number of solid layers printed is calculated from the layer thickness and this value. Having this value be a multiple of the layer thickness makes sense. Keep it near your wall thickness to make an evenly strong part.", + "description": "The thickness of the top layers in the print. This value divided by the layer height defines the number of top layers.", "unit": "mm", "default": 0.8, "min_value": "0", @@ -397,7 +397,7 @@ "children": { "top_layers": { "label": "Top Layers", - "description": "This controls the number of top layers.", + "description": "The number of top layers. When calculated by the top thickness, this value is rounded to a whole number.", "default": 8, "min_value": "0", "max_value_warning": "100", @@ -409,7 +409,7 @@ }, "bottom_thickness": { "label": "Bottom Thickness", - "description": "This controls the thickness of the bottom layers. The number of solid layers printed is calculated from the layer thickness and this value. Having this value be a multiple of the layer thickness makes sense. And keep it near to your wall thickness to make an evenly strong part.", + "description": "The thickness of the bottom layers in the print. This value divided by the layer height defines the number of bottom layers.", "unit": "mm", "default": 0.6, "min_value": "0", @@ -418,7 +418,7 @@ "children": { "bottom_layers": { "label": "Bottom Layers", - "description": "This controls the amount of bottom layers.", + "description": "The number of bottom layers. When calculated by the bottom thickness, this value is rounded to a whole number.", "min_value": "0", "default": 6, "type": "int", @@ -433,8 +433,8 @@ }, "alternate_extra_perimeter": { - "label": "Alternate Extra Wall", - "description": "Make an extra wall at every second layer, so that infill will be caught between an extra wall above and one below. This results in a better cohesion between infill and walls, but might have an impact on the surface quality.", + "label": "Alternating Extra Wall", + "description": "Prints an extra wall at every other layer. This way infill gets caught between these extra walls, resulting in stronger prints.", "type": "boolean", "default": false, "visible": false, @@ -459,7 +459,7 @@ }, "remove_overlapping_walls_x_enabled": { "label": "Remove Overlapping Inner Wall Parts", - "description": "Remove parts of an inner wall which share an overlap which would result in overextrusion in some places. These overlaps occur in thin pieces in a model and sharp corners.", + "description": "Remove parts of an inner wall that would otherwise overlap and cause over-extrusion. These overlaps occur in thin pieces in a model and sharp corners.", "type": "boolean", "default": true, "visible": false, @@ -476,7 +476,7 @@ }, "fill_perimeter_gaps": { "label": "Fill Gaps Between Walls", - "description": "Fill the gaps created by walls where they would otherwise be overlapping. This will also fill thin walls. Optionally only the gaps occurring within the top and bottom skin can be filled.", + "description": "Fills the gaps between walls when overlapping inner wall parts are removed.", "type": "enum", "options": { "nowhere": "Nowhere", @@ -553,7 +553,7 @@ "settings": { "infill_sparse_density": { "label": "Infill Density", - "description": "This controls how densely filled the insides of your print will be. For a solid part use 100%, for a hollow part use 0%. A value around 20% is usually enough. This setting won't affect the outside of the print and only adjusts how strong the part becomes.", + "description": "Adjusts the density of infill of the print.", "unit": "%", "type": "float", "default": 20, @@ -561,8 +561,8 @@ "max_value_warning": "100", "children": { "infill_line_distance": { - "label": "Line distance", - "description": "Distance between the printed infill lines.", + "label": "Line Distance", + "description": "Distance between the printed infill lines. This setting is calculated by the infill density and the infill line width.", "unit": "mm", "type": "float", "default": 2, @@ -574,7 +574,7 @@ }, "infill_pattern": { "label": "Infill Pattern", - "description": "Cura defaults to switching between grid and line infill, but with this setting visible you can control this yourself. The line infill swaps direction on alternate layers of infill, while the grid prints the full cross-hatching on each layer of infill.", + "description": "The pattern of the infill material of the print. The line and zig zag infill swap direction on alternate layers, reducing material cost. The grid, triangle and concentric patterns are fully printed every layer.", "type": "enum", "visible": false, "options": { @@ -609,8 +609,8 @@ "visible": false }, "infill_sparse_thickness": { - "label": "Infill Thickness", - "description": "The thickness of the sparse infill. This is rounded to a multiple of the layerheight and used to print the sparse-infill in fewer, thicker layers to save printing time.", + "label": "Infill layer thickness", + "description": "The thickness per layer of infill material. This value should always be a multiplication of the layer height and is otherwise rounded.", "unit": "mm", "type": "float", "default": 0.1, @@ -644,7 +644,7 @@ }, "material_print_temperature": { "label": "Printing Temperature", - "description": "The temperature used for printing. Set at 0 to pre-heat yourself. For PLA a value of 210C is usually used.\nFor ABS a value of 230C or higher is required.", + "description": "The temperature used for printing. Set at 0 to pre-heat the printer manually.", "unit": "°C", "type": "float", "default": 210, @@ -677,7 +677,7 @@ }, "material_bed_temperature": { "label": "Bed Temperature", - "description": "The temperature used for the heated printer bed. Set at 0 to pre-heat it yourself.", + "description": "The temperature used for the heated bed. Set at 0 to pre-heat the printer manually.", "unit": "°C", "type": "float", "default": 60, @@ -688,7 +688,7 @@ }, "material_diameter": { "label": "Diameter", - "description": "The diameter of your filament needs to be measured as accurately as possible.\nIf you cannot measure this value you will have to calibrate it; a higher number means less extrusion, a smaller number generates more extrusion.", + "description": "Adjusts the diameter of the filament used. Match this value with the diameter of the used filament.", "unit": "mm", "type": "float", "default": 2.85, @@ -709,14 +709,14 @@ }, "retraction_enable": { "label": "Enable Retraction", - "description": "Retract the filament when the nozzle is moving over a non-printed area. Details about the retraction can be configured in the advanced tab.", + "description": "Retract the filament when the nozzle is moving over a non-printed area. ", "type": "boolean", "default": true, "visible": true }, "retraction_amount": { "label": "Retraction Distance", - "description": "The amount of retraction: Set at 0 for no retraction at all. A value of 4.5mm seems to generate good results for 3mm filament in bowden tube fed printers.", + "description": "The length of material retracted during a retraction move.", "unit": "mm", "type": "float", "default": 4.5, @@ -728,7 +728,7 @@ }, "retraction_speed": { "label": "Retraction Speed", - "description": "The speed at which the filament is retracted. A higher retraction speed works better, but a very high retraction speed can lead to filament grinding.", + "description": "The speed at which the filament is retracted and primed during a retraction move.", "unit": "mm/s", "type": "float", "default": 25, @@ -740,7 +740,7 @@ "children": { "retraction_retract_speed": { "label": "Retraction Retract Speed", - "description": "The speed at which the filament is retracted. A higher retraction speed works better, but a very high retraction speed can lead to filament grinding.", + "description": "The speed at which the filament is retracted during a retraction move.", "unit": "mm/s", "type": "float", "default": 25, @@ -751,7 +751,7 @@ }, "retraction_prime_speed": { "label": "Retraction Prime Speed", - "description": "The speed at which the filament is pushed back after retraction.", + "description": "The speed at which the filament is primed during a retraction move.", "unit": "mm/s", "type": "float", "default": 25, @@ -764,7 +764,7 @@ }, "retraction_extra_prime_amount": { "label": "Retraction Extra Prime Amount", - "description": "The amount of material extruded after a retraction. During a travel move, some material might get lost and so we need to compensate for this.", + "description": "Some material can ooze away during a travel move, which can be compensated here.", "unit": "mm³", "type": "float", "default": 0, @@ -789,7 +789,7 @@ }, "retraction_count_max": { "label": "Maximum Retraction Count", - "description": "This setting limits the number of retractions occurring within the Minimum Extrusion Distance Window. Further retractions within this window will be ignored. This avoids retracting repeatedly on the same piece of filament, as that can flatten the filament and cause grinding issues.", + "description": "This setting limits the number of retractions occurring within the minimum extrusion distance window. Further retractions within this window will be ignored. This avoids retracting repeatedly on the same piece of filament, as that can flatten the filament and cause grinding issues.", "default": 45, "min_value": "0", "max_value_warning": "100", @@ -800,7 +800,7 @@ }, "retraction_extrusion_window": { "label": "Minimum Extrusion Distance Window", - "description": "The window in which the Maximum Retraction Count is enforced. This value should be approximately the same as the Retraction distance, so that effectively the number of times a retraction passes the same patch of material is limited.", + "description": "The window in which the maximum retraction count is enforced. This value should be approximately the same as the retraction distance, so that effectively the number of times a retraction passes the same patch of material is limited.", "unit": "mm", "type": "float", "default": 4.5, @@ -812,7 +812,7 @@ }, "retraction_hop": { "label": "Z Hop when Retracting", - "description": "Whenever a retraction is done, the head is lifted by this amount to travel over the print. A value of 0.075 works well. This feature has a large positive effect on delta towers.", + "description": "Whenever a retraction is done, the build plate is lowered to create clearance between the nozzle and the print. It prevents the nozzle from hitting the print during travel moves, reducing the chance to knock the print from the build plate.", "unit": "mm", "type": "float", "default": 0, @@ -831,7 +831,7 @@ "settings": { "speed_print": { "label": "Print Speed", - "description": "The speed at which printing happens. A well-adjusted Ultimaker can reach 150mm/s, but for good quality prints you will want to print slower. Printing speed depends on a lot of factors, so you will need to experiment with optimal settings for this.", + "description": "The speed at which printing happens.", "unit": "mm/s", "type": "float", "min_value": "0.1", @@ -841,7 +841,7 @@ "children": { "speed_infill": { "label": "Infill Speed", - "description": "The speed at which infill parts are printed. Printing the infill faster can greatly reduce printing time, but this can negatively affect print quality.", + "description": "The speed at which infill is printed.", "unit": "mm/s", "type": "float", "min_value": "0.1", @@ -851,7 +851,7 @@ }, "speed_wall": { "label": "Wall Speed", - "description": "The speed at which the shell is printed. Printing the outer shell at a lower speed improves the final skin quality.", + "description": "The speed at which the walls are printed.", "unit": "mm/s", "type": "float", "min_value": "0.1", @@ -862,7 +862,7 @@ "children": { "speed_wall_0": { "label": "Outer Wall Speed", - "description": "The speed at which the outer shell is printed. Printing the outer shell at a lower speed improves the final skin quality. However, having a large difference between the inner shell speed and the outer shell speed will effect quality in a negative way.", + "description": "The speed at which the outermost walls are printed. Printing the outer wall at a lower speed improves the final skin quality. However, having a large difference between the inner wall speed and the outer shell speed will effect quality in a negative way.", "unit": "mm/s", "type": "float", "min_value": "0.1", @@ -872,7 +872,7 @@ }, "speed_wall_x": { "label": "Inner Wall Speed", - "description": "The speed at which all inner shells are printed. Printing the inner shell faster than the outer shell will reduce printing time. It works well to set this in between the outer shell speed and the infill speed.", + "description": "The speed at which all inner walls are printed Printing the inner wall faster than the outer wall will reduce printing time. It works well to set this in between the outer wall speed and the infill speed.", "unit": "mm/s", "type": "float", "min_value": "0.1", @@ -885,7 +885,7 @@ }, "speed_topbottom": { "label": "Top/Bottom Speed", - "description": "Speed at which top/bottom parts are printed. Printing the top/bottom faster can greatly reduce printing time, but this can negatively affect print quality.", + "description": "The speed at which top/bottom layers are printed.", "unit": "mm/s", "type": "float", "min_value": "0.1", @@ -896,7 +896,7 @@ }, "speed_support": { "label": "Support Speed", - "description": "The speed at which exterior support is printed. Printing exterior supports at higher speeds can greatly improve printing time. The surface quality of exterior support is usually not important anyway, so higher speeds can be used.", + "description": "The speed at which the support structure is printed. Printing support at higher speeds can greatly improve printing time. The surface quality of the support structure is not important since it is removed after printing.", "unit": "mm/s", "type": "float", "min_value": "0.1", @@ -908,7 +908,7 @@ "children": { "speed_support_lines": { "label": "Support Wall Speed", - "description": "The speed at which the walls of exterior support are printed. Printing the walls at higher speeds can improve the overall duration.", + "description": "The speed at which the walls of support are printed. Printing the walls at higher speeds can improve the overall duration.", "unit": "mm/s", "type": "float", "default": 60, @@ -921,7 +921,7 @@ }, "speed_support_roof": { "label": "Support Roof Speed", - "description": "The speed at which the roofs of exterior support are printed. Printing the support roof at lower speeds can improve overhang quality.", + "description": "The speed at which the roofs of support are printed. Printing the support roof at lower speeds can improve overhang quality.", "unit": "mm/s", "type": "float", "default": 40, @@ -938,7 +938,7 @@ }, "speed_travel": { "label": "Travel Speed", - "description": "The speed at which travel moves are done. A well-built Ultimaker can reach speeds of 250mm/s, but some machines might have misaligned layers then.", + "description": "The speed at which travel moves are made.", "unit": "mm/s", "type": "float", "default": 120, @@ -948,8 +948,8 @@ "global_only": true }, "speed_layer_0": { - "label": "Bottom Layer Speed", - "description": "The print speed for the bottom layer: You want to print the first layer slower so it sticks better to the printer bed.", + "label": "Initial Layer Speed", + "description": "The print speed for the initial layer. A lower value is advised to improve adhesion to the build plate.", "unit": "mm/s", "type": "float", "default": 30, @@ -971,7 +971,7 @@ }, "speed_slowdown_layers": { "label": "Number of Slower Layers", - "description": "The first few layers are printed slower than the rest of the object, this to get better adhesion to the printer bed and improve the overall success rate of prints. The speed is gradually increased over these layers. 4 layers of speed-up is generally right for most materials and printers.", + "description": "The first few layers are printed slower than the rest of the object, this to get better adhesion to the build plate and improve the overall success rate of prints. The speed is gradually increased over these layers.", "type": "int", "default": 2, "min_value": "0", @@ -988,7 +988,7 @@ "settings": { "retraction_combing": { "label": "Enable Combing", - "description": "Combing keeps the head within the interior of the print whenever possible when traveling from one part of the print to another and does not use retraction. If combing is disabled, the print head moves straight from the start point to the end point and it will always retract.", + "description": "Combing keeps the nozzle within already printed areas when traveling. This results in slightly longer travel moves but reduces the need for retractions. If combing is disabled, the nozzle moves in a straight line to the next start point and will retract.", "type": "boolean", "default": true, "visible": false, @@ -996,7 +996,7 @@ }, "travel_avoid_other_parts": { "label": "Avoid Printed Parts", - "description": "Avoid other parts when traveling between parts.", + "description": "The nozzle avoids already printed parts when travelling. This option is only available when combing is enabled.", "type": "boolean", "default": true, "visible": false, @@ -1005,7 +1005,7 @@ }, "travel_avoid_distance": { "label": "Avoid Distance", - "description": "The distance to stay clear of parts which are avoided during travel.", + "description": "The distance between the nozzle and already printed parts when avoiding during travel.", "unit": "mm", "type": "float", "default": 1.5, @@ -1019,7 +1019,7 @@ }, "coasting_enable": { "label": "Enable Coasting", - "description": "Coasting replaces the last part of an extrusion path with a travel path. The oozed material is used to lay down the last piece of the extrusion path in order to reduce stringing.", + "description": "Coasting replaces the last part of an extrusion path with a travel path. The oozed material is used to print the last piece of the extrusion path in order to reduce stringing.", "type": "boolean", "default": false, "visible": false, @@ -1072,14 +1072,14 @@ "settings": { "cool_fan_enabled": { "label": "Enable Cooling Fan", - "description": "Enable the cooling fan during the print. The extra cooling from the cooling fan helps parts with small cross sections that print each layer quickly.", + "description": "Enables the cooling fans while printing. The fans improve print quality on layers with short layer times and bridging / overhangs.", "type": "boolean", "default": true, "global_only": "True" }, "cool_fan_speed": { "label": "Fan Speed", - "description": "Fan speed used for the print cooling fan on the printer head.", + "description": "The speed at which the cooling fans spin.", "unit": "%", "type": "float", "min_value": "0", @@ -1091,8 +1091,8 @@ "global_only": "True", "children": { "cool_fan_speed_min": { - "label": "Normal Fan Speed", - "description": "Normally the fan runs at the minimum fan speed. If a layer takes less than Shortest Layer Time Normal Fan Speed, the fan speed adjusts from Normal Fan Speed towards Maximum Fan Speed.", + "label": "Regular fan speed", + "description": "The speed at which the fans spin before hitting the threshold. When a layer prints faster than the threshold, the fan speed gradually inclines towards the maximum fan speed.", "unit": "%", "type": "float", "min_value": "0", @@ -1105,7 +1105,7 @@ }, "cool_fan_speed_max": { "label": "Maximum Fan Speed", - "description": "If a layer is slowed down due to minimum layer time, the fan speed will be the Maximum Fan Speed.", + "description": "The speed at which the fans spin on the minimum layer time. The fan speed gradually increases between the regular fan speed and maximum fan speed when the threshold is hit.", "unit": "%", "type": "float", "min_value": "max(0, cool_fan_speed_min)", @@ -1118,8 +1118,8 @@ } }, "cool_fan_full_at_height": { - "label": "Slow Fan Down Below Height", - "description": "The height at which the fan is set to Normal Fan Speed. For the layers below this the fan speed is scaled linearly with the fan off on the first layer.", + "label": "Regular fan speed at height", + "description": "The height at which the fan spins on regular fan speed. At the layers below the fan speed gradually increases from zero to regular fan speed.", "unit": "mm", "type": "float", "default": 0.5, @@ -1130,8 +1130,8 @@ "global_only": "True", "children": { "cool_fan_full_layer": { - "label": "Slow Fan Down Below Layer", - "description": "The layer number at which the fan is set to Normal Fan Speed. For the layers below this the fan speed is scaled linearly with the fan off on the first layer.", + "label": "Regular fan speed at layer", + "description": "The layer at which the fan spins on regular fan speed. If regular fan speed at height is set, this value is calculated and rounded to a whole number.", "type": "int", "default": 1, "min_value": "0", @@ -1144,7 +1144,7 @@ }, "cool_min_layer_time": { "label": "Minimum Layer Time", - "description": "The minimum time spent in a layer. Gives fast layers extra time to cool down before printing the next layer. If a layer would print in less time, then the printer will slow down to make sure it has spent at least this many seconds printing the layer.", + "description": "The minimum time spent in a layer. Forces the printer to slow down, to at least take the time set here to spend in one layer. This allows the printed material to cool down properly before printing the next layer.", "unit": "sec", "type": "float", "default": 5, @@ -1166,7 +1166,7 @@ }, "cool_min_speed": { "label": "Minimum Speed", - "description": "The minimum layer time can cause the print to slow down so much it starts to droop. The Minimum Speed protects against this. Even if a print gets slowed down it will never be slower than this minimum speed.", + "description": "The minimum speed at which the printer is forced to print at, no matter how much the minimum layer time slows it down. When the printer would slow down too much, the pressure in the nozzle would be too low and result in bad print quality.", "unit": "mm/s", "type": "float", "default": 10, @@ -1177,7 +1177,7 @@ }, "cool_lift_head": { "label": "Lift Head", - "description": "When the Minimum Speed is hit because of Minimum Layer Time, lift the head away from the print and wait the extra time until the minimum layer time is reached.", + "description": "When the minimum speed is hit because of minimum layer time, lift the head away from the print and wait the extra time until the minimum layer time is reached.", "type": "boolean", "default": false, "visible": false, @@ -1185,7 +1185,7 @@ }, "draft_shield_enabled": { "label": "Enable Draft Shield", - "description": "Enable exterior draft shield. This will create a wall around the object which traps (hot) air and shields against gusts of wind. Especially useful for materials which warp easily.", + "description": "Enables an exterior draft shield. This will create a wall around the object which traps (hot) air and shields against gusts of wind. Especially useful for materials which warp easily.", "type": "boolean", "default": false, "global_only": true @@ -1204,7 +1204,7 @@ }, "draft_shield_height_limitation": { "label": "Draft Shield Limitation", - "description": "Whether or not to limit the height of the draft shield.", + "description": "Enable the height limit of the draft shield.", "type": "enum", "options": { "full": "Full", @@ -1217,7 +1217,7 @@ }, "draft_shield_height": { "label": "Draft Shield Height", - "description": "Height limitation on the draft shield. Above this height no draft shield will be printed.", + "description": "Height limitation of the draft shield. Above this height no draft shield will be printed.", "unit": "mm", "type": "float", "min_value": "0", @@ -1237,13 +1237,13 @@ "settings": { "support_enable": { "label": "Enable Support", - "description": "Enable exterior support structures. This will build up supporting structures below the model to prevent the model from sagging or printing in mid air.", + "description": "Enable support structures. The support structures prevent the model from printing mid-air.", "type": "boolean", "default": false }, "support_type": { "label": "Placement", - "description": "Where to place support structures. The placement can be restricted so that the support structures won't rest on the model, which could otherwise cause scarring.", + "description": "Adjusts the placement type of the support structures. The placement can be set to touching build plate or everywhere.", "type": "enum", "options": { "buildplate": "Touching Buildplate", @@ -1254,7 +1254,7 @@ }, "support_angle": { "label": "Overhang Angle", - "description": "The maximum angle of overhangs for which support will be added. With 0 degrees being vertical, and 90 degrees being horizontal. A smaller overhang angle leads to more support.", + "description": "The maximum angle of overhangs for which support is added. At a value of 0° all overhangs are supported, 90° will not provide any support.", "unit": "°", "type": "float", "min_value": "0", @@ -1265,7 +1265,7 @@ }, "support_xy_distance": { "label": "X/Y Distance", - "description": "Distance of the support structure from the print in the X/Y directions. 0.7mm typically gives a nice distance from the print so the support does not stick to the surface.", + "description": "Distance of the support structure from the print in the X/Y directions.", "unit": "mm", "type": "float", "min_value": "0", @@ -1276,7 +1276,7 @@ }, "support_z_distance": { "label": "Z Distance", - "description": "Distance from the top/bottom of the support to the print. A small gap here makes it easier to remove the support but makes the print a bit uglier. 0.15mm allows for easier separation of the support structure.", + "description": "Distance from the top/bottom of the support structure to the print. This gap provides clearance to remove the supports after the model is printed.", "unit": "mm", "type": "float", "min_value": "0", @@ -1345,7 +1345,7 @@ }, "support_bottom_stair_step_height": { "label": "Stair Step Height", - "description": "The height of the steps of the stair-like bottom of support resting on the model. Small steps can cause the support to be hard to remove from the top of the model.", + "description": "The height of the steps of the stair-like bottom of support resting on the model. A low value makes the support harder to remove, a high value makes the support easier to remove.", "unit": "mm", "type": "float", "default": 0.3, @@ -1356,7 +1356,7 @@ }, "support_join_distance": { "label": "Join Distance", - "description": "The maximum distance between support blocks in the X/Y directions, so that the blocks will merge into a single block.", + "description": "The maximum distance between support blocks in the X/Y directions. When the structures are closer together than this value, the structures merge into one.", "unit": "mm", "type": "float", "default": 2.0, @@ -1408,7 +1408,7 @@ }, "support_roof_density": { "label": "Support Roof Density", - "description": "This controls how densely filled the roofs of the support will be. A higher percentage results in better overhangs, but makes the support more difficult to remove.", + "description": "Adjusts the density of the roof of the support structure. A higher value results in better overhangs, but the supports are harder to remove.", "unit": "%", "type": "float", "default": 100, @@ -1419,7 +1419,7 @@ "children": { "support_roof_line_distance": { "label": "Support Roof Line Distance", - "description": "Distance between the printed support roof lines.", + "description": "Distance between the printed support roof lines. This setting is calculated by the support roof Density, but can be adjusted separately.", "unit": "mm", "type": "float", "default": 0.4, @@ -1481,7 +1481,7 @@ }, "support_tower_roof_angle": { "label": "Tower Roof Angle", - "description": "The angle of the rooftop of a tower. Larger angles mean more pointy towers.", + "description": "The angle of a rooftop of a tower. A higher value results in pointed tower roofs, a lower value results in flattened tower roofs. Support pattern: Adjusts the pattern of the support structure.", "unit": "°", "type": "int", "min_value": "0", @@ -1550,7 +1550,7 @@ "settings": { "adhesion_type": { "label": "Type", - "description": "Different options that help to improve priming your extrusion.\nBrim and Raft help in preventing corners from lifting due to warping. Brim adds a single-layer-thick flat area around your object which is easy to cut off afterwards, and it is the recommended option.\nRaft adds a thick grid below the object and a thin interface between this and your object.\nThe skirt is a line drawn around the first layer of the print, this helps to prime your extrusion and to see if the object fits on your platform.", + "description": "Different options that help to improve both priming your extrusion and adhesion to the build plate. Brim adds a single layer flat area around the base of your object to prevent warping. Raft adds a thick grid with a roof below the object. Skirt is a line printed around the object, but not connected to the model.", "type": "enum", "options": { "skirt": "Skirt", @@ -1585,7 +1585,7 @@ }, "skirt_minimal_length": { "label": "Skirt Minimum Length", - "description": "The minimum length of the skirt. If this minimum length is not reached, more skirt lines will be added to reach this minimum length. Note: If the line count is set to 0 this is ignored.", + "description": "The minimum length of the skirt. If this length is not reached by the skirt line count, more skirt lines will be added until the minimum length is reached. Note: If the line count is set to 0 this is ignored.", "unit": "mm", "type": "float", "default": 250, @@ -1598,7 +1598,7 @@ }, "brim_width": { "label": "Brim Width", - "description": "The distance from the model to the end of the brim. A larger brim sticks better to the build platform, but also makes your effective print area smaller.", + "description": "The distance from the model to the outermost brim line. A larger brim enhances adhesion to the build plate, but also reduces the effective print area.", "type": "float", "unit": "mm", "default": 8.0, @@ -1610,7 +1610,7 @@ "children": { "brim_line_count": { "label": "Brim Line Count", - "description": "The number of lines used for a brim. More lines means a larger brim which sticks better to the build plate, but this also makes your effective print area smaller.", + "description": "The number of lines used for a brim. More brim lines enhance adhesion to the build plate, but also reduces the effective print area.", "type": "int", "default": 20, "min_value": "0", From 50aa14fc162b3ad9edab922866814a42f4256696 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Wed, 30 Mar 2016 18:39:30 +0200 Subject: [PATCH 60/89] JSON: updated settings descriptions (CURA-1309) Changes made by Jeroen to settings which changed order --- resources/machines/fdmprinter.json | 40 ++++++++++++------------------ 1 file changed, 16 insertions(+), 24 deletions(-) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index 4ab6a26ea4..caf94c1572 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -286,7 +286,7 @@ }, "skin_line_width": { "label": "Top/bottom line width", - "description": "Width of a single top/bottom printed line, used to fill up the top/bottom areas of a print.", + "description": "Width of a single top/bottom line.", "unit": "mm", "min_value": "0.0001", "min_value_warning": "0.2", @@ -297,7 +297,7 @@ }, "infill_line_width": { "label": "Infill line width", - "description": "Width of the inner infill printed lines.", + "description": "Width of a single infill line.", "unit": "mm", "min_value": "0.0001", "min_value_warning": "0.2", @@ -431,7 +431,6 @@ } } }, - "alternate_extra_perimeter": { "label": "Alternating Extra Wall", "description": "Prints an extra wall at every other layer. This way infill gets caught between these extra walls, resulting in stronger prints.", @@ -469,7 +468,7 @@ }, "travel_compensate_overlapping_walls_enabled": { "label": "Compensate Wall Overlaps", - "description": "Compensate the flow for parts of a wall being laid down where there already is a piece of a wall. These overlaps occur in thin pieces in a model. Gcode generation might be slowed down considerably.", + "description": "Compensate the flow for parts of a wall being printed where there is already a wall in place.", "type": "boolean", "default": true, "visible": false @@ -488,8 +487,8 @@ "enabled": "remove_overlapping_walls_x_enabled" }, "top_bottom_pattern": { - "label": "Bottom/Top Pattern", - "description": "Pattern of the top/bottom solid fill. This is normally done with lines to get the best possible finish, but in some cases a concentric fill gives a nicer end result.", + "label": "Top/Bottom Pattern", + "description": "The pattern of the top/bottom layers.", "type": "enum", "options": { "lines": "Lines", @@ -499,23 +498,16 @@ "default": "lines", "visible": false }, - "skin_no_small_gaps_heuristic": { - "label": "Ignore small Z gaps", - "description": "When the model has small vertical gaps, about 5% extra computation time can be spent on generating top and bottom skin in these narrow spaces. In such a case set this setting to false.", - "type": "boolean", - "default": true, - "visible": false - }, "skin_alternate_rotation": { "label": "Alternate Skin Rotation", - "description": "Alternate between diagonal skin fill and horizontal + vertical skin fill. Although the diagonal directions can print quicker, this option can improve the printing quality by reducing the pillowing effect.", + "description": "Alternate the direction in which the top/bottom layers are printed. Normally they are printed diagonally only. This setting adds the X-only and Y-only directions.", "type": "boolean", "default": false, "visible": false }, "skin_outline_count": { "label": "Extra Skin Wall Count", - "description": "Number of lines around skin regions. Using one or two skin perimeter lines can greatly improve roofs which would start in the middle of infill cells.", + "description": "Alternate the direction in which the top/bottom layers are printed. Normally they are printed diagonally only. This setting adds the X-only and Y-only directions.", "default": 0, "min_value": "0", "max_value_warning": "10", @@ -1154,8 +1146,8 @@ "global_only": "True" }, "cool_min_layer_time_fan_speed_max": { - "label": "Shortest Layer Time Normal Fan Speed", - "description": "The minimum time spent in a layer which will cause the fan to be at normal speed. All layers taking shorter than this time will get increased fan speeds, up to Maximum Fan Speed for layers taking Minmal Layer Time. All layers taking longer than this time will have Normal Fan Speed.", + "label": "Regular/Maximum Fan Speed threshold", + "description": "The layer time which sets the threshold between regular fan speed and maximum fan speed. Layers that print slower than this time use regular fan speed. For faster layers the fan speed gradually increases towards the maximum fan speed.", "unit": "sec", "type": "float", "default": 10, @@ -1332,7 +1324,7 @@ "enabled": "support_conical_enabled and support_enable" }, "support_conical_min_width": { - "label": "Minimal Width", + "label": "Cone minimal width", "description": "Minimal width to which conical support reduces the support areas. Small widths can cause the base of the support to not act well as foundation for support above.", "unit": "mm", "default": 5.0, @@ -1491,8 +1483,8 @@ "enabled": "support_enable and support_use_towers" }, "support_pattern": { - "label": "Pattern", - "description": "Cura can generate 3 distinct types of support structure. First is a grid based support structure which is quite solid and can be removed in one piece. The second is a line based support structure which has to be peeled off line by line. The third is a structure in between the other two; it consists of lines which are connected in an accordion fashion.", + "label": "Support Pattern", + "description": "The pattern of the support structures of the print.", "type": "enum", "options": { "lines": "Lines", @@ -1516,8 +1508,8 @@ "global_only": true }, "support_infill_rate": { - "label": "Fill Amount", - "description": "The amount of infill structure in the support; less infill gives weaker support which is easier to remove.", + "label": "Support Density", + "description": "Adjusts the density of the support structure. A higher value results in better overhangs, but the supports are harder to remove.", "unit": "%", "type": "float", "min_value": "0", @@ -1528,8 +1520,8 @@ "global_only": true, "children": { "support_line_distance": { - "label": "Line distance", - "description": "Distance between the printed support lines.", + "label": "Support Line distance", + "description": "Distance between the printed support structure lines. This setting is calculated by the support density.", "unit": "mm", "type": "float", "min_value": "0", From 4501ec98b7045a799a42e3b531a7f56256aea9e7 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Wed, 30 Mar 2016 18:42:49 +0200 Subject: [PATCH 61/89] JSON: reintroduced moved skin_no_small_gaps_heuristic (CURA-1309) Changes made by Jeroen to setting which changed order --- resources/machines/fdmprinter.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index caf94c1572..5ebb3fe342 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -498,6 +498,13 @@ "default": "lines", "visible": false }, + "skin_no_small_gaps_heuristic": { + "label": "Ignore small Z gaps", + "description": "When the model has small vertical gaps, about 5% extra computation time can be spent on generating top and bottom skin in these narrow spaces. In such a case set this setting to false.", + "type": "boolean", + "default": true, + "visible": false + }, "skin_alternate_rotation": { "label": "Alternate Skin Rotation", "description": "Alternate the direction in which the top/bottom layers are printed. Normally they are printed diagonally only. This setting adds the X-only and Y-only directions.", From 3b7650729a1419932409525f5563d53eea84a193 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Wed, 30 Mar 2016 18:47:00 +0200 Subject: [PATCH 62/89] JSON: changed order of settings (CURA-1309) Changes made by Jeroen --- resources/machines/fdmprinter.json | 292 ++++++++++++++--------------- 1 file changed, 146 insertions(+), 146 deletions(-) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index 5ebb3fe342..6209c3ee33 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -272,18 +272,6 @@ } } }, - "skirt_line_width": { - "label": "Skirt line width", - "description": "Width of a single skirt line.", - "unit": "mm", - "min_value": "0.0001", - "min_value_warning": "0.2", - "max_value_warning": "5", - "default": 0.4, - "type": "float", - "visible": false, - "global_only": true - }, "skin_line_width": { "label": "Top/bottom line width", "description": "Width of a single top/bottom line.", @@ -306,6 +294,18 @@ "type": "float", "visible": false }, + "skirt_line_width": { + "label": "Skirt line width", + "description": "Width of a single skirt line.", + "unit": "mm", + "min_value": "0.0001", + "min_value_warning": "0.2", + "max_value_warning": "5", + "default": 0.4, + "type": "float", + "visible": false, + "global_only": true + }, "support_line_width": { "label": "Support line width", "description": "Width of a single support structure line.", @@ -431,6 +431,34 @@ } } }, + "top_bottom_pattern": { + "label": "Top/Bottom Pattern", + "description": "The pattern of the top/bottom layers.", + "type": "enum", + "options": { + "lines": "Lines", + "concentric": "Concentric", + "zigzag": "Zig Zag" + }, + "default": "lines", + "visible": false + }, + "skin_alternate_rotation": { + "label": "Alternate Skin Rotation", + "description": "Alternate the direction in which the top/bottom layers are printed. Normally they are printed diagonally only. This setting adds the X-only and Y-only directions.", + "type": "boolean", + "default": false, + "visible": false + }, + "skin_outline_count": { + "label": "Extra Skin Wall Count", + "description": "Alternate the direction in which the top/bottom layers are printed. Normally they are printed diagonally only. This setting adds the X-only and Y-only directions.", + "default": 0, + "min_value": "0", + "max_value_warning": "10", + "type": "int", + "visible": false + }, "alternate_extra_perimeter": { "label": "Alternating Extra Wall", "description": "Prints an extra wall at every other layer. This way infill gets caught between these extra walls, resulting in stronger prints.", @@ -466,13 +494,6 @@ } } }, - "travel_compensate_overlapping_walls_enabled": { - "label": "Compensate Wall Overlaps", - "description": "Compensate the flow for parts of a wall being printed where there is already a wall in place.", - "type": "boolean", - "default": true, - "visible": false - }, "fill_perimeter_gaps": { "label": "Fill Gaps Between Walls", "description": "Fills the gaps between walls when overlapping inner wall parts are removed.", @@ -486,41 +507,13 @@ "visible": false, "enabled": "remove_overlapping_walls_x_enabled" }, - "top_bottom_pattern": { - "label": "Top/Bottom Pattern", - "description": "The pattern of the top/bottom layers.", - "type": "enum", - "options": { - "lines": "Lines", - "concentric": "Concentric", - "zigzag": "Zig Zag" - }, - "default": "lines", - "visible": false - }, - "skin_no_small_gaps_heuristic": { - "label": "Ignore small Z gaps", - "description": "When the model has small vertical gaps, about 5% extra computation time can be spent on generating top and bottom skin in these narrow spaces. In such a case set this setting to false.", + "travel_compensate_overlapping_walls_enabled": { + "label": "Compensate Wall Overlaps", + "description": "Compensate the flow for parts of a wall being printed where there is already a wall in place.", "type": "boolean", "default": true, "visible": false }, - "skin_alternate_rotation": { - "label": "Alternate Skin Rotation", - "description": "Alternate the direction in which the top/bottom layers are printed. Normally they are printed diagonally only. This setting adds the X-only and Y-only directions.", - "type": "boolean", - "default": false, - "visible": false - }, - "skin_outline_count": { - "label": "Extra Skin Wall Count", - "description": "Alternate the direction in which the top/bottom layers are printed. Normally they are printed diagonally only. This setting adds the X-only and Y-only directions.", - "default": 0, - "min_value": "0", - "max_value_warning": "10", - "type": "int", - "visible": false - }, "xy_offset": { "label": "Horizontal expansion", "description": "Amount of offset applied to all polygons in each layer. Positive values can compensate for too big holes; negative values can compensate for too small holes.", @@ -542,6 +535,13 @@ }, "default": "shortest", "visible": false + }, + "skin_no_small_gaps_heuristic": { + "label": "Ignore small Z gaps", + "description": "When the model has small vertical gaps, about 5% extra computation time can be spent on generating top and bottom skin in these narrow spaces. In such a case set this setting to false.", + "type": "boolean", + "default": true, + "visible": false } } }, @@ -990,7 +990,7 @@ "description": "Combing keeps the nozzle within already printed areas when traveling. This results in slightly longer travel moves but reduces the need for retractions. If combing is disabled, the nozzle moves in a straight line to the next start point and will retract.", "type": "boolean", "default": true, - "visible": false, + "visible": false, "global_only": true }, "travel_avoid_other_parts": { @@ -1116,6 +1116,17 @@ } } }, + "cool_min_layer_time_fan_speed_max": { + "label": "Regular/Maximum Fan Speed threshold", + "description": "The layer time which sets the threshold between regular fan speed and maximum fan speed. Layers that print slower than this time use regular fan speed. For faster layers the fan speed gradually increases towards the maximum fan speed.", + "unit": "sec", + "type": "float", + "default": 10, + "min_value": "cool_min_layer_time", + "max_value_warning": "600", + "visible": false, + "global_only": "True" + }, "cool_fan_full_at_height": { "label": "Regular fan speed at height", "description": "The height at which the fan spins on regular fan speed. At the layers below the fan speed gradually increases from zero to regular fan speed.", @@ -1152,17 +1163,6 @@ "visible": false, "global_only": "True" }, - "cool_min_layer_time_fan_speed_max": { - "label": "Regular/Maximum Fan Speed threshold", - "description": "The layer time which sets the threshold between regular fan speed and maximum fan speed. Layers that print slower than this time use regular fan speed. For faster layers the fan speed gradually increases towards the maximum fan speed.", - "unit": "sec", - "type": "float", - "default": 10, - "min_value": "cool_min_layer_time", - "max_value_warning": "600", - "visible": false, - "global_only": "True" - }, "cool_min_speed": { "label": "Minimum Speed", "description": "The minimum speed at which the printer is forced to print at, no matter how much the minimum layer time slows it down. When the printer would slow down too much, the pressure in the nozzle would be too low and result in bad print quality.", @@ -1262,6 +1262,57 @@ "visible": false, "enabled": "support_enable" }, + "support_pattern": { + "label": "Support Pattern", + "description": "The pattern of the support structures of the print.", + "type": "enum", + "options": { + "lines": "Lines", + "grid": "Grid", + "triangles": "Triangles", + "concentric": "Concentric", + "zigzag": "Zig Zag" + }, + "default": "zigzag", + "visible": false, + "enabled": "support_enable", + "global_only": true + }, + "support_connect_zigzags": { + "label": "Connect ZigZags", + "description": "Connect the ZigZags. Makes them harder to remove, but prevents stringing of disconnected zigzags.", + "type": "boolean", + "default": true, + "visible": false, + "enabled": "support_enable", + "global_only": true + }, + "support_infill_rate": { + "label": "Support Density", + "description": "Adjusts the density of the support structure. A higher value results in better overhangs, but the supports are harder to remove.", + "unit": "%", + "type": "float", + "min_value": "0", + "max_value_warning": "100", + "default": 15, + "visible": false, + "enabled": "support_enable", + "global_only": true, + "children": { + "support_line_distance": { + "label": "Support Line distance", + "description": "Distance between the printed support structure lines. This setting is calculated by the support density.", + "unit": "mm", + "type": "float", + "min_value": "0", + "default": 2.66, + "visible": false, + "enabled": "support_enable", + "inherit_function": "(support_line_width * 100) / parent_value", + "global_only": true + } + } + }, "support_xy_distance": { "label": "X/Y Distance", "description": "Distance of the support structure from the print in the X/Y directions.", @@ -1309,39 +1360,6 @@ } } }, - "support_conical_enabled": { - "label": "Conical Support", - "description": "Experimental feature: Make support areas smaller at the bottom than at the overhang.", - "type": "boolean", - "default": false, - "visible": true, - "enabled": "support_enable" - }, - "support_conical_angle": { - "label": "Cone Angle", - "description": "The angle of the tilt of conical support. With 0 degrees being vertical, and 90 degrees being horizontal. Smaller angles cause the support to be more sturdy, but consist of more material. Negative angles cause the base of the support to be wider than the top.", - "unit": "°", - "type": "float", - "min_value": "-90", - "min_value_warning": "-45", - "max_value_warning": "45", - "max_value": "90", - "default": 30, - "visible": false, - "enabled": "support_conical_enabled and support_enable" - }, - "support_conical_min_width": { - "label": "Cone minimal width", - "description": "Minimal width to which conical support reduces the support areas. Small widths can cause the base of the support to not act well as foundation for support above.", - "unit": "mm", - "default": 5.0, - "min_value": "0", - "min_value_warning": "machine_nozzle_size * 3", - "max_value_warning": "100.0", - "type": "float", - "visible": false, - "enabled": "support_conical_enabled and support_enable" - }, "support_bottom_stair_step_height": { "label": "Stair Step Height", "description": "The height of the steps of the stair-like bottom of support resting on the model. A low value makes the support harder to remove, a high value makes the support easier to remove.", @@ -1446,6 +1464,39 @@ "enabled": "support_roof_enable", "global_only": true }, + "support_conical_enabled": { + "label": "Conical Support", + "description": "Experimental feature: Make support areas smaller at the bottom than at the overhang.", + "type": "boolean", + "default": false, + "visible": true, + "enabled": "support_enable" + }, + "support_conical_angle": { + "label": "Cone Angle", + "description": "The angle of the tilt of conical support. With 0 degrees being vertical, and 90 degrees being horizontal. Smaller angles cause the support to be more sturdy, but consist of more material. Negative angles cause the base of the support to be wider than the top.", + "unit": "°", + "type": "float", + "min_value": "-90", + "min_value_warning": "-45", + "max_value_warning": "45", + "max_value": "90", + "default": 30, + "visible": false, + "enabled": "support_conical_enabled and support_enable" + }, + "support_conical_min_width": { + "label": "Cone minimal width", + "description": "Minimal width to which conical support reduces the support areas. Small widths can cause the base of the support to not act well as foundation for support above.", + "unit": "mm", + "default": 5.0, + "min_value": "0", + "min_value_warning": "machine_nozzle_size * 3", + "max_value_warning": "100.0", + "type": "float", + "visible": false, + "enabled": "support_conical_enabled and support_enable" + }, "support_use_towers": { "label": "Use towers", "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.", @@ -1488,57 +1539,6 @@ "default": 65, "visible": false, "enabled": "support_enable and support_use_towers" - }, - "support_pattern": { - "label": "Support Pattern", - "description": "The pattern of the support structures of the print.", - "type": "enum", - "options": { - "lines": "Lines", - "grid": "Grid", - "triangles": "Triangles", - "concentric": "Concentric", - "zigzag": "Zig Zag" - }, - "default": "zigzag", - "visible": false, - "enabled": "support_enable", - "global_only": true - }, - "support_connect_zigzags": { - "label": "Connect ZigZags", - "description": "Connect the ZigZags. Makes them harder to remove, but prevents stringing of disconnected zigzags.", - "type": "boolean", - "default": true, - "visible": false, - "enabled": "support_enable", - "global_only": true - }, - "support_infill_rate": { - "label": "Support Density", - "description": "Adjusts the density of the support structure. A higher value results in better overhangs, but the supports are harder to remove.", - "unit": "%", - "type": "float", - "min_value": "0", - "max_value_warning": "100", - "default": 15, - "visible": false, - "enabled": "support_enable", - "global_only": true, - "children": { - "support_line_distance": { - "label": "Support Line distance", - "description": "Distance between the printed support structure lines. This setting is calculated by the support density.", - "unit": "mm", - "type": "float", - "min_value": "0", - "default": 2.66, - "visible": false, - "enabled": "support_enable", - "inherit_function": "(support_line_width * 100) / parent_value", - "global_only": true - } - } } } }, From c8aa770fed210766db243989c956b860164a7ba8 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Wed, 30 Mar 2016 18:50:57 +0200 Subject: [PATCH 63/89] JSON: language fixes by Tim (CURA-1309) --- resources/machines/fdmprinter.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index 6209c3ee33..a566d81312 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -460,7 +460,7 @@ "visible": false }, "alternate_extra_perimeter": { - "label": "Alternating Extra Wall", + "label": "Alternate Extra Wall", "description": "Prints an extra wall at every other layer. This way infill gets caught between these extra walls, resulting in stronger prints.", "type": "boolean", "default": false, @@ -1300,7 +1300,7 @@ "global_only": true, "children": { "support_line_distance": { - "label": "Support Line distance", + "label": "Support Line Distance", "description": "Distance between the printed support structure lines. This setting is calculated by the support density.", "unit": "mm", "type": "float", From 4c47615145ff9566fec43b684731453058f6556c Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Wed, 30 Mar 2016 19:12:41 +0200 Subject: [PATCH 64/89] JSON+profiles: removed shell thickness as a whole (CURA-1309) --- resources/machines/RigidBot.json | 1 - resources/machines/RigidBotBig.json | 1 - resources/machines/bq_hephestos.json | 1 - resources/machines/bq_hephestos_2.json | 1 - resources/machines/bq_hephestos_xl.json | 1 - resources/machines/bq_witbox.json | 1 - resources/machines/bq_witbox_2.json | 1 - resources/machines/fdmprinter.json | 118 ++++++++---------- resources/machines/innovo-inventor.json | 1 - resources/profiles/general/Low+Quality.cfg | 2 +- .../ultimaker2+/pla_0.25_normal.curaprofile | 2 +- .../ultimaker2+/pla_0.4_fast.curaprofile | 2 +- .../ultimaker2+/pla_0.4_high.curaprofile | 2 +- .../ultimaker2+/pla_0.4_normal.curaprofile | 2 +- .../ultimaker2+/pla_0.4_ulti.curaprofile | 2 +- .../ultimaker2+/pla_0.6_normal.curaprofile | 2 +- .../ultimaker2+/pla_0.8_normal.curaprofile | 2 +- .../ultimaker2_olsson/0.25_normal.curaprofile | 2 +- .../ultimaker2_olsson/0.4_fast.curaprofile | 2 +- .../ultimaker2_olsson/0.4_high.curaprofile | 2 +- .../ultimaker2_olsson/0.4_normal.curaprofile | 2 +- .../ultimaker2_olsson/0.4_ulti.curaprofile | 2 +- .../ultimaker2_olsson/0.6_normal.curaprofile | 2 +- .../ultimaker2_olsson/0.8_normal.curaprofile | 2 +- 24 files changed, 67 insertions(+), 89 deletions(-) diff --git a/resources/machines/RigidBot.json b/resources/machines/RigidBot.json index c136e8fbb8..99991e5fdb 100644 --- a/resources/machines/RigidBot.json +++ b/resources/machines/RigidBot.json @@ -37,7 +37,6 @@ "overrides": { "layer_height": { "default": 0.2 }, - "shell_thickness": { "default": 0.8 }, "wall_thickness": { "default": 0.8 }, "top_bottom_thickness": { "default": 0.3, "visible": true }, "material_print_temperature": { "default": 195, "visible": true }, diff --git a/resources/machines/RigidBotBig.json b/resources/machines/RigidBotBig.json index fdb2d06bf6..49458a7e31 100644 --- a/resources/machines/RigidBotBig.json +++ b/resources/machines/RigidBotBig.json @@ -35,7 +35,6 @@ "overrides": { "layer_height": { "default": 0.2 }, - "shell_thickness": { "default": 0.8}, "wall_thickness": { "default": 0.8 }, "top_bottom_thickness": { "default": 0.3, "visible": true }, "material_print_temperature": { "default": 195, "visible": true }, diff --git a/resources/machines/bq_hephestos.json b/resources/machines/bq_hephestos.json index 46e90b539e..b895dfbc13 100644 --- a/resources/machines/bq_hephestos.json +++ b/resources/machines/bq_hephestos.json @@ -40,7 +40,6 @@ "overrides": { "layer_height": { "default": 0.2 }, "layer_height_0": { "default": 0.2, "visible": false }, - "shell_thickness": { "default": 1.0 }, "wall_thickness": { "default": 1.0, "visible": false }, "top_bottom_thickness": { "default": 1.0, "visible": false}, "bottom_thickness": { "default": 1.0, "visible": false }, diff --git a/resources/machines/bq_hephestos_2.json b/resources/machines/bq_hephestos_2.json index e602c8d34a..f9f5786507 100644 --- a/resources/machines/bq_hephestos_2.json +++ b/resources/machines/bq_hephestos_2.json @@ -43,7 +43,6 @@ "material_diameter": { "default": 1.75 }, "layer_height": { "default": 0.2 }, "layer_height_0": { "default": 0.2, "visible": true }, - "shell_thickness": { "default": 1.2 }, "wall_line_count": { "default": 3, "visible": false }, "wall_thickness": { "default": 1.2, "visible": false }, "top_bottom_thickness": { "default": 1.2, "visible": false }, diff --git a/resources/machines/bq_hephestos_xl.json b/resources/machines/bq_hephestos_xl.json index 2027be980e..a6ad6261ed 100644 --- a/resources/machines/bq_hephestos_xl.json +++ b/resources/machines/bq_hephestos_xl.json @@ -40,7 +40,6 @@ "overrides": { "layer_height": { "default": 0.2 }, "layer_height_0": { "default": 0.2, "visible": false }, - "shell_thickness": { "default": 1.0 }, "wall_thickness": { "default": 1.0, "visible": false }, "top_bottom_thickness": { "default": 1.0, "visible": false}, "bottom_thickness": { "default": 1.0, "visible": false }, diff --git a/resources/machines/bq_witbox.json b/resources/machines/bq_witbox.json index d7b1789976..a2fad0fd49 100644 --- a/resources/machines/bq_witbox.json +++ b/resources/machines/bq_witbox.json @@ -40,7 +40,6 @@ "overrides": { "layer_height": { "default": 0.2 }, "layer_height_0": { "default": 0.2, "visible": false }, - "shell_thickness": { "default": 1.0 }, "wall_thickness": { "default": 1.0, "visible": false }, "top_bottom_thickness": { "default": 1.0, "visible": false}, "bottom_thickness": { "default": 1.0, "visible": false }, diff --git a/resources/machines/bq_witbox_2.json b/resources/machines/bq_witbox_2.json index 77b0a55738..e7fe50cea9 100644 --- a/resources/machines/bq_witbox_2.json +++ b/resources/machines/bq_witbox_2.json @@ -43,7 +43,6 @@ "material_diameter": { "default": 1.75 }, "layer_height": { "default": 0.2 }, "layer_height_0": { "default": 0.2, "visible": true }, - "shell_thickness": { "default": 1.2 }, "wall_line_count": { "default": 3, "visible": false }, "wall_thickness": { "default": 1.2, "visible": false }, "top_bottom_thickness": { "default": 1.2, "visible": false }, diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index a566d81312..31dda7d204 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -340,92 +340,78 @@ "visible": true, "icon": "category_shell", "settings": { - "shell_thickness": { - "label": "Shell Thickness", - "description": "The thickness of the outside shell in the horizontal and vertical direction. This is used in combination with the nozzle size to define the number of perimeter lines and the thickness of those perimeter lines. This is also used to define the number of solid top and bottom layers.", + "wall_thickness": { + "label": "Wall Thickness", + "description": "The thickness of the outside walls in the horizontal direction. This value divided by the wall line width defines the number of walls.", "unit": "mm", - "type": "float", "default": 0.8, "min_value": "0", - "min_value_warning": "0.2", - "max_value_warning": "5", - "visible": false, - "enabled": "False", + "min_value_warning": "line_width", + "max_value_warning": "5 * line_width", + "type": "float", + "visible": true, "children": { - "wall_thickness": { - "label": "Wall Thickness", - "description": "The thickness of the outside walls in the horizontal direction. This value divided by the wall line width defines the number of walls.", + "wall_line_count": { + "label": "Wall Line Count", + "description": "The number of walls. When calculated by the wall thickness, this value is rounded to a whole number.", + "default": 2, + "min_value": "0", + "type": "int", + "visible": false, + "inherit_function": "1 if magic_spiralize else max(1, round((wall_thickness - wall_line_width_0) / wall_line_width_x) + 1)" + } + } + }, + "top_bottom_thickness": { + "label": "Top/Bottom Thickness", + "description": " The thickness of the top/bottom layers in the print. This value divided by the layer height defines the number of top/bottom layers.", + "unit": "mm", + "default": 0.8, + "min_value": "0", + "max_value": "5", + "min_value_warning": "0.6", + "type": "float", + "visible": true, + "children": { + "top_thickness": { + "label": "Top Thickness", + "description": "The thickness of the top layers in the print. This value divided by the layer height defines the number of top layers.", "unit": "mm", "default": 0.8, "min_value": "0", - "min_value_warning": "line_width", - "max_value_warning": "5 * line_width", + "max_value_warning": "100", "type": "float", - "visible": true, + "visible": false, "children": { - "wall_line_count": { - "label": "Wall Line Count", - "description": "The number of walls. When calculated by the wall thickness, this value is rounded to a whole number.", - "default": 2, - "min_value": "0", + "top_layers": { + "label": "Top Layers", + "description": "The number of top layers. When calculated by the top thickness, this value is rounded to a whole number.", + "default": 8, + "min_value": "0", + "max_value_warning": "100", "type": "int", "visible": false, - "inherit_function": "1 if magic_spiralize else max(1, round((wall_thickness - wall_line_width_0) / wall_line_width_x) + 1)" + "inherit_function": "0 if infill_sparse_density == 100 else math.ceil(parent_value / layer_height)" } } }, - "top_bottom_thickness": { - "label": "Top/Bottom Thickness", - "description": " The thickness of the top/bottom layers in the print. This value divided by the layer height defines the number of top/bottom layers.", + "bottom_thickness": { + "label": "Bottom Thickness", + "description": "The thickness of the bottom layers in the print. This value divided by the layer height defines the number of bottom layers.", "unit": "mm", - "default": 0.8, + "default": 0.6, "min_value": "0", - "max_value": "5", - "min_value_warning": "0.6", "type": "float", - "visible": true, + "visible": false, "children": { - "top_thickness": { - "label": "Top Thickness", - "description": "The thickness of the top layers in the print. This value divided by the layer height defines the number of top layers.", - "unit": "mm", - "default": 0.8, + "bottom_layers": { + "label": "Bottom Layers", + "description": "The number of bottom layers. When calculated by the bottom thickness, this value is rounded to a whole number.", "min_value": "0", - "max_value_warning": "100", - "type": "float", + "default": 6, + "type": "int", "visible": false, - "children": { - "top_layers": { - "label": "Top Layers", - "description": "The number of top layers. When calculated by the top thickness, this value is rounded to a whole number.", - "default": 8, - "min_value": "0", - "max_value_warning": "100", - "type": "int", - "visible": false, - "inherit_function": "0 if infill_sparse_density == 100 else math.ceil(parent_value / layer_height)" - } - } - }, - "bottom_thickness": { - "label": "Bottom Thickness", - "description": "The thickness of the bottom layers in the print. This value divided by the layer height defines the number of bottom layers.", - "unit": "mm", - "default": 0.6, - "min_value": "0", - "type": "float", - "visible": false, - "children": { - "bottom_layers": { - "label": "Bottom Layers", - "description": "The number of bottom layers. When calculated by the bottom thickness, this value is rounded to a whole number.", - "min_value": "0", - "default": 6, - "type": "int", - "visible": false, - "inherit_function": "999999 if infill_sparse_density == 100 else math.ceil(parent_value / layer_height)" - } - } + "inherit_function": "999999 if infill_sparse_density == 100 else math.ceil(parent_value / layer_height)" } } } diff --git a/resources/machines/innovo-inventor.json b/resources/machines/innovo-inventor.json index 439edb5990..61d090196a 100644 --- a/resources/machines/innovo-inventor.json +++ b/resources/machines/innovo-inventor.json @@ -30,7 +30,6 @@ "overrides": { "layer_height": { "default": 0.15}, - "shell_thickness": { "default": 0.8}, "wall_thickness": { "default": 0.8}, "top_bottom_thickness": { "default": 0.3, "visible": true}, "material_print_temperature": { "default": 215, "visible": true}, diff --git a/resources/profiles/general/Low+Quality.cfg b/resources/profiles/general/Low+Quality.cfg index 96c1778826..f7f4e5d6b7 100644 --- a/resources/profiles/general/Low+Quality.cfg +++ b/resources/profiles/general/Low+Quality.cfg @@ -10,6 +10,6 @@ cool_min_layer_time = 3 speed_wall_0 = 40 speed_wall_x = 80 speed_infill = 100 -shell_thickness = 1 +wall_thickness = 1 speed_topbottom = 30 diff --git a/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile index 8eacab211f..d5c27687a5 100644 --- a/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile @@ -10,7 +10,7 @@ weight = -2 line_width = 0.22 layer_height = 0.06 layer_height_0 = 0.15 -shell_thickness = 0.88 +wall_thickness = 0.88 top_bottom_thickness = 0.72 infill_sparse_density = 22 retraction_amount = 6 diff --git a/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile index f2051858cb..5088c055c2 100644 --- a/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile @@ -10,7 +10,7 @@ weight = -1 line_width = 0.35 layer_height = 0.15 layer_height_0 = 0.26 -shell_thickness = 0.7 +wall_thickness = 0.7 top_bottom_thickness = 0.6 infill_sparse_density = 18 retraction_amount = 5.5 diff --git a/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile index 3889ff5da0..5140474e48 100644 --- a/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile @@ -10,7 +10,7 @@ weight = -3 line_width = 0.35 layer_height = 0.06 layer_height_0 = 0.26 -shell_thickness = 1.05 +wall_thickness = 1.05 top_bottom_thickness = 0.84 infill_sparse_density = 22 retraction_amount = 5.5 diff --git a/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile index 174cc9d947..88862832b2 100644 --- a/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile @@ -9,7 +9,7 @@ weight = -2 [settings] line_width = 0.35 layer_height_0 = 0.26 -shell_thickness = 1.05 +wall_thickness = 1.05 top_bottom_thickness = 0.8 infill_sparse_density = 20 retraction_amount = 5.5 diff --git a/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile index 72388e94b6..5cb807de01 100644 --- a/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile @@ -10,7 +10,7 @@ weight = -4 line_width = 0.35 layer_height = 0.04 layer_height_0 = 0.26 -shell_thickness = 1.4 +wall_thickness = 1.4 top_bottom_thickness = 1.12 infill_sparse_density = 25 retraction_amount = 5.5 diff --git a/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile index 4e86a6aab2..13d1c783d6 100644 --- a/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile @@ -10,7 +10,7 @@ weight = -2 line_width = 0.53 layer_height = 0.15 layer_height_0 = 0.4 -shell_thickness = 1.59 +wall_thickness = 1.59 top_bottom_thickness = 1.2 retraction_amount = 6 speed_print = 25 diff --git a/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile index 6a34ecb59c..030bd38064 100644 --- a/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile @@ -10,7 +10,7 @@ weight = -2 line_width = 0.7 layer_height = 0.2 layer_height_0 = 0.5 -shell_thickness = 2.1 +wall_thickness = 2.1 top_bottom_thickness = 1.6 infill_sparse_density = 20 retraction_amount = 6 diff --git a/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile index bd9fb0eb3f..bde58062f0 100644 --- a/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile @@ -9,7 +9,7 @@ weight = -2 line_width = 0.22 layer_height = 0.06 layer_height_0 = 0.15 -shell_thickness = 0.88 +wall_thickness = 0.88 top_bottom_thickness = 0.72 infill_sparse_density = 22 infill_overlap = 0.022 diff --git a/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile index 80be7f3c63..b31b36267a 100644 --- a/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile @@ -9,7 +9,7 @@ weight = -1 line_width = 0.35 layer_height = 0.15 layer_height_0 = 0.26 -shell_thickness = 0.7 +wall_thickness = 0.7 top_bottom_thickness = 0.6 infill_sparse_density = 18 infill_overlap = 0.035 diff --git a/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile index 608bd1a198..16e9a6cfd5 100644 --- a/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile @@ -9,7 +9,7 @@ weight = -3 line_width = 0.35 layer_height = 0.06 layer_height_0 = 0.26 -shell_thickness = 1.05 +wall_thickness = 1.05 top_bottom_thickness = 0.84 infill_sparse_density = 22 infill_overlap = 0.035 diff --git a/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile index 9ac81316c3..9e745b37cd 100644 --- a/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile @@ -9,7 +9,7 @@ weight = -2 line_width = 0.35 layer_height = 0.1 layer_height_0 = 0.26 -shell_thickness = 1.05 +wall_thickness = 1.05 top_bottom_thickness = 0.8 infill_overlap = 0.035 retraction_amount = 5.5 diff --git a/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile index bca7de1bee..1970a0c96c 100644 --- a/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile @@ -9,7 +9,7 @@ weight = -4 line_width = 0.35 layer_height = 0.04 layer_height_0 = 0.26 -shell_thickness = 1.4 +wall_thickness = 1.4 top_bottom_thickness = 1.12 infill_sparse_density = 25 infill_overlap = 0.035 diff --git a/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile index f72dc0bce8..cd2cc7dee7 100644 --- a/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile @@ -9,7 +9,7 @@ weight = -2 line_width = 0.53 layer_height = 0.15 layer_height_0 = 0.4 -shell_thickness = 1.59 +wall_thickness = 1.59 top_bottom_thickness = 1.2 infill_overlap = 0.053 retraction_amount = 6 diff --git a/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile index df87e18f42..27fd2701a1 100644 --- a/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile @@ -9,7 +9,7 @@ weight = -2 line_width = 0.7 layer_height = 0.2 layer_height_0 = 0.5 -shell_thickness = 2.1 +wall_thickness = 2.1 top_bottom_thickness = 1.6 infill_sparse_density = 20 infill_overlap = 0.07 From 92cb16cf8c188575e78462fff7d69cbab501da13 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Wed, 30 Mar 2016 19:15:51 +0200 Subject: [PATCH 65/89] JSON: Connect zigzags was visibile with zigzags disabled (CURA-1309) --- resources/machines/fdmprinter.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index 31dda7d204..392a7e60a1 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -1270,7 +1270,7 @@ "type": "boolean", "default": true, "visible": false, - "enabled": "support_enable", + "enabled": "support_enable and support_pattern==zigzag", "global_only": true }, "support_infill_rate": { From 52d064d7ab7d44b4ee96895277766a7982ea8e5b Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Wed, 30 Mar 2016 19:19:44 +0200 Subject: [PATCH 66/89] JSON: bug fix last commit (CURA-1309) --- resources/machines/fdmprinter.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index 392a7e60a1..afa75a2975 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -1270,7 +1270,7 @@ "type": "boolean", "default": true, "visible": false, - "enabled": "support_enable and support_pattern==zigzag", + "enabled": "support_enable and (support_pattern == 'zigzag')", "global_only": true }, "support_infill_rate": { From 82eda02d37cda769395e518b3da931a290d81db2 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 31 Mar 2016 10:38:54 +0200 Subject: [PATCH 67/89] Created a new category (experimental) & moved a number of settings there CURA-1267 --- resources/machines/fdmprinter.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index 7db1583a96..f9d2494020 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -1946,7 +1946,15 @@ "default": false, "visible": false, "global_only": "True" - }, + } + } + }, + "experimental": + { + "label": "Experimental", + "visible": true, + "icon": "category_blackmagic", + "settings": { "magic_fuzzy_skin_enabled": { "label": "Fuzzy Skin", "description": "Randomly jitter while printing the outer wall, so that the surface has a rough and fuzzy look.", From b8dee1b166673228488cb8919e13b06ff66cfbea Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Thu, 31 Mar 2016 12:51:15 +0200 Subject: [PATCH 68/89] JSON: max warning value draft shield height --- resources/machines/fdmprinter.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index afa75a2975..cbe1e112ea 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -1206,7 +1206,7 @@ "unit": "mm", "type": "float", "min_value": "0", - "max_value_warning": "30", + "max_value_warning": "9999", "default": 0, "inherit_function": "9999 if draft_shield_height_limitation == 'full' and draft_shield_enabled else 0.0", "visible": false, From b7a465afd650e2c39440441cee9bd685de5b2bb2 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 31 Mar 2016 13:50:04 +0200 Subject: [PATCH 69/89] Added round to top/bottom layer calculation This is because 1.12 / 0.04 = 28.000000000000004 according to python. The math.ceil then ensured that the result was 29 (instead of expected 28) CURA-1140 --- resources/machines/fdmprinter.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index fed7743cb5..0f75ecfa2c 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -391,7 +391,7 @@ "max_value_warning": "100", "type": "int", "visible": false, - "inherit_function": "0 if infill_sparse_density == 100 else math.ceil(parent_value / layer_height)" + "inherit_function": "0 if infill_sparse_density == 100 else math.ceil(round(parent_value / layer_height, 4))" } } }, @@ -411,7 +411,7 @@ "default": 6, "type": "int", "visible": false, - "inherit_function": "999999 if infill_sparse_density == 100 else math.ceil(parent_value / layer_height)" + "inherit_function": "999999 if infill_sparse_density == 100 else math.ceil(round(parent_value / layer_height, 4))" } } } From 76bd1cc78c878f7288f8459ed76ec42facf6fc72 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Thu, 31 Mar 2016 16:09:13 +0200 Subject: [PATCH 70/89] JSON: language fixes by Jeroen (CURA-1309) --- resources/machines/fdmprinter.json | 64 +++++++++++++++--------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index 66a00c9a2d..072879c3ab 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -227,7 +227,7 @@ }, "line_width": { "label": "Line Width", - "description": "Width of a single line. Generally, the width of each line should correspond to the width of the nozzle. Slightly reducing this value could produce better prints.", + "description": "Width of a single line. Generally, the width of each line should correspond to the width of the nozzle. However, slightly reducing this value could produce better prints.", "unit": "mm", "min_value": "0.0001", "min_value_warning": "0.2", @@ -438,7 +438,7 @@ }, "skin_outline_count": { "label": "Extra Skin Wall Count", - "description": "Alternate the direction in which the top/bottom layers are printed. Normally they are printed diagonally only. This setting adds the X-only and Y-only directions.", + "description": "Replaces the outermost part of the top/bottom pattern with a number of concentric lines. Using one or two lines improves roofs that start on infill material.", "default": 0, "min_value": "0", "max_value_warning": "10", @@ -455,7 +455,7 @@ }, "remove_overlapping_walls_enabled": { "label": "Remove Overlapping Wall Parts", - "description": "Remove parts of a wall which share an overlap which would result in overextrusion in some places. These overlaps occur in thin pieces in a model and sharp corners.", + "description": "Remove parts of a wall which share an overlap which would result in overextrusion in some places. These overlaps occur in thin parts and sharp corners in models.", "type": "boolean", "default": false, "visible": false, @@ -524,7 +524,7 @@ }, "skin_no_small_gaps_heuristic": { "label": "Ignore small Z gaps", - "description": "When the model has small vertical gaps, about 5% extra computation time can be spent on generating top and bottom skin in these narrow spaces. In such a case set this setting to false.", + "description": "When the model has small vertical gaps, about 5% extra computation time can be spent on generating top and bottom skin in these narrow spaces. In such case, disable the setting", "type": "boolean", "default": true, "visible": false @@ -847,7 +847,7 @@ "children": { "speed_wall_0": { "label": "Outer Wall Speed", - "description": "The speed at which the outermost walls are printed. Printing the outer wall at a lower speed improves the final skin quality. However, having a large difference between the inner wall speed and the outer shell speed will effect quality in a negative way.", + "description": "The speed at which the outermost walls are printed. Printing the outer wall at a lower speed improves the final skin quality. However, having a large difference between the inner wall speed and the outer wall speed will effect quality in a negative way.", "unit": "mm/s", "type": "float", "min_value": "0.1", @@ -881,7 +881,7 @@ }, "speed_support": { "label": "Support Speed", - "description": "The speed at which the support structure is printed. Printing support at higher speeds can greatly improve printing time. The surface quality of the support structure is not important since it is removed after printing.", + "description": "The speed at which the support structure is printed. Printing support at higher speeds can greatly reduce printing time. The surface quality of the support structure is not important since it is removed after printing.", "unit": "mm/s", "type": "float", "min_value": "0.1", @@ -893,7 +893,7 @@ "children": { "speed_support_lines": { "label": "Support Wall Speed", - "description": "The speed at which the walls of support are printed. Printing the walls at higher speeds can improve the overall duration.", + "description": "The speed at which the walls of support are printed. Printing the walls at lower speeds improves stability.", "unit": "mm/s", "type": "float", "default": 60, @@ -956,7 +956,7 @@ }, "speed_slowdown_layers": { "label": "Number of Slower Layers", - "description": "The first few layers are printed slower than the rest of the object, this to get better adhesion to the build plate and improve the overall success rate of prints. The speed is gradually increased over these layers.", + "description": "The first few layers are printed slower than the rest of the object, to get better adhesion to the build plate and improve the overall success rate of prints. The speed is gradually increased over these layers.", "type": "int", "default": 2, "min_value": "0", @@ -973,7 +973,7 @@ "settings": { "retraction_combing": { "label": "Enable Combing", - "description": "Combing keeps the nozzle within already printed areas when traveling. This results in slightly longer travel moves but reduces the need for retractions. If combing is disabled, the nozzle moves in a straight line to the next start point and will retract.", + "description": "Combing keeps the nozzle within already printed areas when traveling. This results in slightly longer travel moves but reduces the need for retractions. If combing is disabled, the nozzle moves in a straight line to the next point and will retract.", "type": "boolean", "default": true, "visible": false, @@ -981,7 +981,7 @@ }, "travel_avoid_other_parts": { "label": "Avoid Printed Parts", - "description": "The nozzle avoids already printed parts when travelling. This option is only available when combing is enabled.", + "description": "The nozzle avoids already printed parts when traveling. This option is only available when combing is enabled.", "type": "boolean", "default": true, "visible": false, @@ -990,7 +990,7 @@ }, "travel_avoid_distance": { "label": "Avoid Distance", - "description": "The distance between the nozzle and already printed parts when avoiding during travel.", + "description": "The distance between the nozzle and already printed parts when avoiding during travel moves.", "unit": "mm", "type": "float", "default": 1.5, @@ -1024,8 +1024,8 @@ "global_only": true }, "coasting_min_volume": { - "label": "Minimal Volume Before Coasting", - "description": "The least volume an extrusion path should have to coast the full amount. For smaller extrusion paths, less pressure has been built up in the bowden tube and so the coasted volume is scaled linearly. This value should always be larger than the Coasting Volume.", + "label": "Minimum Volume Before Coasting", + "description": "The lowest volume an extrusion path should have before allowing coasting. For smaller extrusion paths, less pressure has been built up in the bowden tube and so the coasted volume is scaled linearly. This value should always be larger than the Coasting Volume.", "unit": "mm³", "type": "float", "default": 0.8, @@ -1056,7 +1056,7 @@ "icon": "category_cool", "settings": { "cool_fan_enabled": { - "label": "Enable Cooling Fan", + "label": "Enable Cooling Fans", "description": "Enables the cooling fans while printing. The fans improve print quality on layers with short layer times and bridging / overhangs.", "type": "boolean", "default": true, @@ -1115,7 +1115,7 @@ }, "cool_fan_full_at_height": { "label": "Regular fan speed at height", - "description": "The height at which the fan spins on regular fan speed. At the layers below the fan speed gradually increases from zero to regular fan speed.", + "description": "The height at which the fans spin on regular fan speed. At the layers below the fan speed gradually increases from zero to regular fan speed.", "unit": "mm", "type": "float", "default": 0.5, @@ -1127,7 +1127,7 @@ "children": { "cool_fan_full_layer": { "label": "Regular fan speed at layer", - "description": "The layer at which the fan spins on regular fan speed. If regular fan speed at height is set, this value is calculated and rounded to a whole number.", + "description": "The layer at which the fans spin on regular fan speed. If regular fan speed at height is set, this value is calculated and rounded to a whole number.", "type": "int", "default": 1, "min_value": "0", @@ -1140,7 +1140,7 @@ }, "cool_min_layer_time": { "label": "Minimum Layer Time", - "description": "The minimum time spent in a layer. Forces the printer to slow down, to at least take the time set here to spend in one layer. This allows the printed material to cool down properly before printing the next layer.", + "description": "The minimum time spent in a layer. This forces the printer to slow down, to at least spend the time set here in one layer. This allows the printed material to cool down properly before printing the next layer.", "unit": "sec", "type": "float", "default": 5, @@ -1151,7 +1151,7 @@ }, "cool_min_speed": { "label": "Minimum Speed", - "description": "The minimum speed at which the printer is forced to print at, no matter how much the minimum layer time slows it down. When the printer would slow down too much, the pressure in the nozzle would be too low and result in bad print quality.", + "description": "The minimum print speed, despite slowing down due to the minimum layer time. When the printer would slow down too much, the pressure in the nozzle would be too low and result in bad print quality.", "unit": "mm/s", "type": "float", "default": 10, @@ -1170,7 +1170,7 @@ }, "draft_shield_enabled": { "label": "Enable Draft Shield", - "description": "Enables an exterior draft shield. This will create a wall around the object which traps (hot) air and shields against gusts of wind. Especially useful for materials which warp easily.", + "description": "This will create a wall around the object, which traps (hot) air and shields against exterior airflow. Especially useful for materials which warp easily.", "type": "boolean", "default": false, "global_only": true @@ -1189,7 +1189,7 @@ }, "draft_shield_height_limitation": { "label": "Draft Shield Limitation", - "description": "Enable the height limit of the draft shield.", + "description": "Set the height of the draft shield. Choose to print the draft shield at the full height of the object or at a limited height.", "type": "enum", "options": { "full": "Full", @@ -1222,13 +1222,13 @@ "settings": { "support_enable": { "label": "Enable Support", - "description": "Enable support structures. The support structures prevent the model from printing mid-air.", + "description": "Enable support structures. These structures support parts of the model with severe overhangs.", "type": "boolean", "default": false }, "support_type": { "label": "Placement", - "description": "Adjusts the placement type of the support structures. The placement can be set to touching build plate or everywhere.", + "description": "Adjusts the placement of the support structures. The placement can be set to touching build plate or everywhere. When set to everywhere the support structures will also be printed on the model.", "type": "enum", "options": { "buildplate": "Touching Buildplate", @@ -1239,7 +1239,7 @@ }, "support_angle": { "label": "Overhang Angle", - "description": "The maximum angle of overhangs for which support is added. At a value of 0° all overhangs are supported, 90° will not provide any support.", + "description": "The minimum angle of overhangs for which support is added. At a value of 0° all overhangs are supported, 90° will not provide any support.", "unit": "°", "type": "float", "min_value": "0", @@ -1250,7 +1250,7 @@ }, "support_pattern": { "label": "Support Pattern", - "description": "The pattern of the support structures of the print.", + "description": "The pattern of the support structures of the print. The different options available result in sturdy or easy to remove support.", "type": "enum", "options": { "lines": "Lines", @@ -1266,7 +1266,7 @@ }, "support_connect_zigzags": { "label": "Connect ZigZags", - "description": "Connect the ZigZags. Makes them harder to remove, but prevents stringing of disconnected zigzags.", + "description": "Connect the ZigZags. This will increase the strength of the zig zag support structure.", "type": "boolean", "default": true, "visible": false, @@ -1312,7 +1312,7 @@ }, "support_z_distance": { "label": "Z Distance", - "description": "Distance from the top/bottom of the support structure to the print. This gap provides clearance to remove the supports after the model is printed.", + "description": "Distance from the top/bottom of the support structure to the print. This gap provides clearance to remove the supports after the model is printed. This value is rounded down to a multiple of the layer height.", "unit": "mm", "type": "float", "min_value": "0", @@ -1348,7 +1348,7 @@ }, "support_bottom_stair_step_height": { "label": "Stair Step Height", - "description": "The height of the steps of the stair-like bottom of support resting on the model. A low value makes the support harder to remove, a high value makes the support easier to remove.", + "description": "The height of the steps of the stair-like bottom of support resting on the model. A low value makes the support harder to remove, but too high values can lead to unstable support structures.", "unit": "mm", "type": "float", "default": 0.3, @@ -1359,7 +1359,7 @@ }, "support_join_distance": { "label": "Join Distance", - "description": "The maximum distance between support blocks in the X/Y directions. When the structures are closer together than this value, the structures merge into one.", + "description": "The maximum distance between support structures in the X/Y directions. When seperate structures are closer together than this value, the structures merge into one.", "unit": "mm", "type": "float", "default": 2.0, @@ -1392,7 +1392,7 @@ }, "support_roof_enable": { "label": "Enable Support Roof", - "description": "Generate a dense top skin at the top of the support on which the model sits.", + "description": "Generate a dense top skin at the top of the support on which the model is printed.", "type": "boolean", "default": false, "visible": true, @@ -1400,7 +1400,7 @@ }, "support_roof_height": { "label": "Support Roof Thickness", - "description": "The height of the support roofs.", + "description": "The thickness of the support roofs.", "unit": "mm", "type": "float", "default": 1, @@ -1473,7 +1473,7 @@ }, "support_conical_min_width": { "label": "Cone minimal width", - "description": "Minimal width to which conical support reduces the support areas. Small widths can cause the base of the support to not act well as foundation for support above.", + "description": "Minimal width to which the base of the conical support area is reduced. Small widths can lead to unstable support structures.", "unit": "mm", "default": 5.0, "min_value": "0", @@ -1517,7 +1517,7 @@ }, "support_tower_roof_angle": { "label": "Tower Roof Angle", - "description": "The angle of a rooftop of a tower. A higher value results in pointed tower roofs, a lower value results in flattened tower roofs. Support pattern: Adjusts the pattern of the support structure.", + "description": "The angle of a rooftop of a tower. A higher value results in pointed tower roofs, a lower value results in flattened tower roofs.", "unit": "°", "type": "int", "min_value": "0", From 6951b78ee02d7b1fea3cc7f33627b374171a0b1f Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 31 Mar 2016 16:45:15 +0200 Subject: [PATCH 71/89] Set magic_fuzzy_skin_thickness min value to 0.001 CURA-1125 --- resources/machines/fdmprinter.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index b42492dbe5..1deef3a28a 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -1953,7 +1953,7 @@ "type": "float", "unit": "mm", "default": 0.3, - "min_value": "0", + "min_value": "0.001", "max_value_warning": "wall_line_width_0", "visible": false, "enabled": "magic_fuzzy_skin_enabled" From 29de13a6613d8bfd814971f73fa3b8823151860f Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Thu, 31 Mar 2016 16:51:06 +0200 Subject: [PATCH 72/89] JSON: removed setting description override (CURA-1309) Proposed by Jeroen and backed by Tim. The new global description precludes everything said in the override description already now --- resources/machines/ultimaker2.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/machines/ultimaker2.json b/resources/machines/ultimaker2.json index fed01312de..1274cff8cf 100644 --- a/resources/machines/ultimaker2.json +++ b/resources/machines/ultimaker2.json @@ -67,7 +67,7 @@ ] }, "machine_center_is_zero": { "default": false }, - "machine_nozzle_size": { "default": 0.4, "min_value": "0.001", "description": "The inner diameter of the nozzle. If you are using an Olsson Block with a non-standard nozzle diameter, set this field to the diameter you are using." }, + "machine_nozzle_size": { "default": 0.4, "min_value": "0.001"}, "machine_nozzle_heat_up_speed": { "default": 2.0 }, "machine_nozzle_cool_down_speed": { "default": 2.0 }, "gantry_height": { "default": 55 }, From e463c93f77a8015b00ab49aa7b8f9f6433cba26b Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 31 Mar 2016 17:35:57 +0200 Subject: [PATCH 73/89] Changed wait for subprocess to poll The wait is a suspect in a MAC issue. CURA-1300 --- plugins/CuraEngineBackend/CuraEngineBackend.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/CuraEngineBackend/CuraEngineBackend.py b/plugins/CuraEngineBackend/CuraEngineBackend.py index 81fc0ab7c2..cf32bfd93a 100644 --- a/plugins/CuraEngineBackend/CuraEngineBackend.py +++ b/plugins/CuraEngineBackend/CuraEngineBackend.py @@ -162,7 +162,7 @@ class CuraEngineBackend(Backend): Logger.log("d", "Killing engine process") try: self._process.terminate() - Logger.log("d", "Engine process is killed. Recieved return code %s", self._process.wait()) + Logger.log("d", "Engine process is killed. Recieved return code %s", self._process.poll()) self._process = None #self._createSocket() # Re create the socket except Exception as e: # terminating a process that is already terminating causes an exception, silently ignore this. @@ -289,6 +289,6 @@ class CuraEngineBackend(Backend): def _onBackendQuit(self): if not self._restart and self._process: - Logger.log("d", "Backend quit with return code %s. Resetting process and socket.", self._process.wait()) + Logger.log("d", "Backend quit with return code %s. Resetting process and socket.", self._process.poll()) self._process = None self._createSocket() From 3a7a1a4baaf0e8d276d66e959dc83f7526f5d76f Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 31 Mar 2016 17:47:15 +0200 Subject: [PATCH 74/89] Remove superfluous spaces Contributes to issue CURA-1309. --- resources/machines/fdmprinter.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index b42492dbe5..18eb961609 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -355,7 +355,7 @@ "label": "Wall Line Count", "description": "The number of walls. When calculated by the wall thickness, this value is rounded to a whole number.", "default": 2, - "min_value": "0", + "min_value": "0", "type": "int", "visible": false, "inherit_function": "1 if magic_spiralize else max(1, round((wall_thickness - wall_line_width_0) / wall_line_width_x) + 1)" @@ -364,7 +364,7 @@ }, "top_bottom_thickness": { "label": "Top/Bottom Thickness", - "description": " The thickness of the top/bottom layers in the print. This value divided by the layer height defines the number of top/bottom layers.", + "description": "The thickness of the top/bottom layers in the print. This value divided by the layer height defines the number of top/bottom layers.", "unit": "mm", "default": 0.8, "min_value": "0", From b11051b281f9d925f16344dbef03e45bd439130a Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 31 Mar 2016 17:56:00 +0200 Subject: [PATCH 75/89] Improve language construction Contributes to issue CURA-1309. --- resources/machines/fdmprinter.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index 18eb961609..bfa84f4259 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -595,7 +595,7 @@ }, "infill_sparse_thickness": { "label": "Infill layer thickness", - "description": "The thickness per layer of infill material. This value should always be a multiplication of the layer height and is otherwise rounded.", + "description": "The thickness per layer of infill material. This value should always be a multiple of the layer height and is otherwise rounded.", "unit": "mm", "type": "float", "default": 0.1, @@ -749,7 +749,7 @@ }, "retraction_extra_prime_amount": { "label": "Retraction Extra Prime Amount", - "description": "Some material can ooze away during a travel move, which can be compensated here.", + "description": "Some material can ooze away during a travel move, which can be compensated for here.", "unit": "mm³", "type": "float", "default": 0, From 538769917413b2b7fdb3ebfc9ea1d1477edef566 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 31 Mar 2016 18:04:26 +0200 Subject: [PATCH 76/89] American spelling Contributes to issue CURA-1309. --- resources/machines/fdmprinter.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index bfa84f4259..57ded4e150 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -973,7 +973,7 @@ "settings": { "retraction_combing": { "label": "Enable Combing", - "description": "Combing keeps the nozzle within already printed areas when traveling. This results in slightly longer travel moves but reduces the need for retractions. If combing is disabled, the nozzle moves in a straight line to the next start point and will retract.", + "description": "Combing keeps the nozzle within already printed areas when traveling. This results in slightly longer travel moves but reduces the need for retractions. If combing is disabled, the material will retract and the nozzle moves in a straight line to the next start point.", "type": "boolean", "default": true, "visible": false, @@ -981,7 +981,7 @@ }, "travel_avoid_other_parts": { "label": "Avoid Printed Parts", - "description": "The nozzle avoids already printed parts when travelling. This option is only available when combing is enabled.", + "description": "The nozzle avoids already printed parts when traveling. This option is only available when combing is enabled.", "type": "boolean", "default": true, "visible": false, From b2042b84f9dcf640b90cc2b6253efd52dbf95bbc Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 31 Mar 2016 18:11:59 +0200 Subject: [PATCH 77/89] Capitalise all setting labels Contributes to issue CURA-1309. --- resources/machines/fdmprinter.json | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index 57ded4e150..328b5e4ce5 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -273,7 +273,7 @@ } }, "skin_line_width": { - "label": "Top/bottom line width", + "label": "Top/bottom Line Width", "description": "Width of a single top/bottom line.", "unit": "mm", "min_value": "0.0001", @@ -284,7 +284,7 @@ "visible": false }, "infill_line_width": { - "label": "Infill line width", + "label": "Infill Line Width", "description": "Width of a single infill line.", "unit": "mm", "min_value": "0.0001", @@ -295,7 +295,7 @@ "visible": false }, "skirt_line_width": { - "label": "Skirt line width", + "label": "Skirt Line Width", "description": "Width of a single skirt line.", "unit": "mm", "min_value": "0.0001", @@ -307,7 +307,7 @@ "global_only": true }, "support_line_width": { - "label": "Support line width", + "label": "Support Line Width", "description": "Width of a single support structure line.", "unit": "mm", "min_value": "0.0001", @@ -320,7 +320,7 @@ "global_only": true }, "support_roof_line_width": { - "label": "Support Roof line width", + "label": "Support Roof Line Width", "description": "Width of a single support roof line.", "unit": "mm", "default": 0.4, @@ -501,7 +501,7 @@ "visible": false }, "xy_offset": { - "label": "Horizontal expansion", + "label": "Horizontal Expansion", "description": "Amount of offset applied to all polygons in each layer. Positive values can compensate for too big holes; negative values can compensate for too small holes.", "unit": "mm", "type": "float", @@ -523,7 +523,7 @@ "visible": false }, "skin_no_small_gaps_heuristic": { - "label": "Ignore small Z gaps", + "label": "Ignore Small Z Gaps", "description": "When the model has small vertical gaps, about 5% extra computation time can be spent on generating top and bottom skin in these narrow spaces. In such a case set this setting to false.", "type": "boolean", "default": true, @@ -594,7 +594,7 @@ "visible": false }, "infill_sparse_thickness": { - "label": "Infill layer thickness", + "label": "Infill Layer Thickness", "description": "The thickness per layer of infill material. This value should always be a multiple of the layer height and is otherwise rounded.", "unit": "mm", "type": "float", @@ -1076,7 +1076,7 @@ "global_only": "True", "children": { "cool_fan_speed_min": { - "label": "Regular fan speed", + "label": "Regular Fan Speed", "description": "The speed at which the fans spin before hitting the threshold. When a layer prints faster than the threshold, the fan speed gradually inclines towards the maximum fan speed.", "unit": "%", "type": "float", @@ -1103,7 +1103,7 @@ } }, "cool_min_layer_time_fan_speed_max": { - "label": "Regular/Maximum Fan Speed threshold", + "label": "Regular/Maximum Fan Speed Threshold", "description": "The layer time which sets the threshold between regular fan speed and maximum fan speed. Layers that print slower than this time use regular fan speed. For faster layers the fan speed gradually increases towards the maximum fan speed.", "unit": "sec", "type": "float", @@ -1114,7 +1114,7 @@ "global_only": "True" }, "cool_fan_full_at_height": { - "label": "Regular fan speed at height", + "label": "Regular Fan Speed at Height", "description": "The height at which the fan spins on regular fan speed. At the layers below the fan speed gradually increases from zero to regular fan speed.", "unit": "mm", "type": "float", @@ -1126,7 +1126,7 @@ "global_only": "True", "children": { "cool_fan_full_layer": { - "label": "Regular fan speed at layer", + "label": "Regular Fan Speed at Layer", "description": "The layer at which the fan spins on regular fan speed. If regular fan speed at height is set, this value is calculated and rounded to a whole number.", "type": "int", "default": 1, @@ -1472,7 +1472,7 @@ "enabled": "support_conical_enabled and support_enable" }, "support_conical_min_width": { - "label": "Cone minimal width", + "label": "Cone Minimal Width", "description": "Minimal width to which conical support reduces the support areas. Small widths can cause the base of the support to not act well as foundation for support above.", "unit": "mm", "default": 5.0, @@ -1484,7 +1484,7 @@ "enabled": "support_conical_enabled and support_enable" }, "support_use_towers": { - "label": "Use towers", + "label": "Use Towers", "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": "boolean", "default": true, @@ -1901,7 +1901,7 @@ "icon": "category_blackmagic", "settings": { "print_sequence": { - "label": "Print sequence", + "label": "Print Sequence", "description": "Whether to print all objects one layer at a time or to wait for one object to finish, before moving on to the next. One at a time mode is only possible if all models are separated in such a way that the whole print head can move in between and all models are lower than the distance between the nozzle and the X/Y axes.", "type": "enum", "options": { From 53018b49a4cc3fcd3b281348e95b19d41c09b18b Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 31 Mar 2016 18:26:20 +0200 Subject: [PATCH 78/89] Restore Extra Skin Wall Count description Contributes to issue CURA-1309. --- resources/machines/fdmprinter.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index 328b5e4ce5..72b33224a5 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -438,7 +438,7 @@ }, "skin_outline_count": { "label": "Extra Skin Wall Count", - "description": "Alternate the direction in which the top/bottom layers are printed. Normally they are printed diagonally only. This setting adds the X-only and Y-only directions.", + "description": "Number of lines around skin regions. Using one or two skin perimeter lines can greatly improve roofs which would start in the middle of infill cells.", "default": 0, "min_value": "0", "max_value_warning": "10", From 2d86606b5a4c01484e0efa3f4d3894dd8f2c9fef Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 31 Mar 2016 18:31:04 +0200 Subject: [PATCH 79/89] Use double quotes for string Contributes to issue CURA-1309. --- resources/machines/fdmprinter.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index 72b33224a5..8fc69ea300 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -1270,7 +1270,7 @@ "type": "boolean", "default": true, "visible": false, - "enabled": "support_enable and (support_pattern == 'zigzag')", + "enabled": "support_enable and (support_pattern == \"zigzag\")", "global_only": true }, "support_infill_rate": { From f4ca245271bd925d9ee6d3ae49b89b96c7388108 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 1 Apr 2016 11:47:30 +0200 Subject: [PATCH 80/89] Update translation templates Templates are auto-generated from source. Contributes to issue CURA-1190. --- resources/i18n/cura.pot | 2 +- resources/i18n/fdmprinter.json.pot | 1742 ++++------------------------ 2 files changed, 258 insertions(+), 1486 deletions(-) diff --git a/resources/i18n/cura.pot b/resources/i18n/cura.pot index 7ad208cdd3..3b0946f58f 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-03-23 16:40+0100\n" +"POT-Creation-Date: 2016-04-01 10:50+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/resources/i18n/fdmprinter.json.pot b/resources/i18n/fdmprinter.json.pot index b16ad8c617..7049db0f30 100644 --- a/resources/i18n/fdmprinter.json.pot +++ b/resources/i18n/fdmprinter.json.pot @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: Uranium json setting files\n" "Report-Msgid-Bugs-To: http://github.com/ultimaker/uranium\n" -"POT-Creation-Date: 2016-03-23 16:40+0000\n" +"POT-Creation-Date: 2016-04-01 10:50+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE\n" @@ -23,7 +23,9 @@ msgstr "" #: fdmprinter.json msgctxt "machine_nozzle_size description" -msgid "The inner diameter of the nozzle." +msgid "" +"The inner diameter of the nozzle. Change this setting when using a non-" +"standard nozzle size." msgstr "" #: fdmprinter.json @@ -39,10 +41,8 @@ msgstr "" #: fdmprinter.json msgctxt "layer_height description" msgid "" -"The height of each layer, in mm. Normal quality prints are 0.1mm, high " -"quality is 0.06mm. You can go up to 0.25mm with an Ultimaker for very fast " -"prints at low quality. For most purposes, layer heights between 0.1 and " -"0.2mm give a good tradeoff of speed and surface finish." +"The height of each layer in mm. Higher values produce faster prints in lower " +"resolution, lower values produce slower prints in higher resolution." msgstr "" #: fdmprinter.json @@ -53,8 +53,8 @@ msgstr "" #: fdmprinter.json msgctxt "layer_height_0 description" msgid "" -"The layer height of the bottom layer. A thicker bottom layer makes sticking " -"to the bed easier." +"The height of the initial layer in mm. A thicker initial layer makes " +"adhesion to the build plate easier." msgstr "" #: fdmprinter.json @@ -65,10 +65,9 @@ msgstr "" #: fdmprinter.json msgctxt "line_width description" msgid "" -"Width of a single line. Each line will be printed with this width in mind. " -"Generally the width of each line should correspond to the width of your " -"nozzle, but for the outer wall and top/bottom surface smaller line widths " -"may be chosen, for higher quality." +"Width of a single line. Generally, the width of each line should correspond " +"to the width of the nozzle. However, slightly reducing this value could " +"produce better prints." msgstr "" #: fdmprinter.json @@ -78,9 +77,7 @@ msgstr "" #: fdmprinter.json msgctxt "wall_line_width description" -msgid "" -"Width of a single shell line. Each line of the shell will be printed with " -"this width in mind." +msgid "Width of a single wall line." msgstr "" #: fdmprinter.json @@ -91,8 +88,8 @@ msgstr "" #: fdmprinter.json msgctxt "wall_line_width_0 description" msgid "" -"Width of the outermost shell line. By printing a thinner outermost wall line " -"you can print higher details with a larger nozzle." +"Width of the outermost wall line. By lowering this value, higher levels of " +"detail can be printed." msgstr "" #: fdmprinter.json @@ -103,12 +100,32 @@ msgstr "" #: fdmprinter.json msgctxt "wall_line_width_x description" msgid "" -"Width of a single shell line for all shell lines except the outermost one." +"Width of a single wall line for all wall lines except the outermost one." +msgstr "" + +#: fdmprinter.json +msgctxt "skin_line_width label" +msgid "Top/bottom Line Width" +msgstr "" + +#: fdmprinter.json +msgctxt "skin_line_width description" +msgid "Width of a single top/bottom line." +msgstr "" + +#: fdmprinter.json +msgctxt "infill_line_width label" +msgid "Infill Line Width" +msgstr "" + +#: fdmprinter.json +msgctxt "infill_line_width description" +msgid "Width of a single infill line." msgstr "" #: fdmprinter.json msgctxt "skirt_line_width label" -msgid "Skirt line width" +msgid "Skirt Line Width" msgstr "" #: fdmprinter.json @@ -116,47 +133,24 @@ msgctxt "skirt_line_width description" msgid "Width of a single skirt line." msgstr "" -#: fdmprinter.json -msgctxt "skin_line_width label" -msgid "Top/bottom line width" -msgstr "" - -#: fdmprinter.json -msgctxt "skin_line_width description" -msgid "" -"Width of a single top/bottom printed line, used to fill up the top/bottom " -"areas of a print." -msgstr "" - -#: fdmprinter.json -msgctxt "infill_line_width label" -msgid "Infill line width" -msgstr "" - -#: fdmprinter.json -msgctxt "infill_line_width description" -msgid "Width of the inner infill printed lines." -msgstr "" - #: fdmprinter.json msgctxt "support_line_width label" -msgid "Support line width" +msgid "Support Line Width" msgstr "" #: fdmprinter.json msgctxt "support_line_width description" -msgid "Width of the printed support structures lines." +msgid "Width of a single support structure line." msgstr "" #: fdmprinter.json msgctxt "support_roof_line_width label" -msgid "Support Roof line width" +msgid "Support Roof Line Width" msgstr "" #: fdmprinter.json msgctxt "support_roof_line_width description" -msgid "" -"Width of a single support roof line, used to fill the top of the support." +msgid "Width of a single support roof line." msgstr "" #: fdmprinter.json @@ -164,20 +158,6 @@ msgctxt "shell label" msgid "Shell" msgstr "" -#: fdmprinter.json -msgctxt "shell_thickness label" -msgid "Shell Thickness" -msgstr "" - -#: fdmprinter.json -msgctxt "shell_thickness description" -msgid "" -"The thickness of the outside shell in the horizontal and vertical direction. " -"This is used in combination with the nozzle size to define the number of " -"perimeter lines and the thickness of those perimeter lines. This is also " -"used to define the number of solid top and bottom layers." -msgstr "" - #: fdmprinter.json msgctxt "wall_thickness label" msgid "Wall Thickness" @@ -186,9 +166,8 @@ msgstr "" #: fdmprinter.json msgctxt "wall_thickness description" msgid "" -"The thickness of the outside walls in the horizontal direction. This is used " -"in combination with the nozzle size to define the number of perimeter lines " -"and the thickness of those perimeter lines." +"The thickness of the outside walls in the horizontal direction. This value " +"divided by the wall line width defines the number of walls." msgstr "" #: fdmprinter.json @@ -199,22 +178,20 @@ msgstr "" #: fdmprinter.json msgctxt "wall_line_count description" msgid "" -"Number of shell lines. These lines are called perimeter lines in other tools " -"and impact the strength and structural integrity of your print." +"The number of walls. When calculated by the wall thickness, this value is " +"rounded to a whole number." msgstr "" #: fdmprinter.json msgctxt "top_bottom_thickness label" -msgid "Bottom/Top Thickness" +msgid "Top/Bottom Thickness" msgstr "" #: fdmprinter.json msgctxt "top_bottom_thickness description" msgid "" -"This controls the thickness of the bottom and top layers. The number of " -"solid layers put down is calculated from the layer thickness and this value. " -"Having this value a multiple of the layer thickness makes sense. Keep it " -"near your wall thickness to make an evenly strong part." +"The thickness of the top/bottom layers in the print. This value divided by " +"the layer height defines the number of top/bottom layers." msgstr "" #: fdmprinter.json @@ -225,10 +202,8 @@ msgstr "" #: fdmprinter.json msgctxt "top_thickness description" msgid "" -"This controls the thickness of the top layers. The number of solid layers " -"printed is calculated from the layer thickness and this value. Having this " -"value be a multiple of the layer thickness makes sense. Keep it near your " -"wall thickness to make an evenly strong part." +"The thickness of the top layers in the print. This value divided by the " +"layer height defines the number of top layers." msgstr "" #: fdmprinter.json @@ -238,7 +213,9 @@ msgstr "" #: fdmprinter.json msgctxt "top_layers description" -msgid "This controls the number of top layers." +msgid "" +"The number of top layers. When calculated by the top thickness, this value " +"is rounded to a whole number." msgstr "" #: fdmprinter.json @@ -249,10 +226,8 @@ msgstr "" #: fdmprinter.json msgctxt "bottom_thickness description" msgid "" -"This controls the thickness of the bottom layers. The number of solid layers " -"printed is calculated from the layer thickness and this value. Having this " -"value be a multiple of the layer thickness makes sense. And keep it near to " -"your wall thickness to make an evenly strong part." +"The thickness of the bottom layers in the print. This value divided by the " +"layer height defines the number of bottom layers." msgstr "" #: fdmprinter.json @@ -262,7 +237,60 @@ msgstr "" #: fdmprinter.json msgctxt "bottom_layers description" -msgid "This controls the amount of bottom layers." +msgid "" +"The number of bottom layers. When calculated by the bottom thickness, this " +"value is rounded to a whole number." +msgstr "" + +#: fdmprinter.json +msgctxt "top_bottom_pattern label" +msgid "Top/Bottom Pattern" +msgstr "" + +#: fdmprinter.json +msgctxt "top_bottom_pattern description" +msgid "The pattern of the top/bottom layers." +msgstr "" + +#: fdmprinter.json +msgctxt "top_bottom_pattern option lines" +msgid "Lines" +msgstr "" + +#: fdmprinter.json +msgctxt "top_bottom_pattern option concentric" +msgid "Concentric" +msgstr "" + +#: fdmprinter.json +msgctxt "top_bottom_pattern option zigzag" +msgid "Zig Zag" +msgstr "" + +#: fdmprinter.json +msgctxt "skin_alternate_rotation label" +msgid "Alternate Skin Rotation" +msgstr "" + +#: fdmprinter.json +msgctxt "skin_alternate_rotation description" +msgid "" +"Alternate the direction in which the top/bottom layers are printed. Normally " +"they are printed diagonally only. This setting adds the X-only and Y-only " +"directions." +msgstr "" + +#: fdmprinter.json +msgctxt "skin_outline_count label" +msgid "Extra Skin Wall Count" +msgstr "" + +#: fdmprinter.json +msgctxt "skin_outline_count description" +msgid "" +"Replaces the outermost part of the top/bottom pattern with a number of " +"concentric lines. Using one or two lines improves roofs that start on infill " +"material." msgstr "" #: fdmprinter.json @@ -273,9 +301,8 @@ msgstr "" #: fdmprinter.json msgctxt "alternate_extra_perimeter description" msgid "" -"Make an extra wall at every second layer, so that infill will be caught " -"between an extra wall above and one below. This results in a better cohesion " -"between infill and walls, but might have an impact on the surface quality." +"Prints an extra wall at every other layer. This way infill gets caught " +"between these extra walls, resulting in stronger prints." msgstr "" #: fdmprinter.json @@ -287,8 +314,8 @@ msgstr "" msgctxt "remove_overlapping_walls_enabled description" msgid "" "Remove parts of a wall which share an overlap which would result in " -"overextrusion in some places. These overlaps occur in thin pieces in a model " -"and sharp corners." +"overextrusion in some places. These overlaps occur in thin parts and sharp " +"corners in models." msgstr "" #: fdmprinter.json @@ -312,22 +339,8 @@ msgstr "" #: fdmprinter.json msgctxt "remove_overlapping_walls_x_enabled description" msgid "" -"Remove parts of an inner wall which share an overlap which would result in " -"overextrusion in some places. These overlaps occur in thin pieces in a model " -"and sharp corners." -msgstr "" - -#: fdmprinter.json -msgctxt "travel_compensate_overlapping_walls_enabled label" -msgid "Compensate Wall Overlaps" -msgstr "" - -#: fdmprinter.json -msgctxt "travel_compensate_overlapping_walls_enabled description" -msgid "" -"Compensate the flow for parts of a wall being laid down where there already " -"is a piece of a wall. These overlaps occur in thin pieces in a model. Gcode " -"generation might be slowed down considerably." +"Remove parts of an inner wall that would otherwise overlap and cause over-" +"extrusion. These overlaps occur in thin pieces in a model and sharp corners." msgstr "" #: fdmprinter.json @@ -338,9 +351,7 @@ msgstr "" #: fdmprinter.json msgctxt "fill_perimeter_gaps description" msgid "" -"Fill the gaps created by walls where they would otherwise be overlapping. " -"This will also fill thin walls. Optionally only the gaps occurring within " -"the top and bottom skin can be filled." +"Fills the gaps between walls when overlapping inner wall parts are removed." msgstr "" #: fdmprinter.json @@ -359,74 +370,20 @@ msgid "Skin" msgstr "" #: fdmprinter.json -msgctxt "top_bottom_pattern label" -msgid "Bottom/Top Pattern" +msgctxt "travel_compensate_overlapping_walls_enabled label" +msgid "Compensate Wall Overlaps" msgstr "" #: fdmprinter.json -msgctxt "top_bottom_pattern description" +msgctxt "travel_compensate_overlapping_walls_enabled description" msgid "" -"Pattern of the top/bottom solid fill. This is normally done with lines to " -"get the best possible finish, but in some cases a concentric fill gives a " -"nicer end result." -msgstr "" - -#: fdmprinter.json -msgctxt "top_bottom_pattern option lines" -msgid "Lines" -msgstr "" - -#: fdmprinter.json -msgctxt "top_bottom_pattern option concentric" -msgid "Concentric" -msgstr "" - -#: fdmprinter.json -msgctxt "top_bottom_pattern option zigzag" -msgid "Zig Zag" -msgstr "" - -#: fdmprinter.json -msgctxt "skin_no_small_gaps_heuristic label" -msgid "Ignore small Z gaps" -msgstr "" - -#: fdmprinter.json -msgctxt "skin_no_small_gaps_heuristic description" -msgid "" -"When the model has small vertical gaps, about 5% extra computation time can " -"be spent on generating top and bottom skin in these narrow spaces. In such a " -"case set this setting to false." -msgstr "" - -#: fdmprinter.json -msgctxt "skin_alternate_rotation label" -msgid "Alternate Skin Rotation" -msgstr "" - -#: fdmprinter.json -msgctxt "skin_alternate_rotation description" -msgid "" -"Alternate between diagonal skin fill and horizontal + vertical skin fill. " -"Although the diagonal directions can print quicker, this option can improve " -"the printing quality by reducing the pillowing effect." -msgstr "" - -#: fdmprinter.json -msgctxt "skin_outline_count label" -msgid "Extra Skin Wall Count" -msgstr "" - -#: fdmprinter.json -msgctxt "skin_outline_count description" -msgid "" -"Number of lines around skin regions. Using one or two skin perimeter lines " -"can greatly improve roofs which would start in the middle of infill cells." +"Compensate the flow for parts of a wall being printed where there is already " +"a wall in place." msgstr "" #: fdmprinter.json msgctxt "xy_offset label" -msgid "Horizontal expansion" +msgid "Horizontal Expansion" msgstr "" #: fdmprinter.json @@ -467,6 +424,19 @@ msgctxt "z_seam_type option random" msgid "Random" msgstr "" +#: fdmprinter.json +msgctxt "skin_no_small_gaps_heuristic label" +msgid "Ignore Small Z Gaps" +msgstr "" + +#: fdmprinter.json +msgctxt "skin_no_small_gaps_heuristic description" +msgid "" +"When the model has small vertical gaps, about 5% extra computation time can " +"be spent on generating top and bottom skin in these narrow spaces. In such " +"case, disable the setting." +msgstr "" + #: fdmprinter.json msgctxt "infill label" msgid "Infill" @@ -479,21 +449,19 @@ msgstr "" #: fdmprinter.json msgctxt "infill_sparse_density description" -msgid "" -"This controls how densely filled the insides of your print will be. For a " -"solid part use 100%, for a hollow part use 0%. A value around 20% is usually " -"enough. This setting won't affect the outside of the print and only adjusts " -"how strong the part becomes." +msgid "Adjusts the density of infill of the print." msgstr "" #: fdmprinter.json msgctxt "infill_line_distance label" -msgid "Line distance" +msgid "Line Distance" msgstr "" #: fdmprinter.json msgctxt "infill_line_distance description" -msgid "Distance between the printed infill lines." +msgid "" +"Distance between the printed infill lines. This setting is calculated by the " +"infill density and the infill line width." msgstr "" #: fdmprinter.json @@ -504,10 +472,9 @@ msgstr "" #: fdmprinter.json msgctxt "infill_pattern description" msgid "" -"Cura defaults to switching between grid and line infill, but with this " -"setting visible you can control this yourself. The line infill swaps " -"direction on alternate layers of infill, while the grid prints the full " -"cross-hatching on each layer of infill." +"The pattern of the infill material of the print. The line and zig zag infill " +"swap direction on alternate layers, reducing material cost. The grid, " +"triangle and concentric patterns are fully printed every layer." msgstr "" #: fdmprinter.json @@ -562,15 +529,14 @@ msgstr "" #: fdmprinter.json msgctxt "infill_sparse_thickness label" -msgid "Infill Thickness" +msgid "Infill Layer Thickness" msgstr "" #: fdmprinter.json msgctxt "infill_sparse_thickness description" msgid "" -"The thickness of the sparse infill. This is rounded to a multiple of the " -"layerheight and used to print the sparse-infill in fewer, thicker layers to " -"save printing time." +"The thickness per layer of infill material. This value should always be a " +"multiple of the layer height and is otherwise rounded." msgstr "" #: fdmprinter.json @@ -612,9 +578,7 @@ msgstr "" #: fdmprinter.json msgctxt "material_print_temperature description" msgid "" -"The temperature used for printing. Set at 0 to pre-heat yourself. For PLA a " -"value of 210C is usually used.\n" -"For ABS a value of 230C or higher is required." +"The temperature used for printing. Set at 0 to pre-heat the printer manually." msgstr "" #: fdmprinter.json @@ -649,8 +613,8 @@ msgstr "" #: fdmprinter.json msgctxt "material_bed_temperature description" msgid "" -"The temperature used for the heated printer bed. Set at 0 to pre-heat it " -"yourself." +"The temperature used for the heated bed. Set at 0 to pre-heat the printer " +"manually." msgstr "" #: fdmprinter.json @@ -661,10 +625,8 @@ msgstr "" #: fdmprinter.json msgctxt "material_diameter description" msgid "" -"The diameter of your filament needs to be measured as accurately as " -"possible.\n" -"If you cannot measure this value you will have to calibrate it; a higher " -"number means less extrusion, a smaller number generates more extrusion." +"Adjusts the diameter of the filament used. Match this value with the " +"diameter of the used filament." msgstr "" #: fdmprinter.json @@ -688,7 +650,6 @@ msgstr "" msgctxt "retraction_enable description" msgid "" "Retract the filament when the nozzle is moving over a non-printed area. " -"Details about the retraction can be configured in the advanced tab." msgstr "" #: fdmprinter.json @@ -698,10 +659,7 @@ msgstr "" #: fdmprinter.json msgctxt "retraction_amount description" -msgid "" -"The amount of retraction: Set at 0 for no retraction at all. A value of " -"4.5mm seems to generate good results for 3mm filament in bowden tube fed " -"printers." +msgid "The length of material retracted during a retraction move." msgstr "" #: fdmprinter.json @@ -712,8 +670,8 @@ msgstr "" #: fdmprinter.json msgctxt "retraction_speed description" msgid "" -"The speed at which the filament is retracted. A higher retraction speed " -"works better, but a very high retraction speed can lead to filament grinding." +"The speed at which the filament is retracted and primed during a retraction " +"move." msgstr "" #: fdmprinter.json @@ -723,9 +681,7 @@ msgstr "" #: fdmprinter.json msgctxt "retraction_retract_speed description" -msgid "" -"The speed at which the filament is retracted. A higher retraction speed " -"works better, but a very high retraction speed can lead to filament grinding." +msgid "The speed at which the filament is retracted during a retraction move." msgstr "" #: fdmprinter.json @@ -735,7 +691,7 @@ msgstr "" #: fdmprinter.json msgctxt "retraction_prime_speed description" -msgid "The speed at which the filament is pushed back after retraction." +msgid "The speed at which the filament is primed during a retraction move." msgstr "" #: fdmprinter.json @@ -746,8 +702,8 @@ msgstr "" #: fdmprinter.json msgctxt "retraction_extra_prime_amount description" msgid "" -"The amount of material extruded after a retraction. During a travel move, " -"some material might get lost and so we need to compensate for this." +"Some material can ooze away during a travel move, which can be compensated " +"for here." msgstr "" #: fdmprinter.json @@ -770,8 +726,8 @@ msgstr "" #: fdmprinter.json msgctxt "retraction_count_max description" msgid "" -"This setting limits the number of retractions occurring within the Minimum " -"Extrusion Distance Window. Further retractions within this window will be " +"This setting limits the number of retractions occurring within the minimum " +"extrusion distance window. Further retractions within this window will be " "ignored. This avoids retracting repeatedly on the same piece of filament, as " "that can flatten the filament and cause grinding issues." msgstr "" @@ -784,8 +740,8 @@ msgstr "" #: fdmprinter.json msgctxt "retraction_extrusion_window description" msgid "" -"The window in which the Maximum Retraction Count is enforced. This value " -"should be approximately the same as the Retraction distance, so that " +"The window in which the maximum retraction count is enforced. This value " +"should be approximately the same as the retraction distance, so that " "effectively the number of times a retraction passes the same patch of " "material is limited." msgstr "" @@ -798,9 +754,10 @@ msgstr "" #: fdmprinter.json msgctxt "retraction_hop description" msgid "" -"Whenever a retraction is done, the head is lifted by this amount to travel " -"over the print. A value of 0.075 works well. This feature has a large " -"positive effect on delta towers." +"Whenever a retraction is done, the build plate is lowered to create " +"clearance between the nozzle and the print. It prevents the nozzle from " +"hitting the print during travel moves, reducing the chance to knock the " +"print from the build plate." msgstr "" #: fdmprinter.json @@ -815,11 +772,7 @@ msgstr "" #: fdmprinter.json msgctxt "speed_print description" -msgid "" -"The speed at which printing happens. A well-adjusted Ultimaker can reach " -"150mm/s, but for good quality prints you will want to print slower. Printing " -"speed depends on a lot of factors, so you will need to experiment with " -"optimal settings for this." +msgid "The speed at which printing happens." msgstr "" #: fdmprinter.json @@ -829,9 +782,7 @@ msgstr "" #: fdmprinter.json msgctxt "speed_infill description" -msgid "" -"The speed at which infill parts are printed. Printing the infill faster can " -"greatly reduce printing time, but this can negatively affect print quality." +msgid "The speed at which infill is printed." msgstr "" #: fdmprinter.json @@ -841,9 +792,7 @@ msgstr "" #: fdmprinter.json msgctxt "speed_wall description" -msgid "" -"The speed at which the shell is printed. Printing the outer shell at a lower " -"speed improves the final skin quality." +msgid "The speed at which the walls are printed." msgstr "" #: fdmprinter.json @@ -854,10 +803,10 @@ msgstr "" #: fdmprinter.json msgctxt "speed_wall_0 description" msgid "" -"The speed at which the outer shell is printed. Printing the outer shell at a " -"lower speed improves the final skin quality. However, having a large " -"difference between the inner shell speed and the outer shell speed will " -"effect quality in a negative way." +"The speed at which the outermost walls are printed. Printing the outer wall " +"at a lower speed improves the final skin quality. However, having a large " +"difference between the inner wall speed and the outer wall speed will effect " +"quality in a negative way." msgstr "" #: fdmprinter.json @@ -868,9 +817,9 @@ msgstr "" #: fdmprinter.json msgctxt "speed_wall_x description" msgid "" -"The speed at which all inner shells are printed. Printing the inner shell " -"faster than the outer shell will reduce printing time. It works well to set " -"this in between the outer shell speed and the infill speed." +"The speed at which all inner walls are printed Printing the inner wall " +"faster than the outer wall will reduce printing time. It works well to set " +"this in between the outer wall speed and the infill speed." msgstr "" #: fdmprinter.json @@ -880,10 +829,7 @@ msgstr "" #: fdmprinter.json msgctxt "speed_topbottom description" -msgid "" -"Speed at which top/bottom parts are printed. Printing the top/bottom faster " -"can greatly reduce printing time, but this can negatively affect print " -"quality." +msgid "The speed at which top/bottom layers are printed." msgstr "" #: fdmprinter.json @@ -894,10 +840,9 @@ msgstr "" #: fdmprinter.json msgctxt "speed_support description" msgid "" -"The speed at which exterior support is printed. Printing exterior supports " -"at higher speeds can greatly improve printing time. The surface quality of " -"exterior support is usually not important anyway, so higher speeds can be " -"used." +"The speed at which the support structure is printed. Printing support at " +"higher speeds can greatly reduce printing time. The surface quality of the " +"support structure is not important since it is removed after printing." msgstr "" #: fdmprinter.json @@ -908,8 +853,8 @@ msgstr "" #: fdmprinter.json msgctxt "speed_support_lines description" msgid "" -"The speed at which the walls of exterior support are printed. Printing the " -"walls at higher speeds can improve the overall duration." +"The speed at which the walls of support are printed. Printing the walls at " +"lower speeds improves stability." msgstr "" #: fdmprinter.json @@ -920,8 +865,8 @@ msgstr "" #: fdmprinter.json msgctxt "speed_support_roof description" msgid "" -"The speed at which the roofs of exterior support are printed. Printing the " -"support roof at lower speeds can improve overhang quality." +"The speed at which the roofs of support are printed. Printing the support " +"roof at lower speeds can improve overhang quality." msgstr "" #: fdmprinter.json @@ -931,21 +876,19 @@ msgstr "" #: fdmprinter.json msgctxt "speed_travel description" -msgid "" -"The speed at which travel moves are done. A well-built Ultimaker can reach " -"speeds of 250mm/s, but some machines might have misaligned layers then." +msgid "The speed at which travel moves are made." msgstr "" #: fdmprinter.json msgctxt "speed_layer_0 label" -msgid "Bottom Layer Speed" +msgid "Initial Layer Speed" msgstr "" #: fdmprinter.json msgctxt "speed_layer_0 description" msgid "" -"The print speed for the bottom layer: You want to print the first layer " -"slower so it sticks better to the printer bed." +"The print speed for the initial layer. A lower value is advised to improve " +"adhesion to the build plate." msgstr "" #: fdmprinter.json @@ -969,10 +912,9 @@ msgstr "" #: fdmprinter.json msgctxt "speed_slowdown_layers description" msgid "" -"The first few layers are printed slower than the rest of the object, this to " -"get better adhesion to the printer bed and improve the overall success rate " -"of prints. The speed is gradually increased over these layers. 4 layers of " -"speed-up is generally right for most materials and printers." +"The first few layers are printed slower than the rest of the object, to get " +"better adhesion to the build plate and improve the overall success rate of " +"prints. The speed is gradually increased over these layers." msgstr "" #: fdmprinter.json @@ -988,10 +930,10 @@ msgstr "" #: fdmprinter.json msgctxt "retraction_combing description" msgid "" -"Combing keeps the head within the interior of the print whenever possible " -"when traveling from one part of the print to another and does not use " -"retraction. If combing is disabled, the print head moves straight from the " -"start point to the end point and it will always retract." +"Combing keeps the nozzle within already printed areas when traveling. This " +"results in slightly longer travel moves but reduces the need for " +"retractions. If combing is disabled, the material will retract and the " +"nozzle moves in a straight line to the next point." msgstr "" #: fdmprinter.json @@ -1001,7 +943,9 @@ msgstr "" #: fdmprinter.json msgctxt "travel_avoid_other_parts description" -msgid "Avoid other parts when traveling between parts." +msgid "" +"The nozzle avoids already printed parts when traveling. This option is only " +"available when combing is enabled." msgstr "" #: fdmprinter.json @@ -1011,7 +955,9 @@ msgstr "" #: fdmprinter.json msgctxt "travel_avoid_distance description" -msgid "The distance to stay clear of parts which are avoided during travel." +msgid "" +"The distance between the nozzle and already printed parts when avoiding " +"during travel moves." msgstr "" #: fdmprinter.json @@ -1023,7 +969,7 @@ msgstr "" msgctxt "coasting_enable description" msgid "" "Coasting replaces the last part of an extrusion path with a travel path. The " -"oozed material is used to lay down the last piece of the extrusion path in " +"oozed material is used to print the last piece of the extrusion path in " "order to reduce stringing." msgstr "" @@ -1041,16 +987,16 @@ msgstr "" #: fdmprinter.json msgctxt "coasting_min_volume label" -msgid "Minimal Volume Before Coasting" +msgid "Minimum Volume Before Coasting" msgstr "" #: fdmprinter.json msgctxt "coasting_min_volume description" msgid "" -"The least volume an extrusion path should have to coast the full amount. For " -"smaller extrusion paths, less pressure has been built up in the bowden tube " -"and so the coasted volume is scaled linearly. This value should always be " -"larger than the Coasting Volume." +"The lowest volume an extrusion path should have before allowing coasting. " +"For smaller extrusion paths, less pressure has been built up in the bowden " +"tube and so the coasted volume is scaled linearly. This value should always " +"be larger than the Coasting Volume." msgstr "" #: fdmprinter.json @@ -1073,14 +1019,14 @@ msgstr "" #: fdmprinter.json msgctxt "cool_fan_enabled label" -msgid "Enable Cooling Fan" +msgid "Enable Cooling Fans" msgstr "" #: fdmprinter.json msgctxt "cool_fan_enabled description" msgid "" -"Enable the cooling fan during the print. The extra cooling from the cooling " -"fan helps parts with small cross sections that print each layer quickly." +"Enables the cooling fans while printing. The fans improve print quality on " +"layers with short layer times and bridging / overhangs." msgstr "" #: fdmprinter.json @@ -1090,20 +1036,20 @@ msgstr "" #: fdmprinter.json msgctxt "cool_fan_speed description" -msgid "Fan speed used for the print cooling fan on the printer head." +msgid "The speed at which the cooling fans spin." msgstr "" #: fdmprinter.json msgctxt "cool_fan_speed_min label" -msgid "Minimum Fan Speed" +msgid "Regular Fan Speed" msgstr "" #: fdmprinter.json msgctxt "cool_fan_speed_min description" msgid "" -"Normally the fan runs at the minimum fan speed. If the layer is slowed down " -"due to minimum layer time, the fan speed adjusts between minimum and maximum " -"fan speed." +"The speed at which the fans spin before hitting the threshold. When a layer " +"prints faster than the threshold, the fan speed gradually inclines towards " +"the maximum fan speed." msgstr "" #: fdmprinter.json @@ -1114,34 +1060,47 @@ msgstr "" #: fdmprinter.json msgctxt "cool_fan_speed_max description" msgid "" -"Normally the fan runs at the minimum fan speed. If the layer is slowed down " -"due to minimum layer time, the fan speed adjusts between minimum and maximum " -"fan speed." +"The speed at which the fans spin on the minimum layer time. The fan speed " +"gradually increases between the regular fan speed and maximum fan speed when " +"the threshold is hit." +msgstr "" + +#: fdmprinter.json +msgctxt "cool_min_layer_time_fan_speed_max label" +msgid "Regular/Maximum Fan Speed Threshold" +msgstr "" + +#: fdmprinter.json +msgctxt "cool_min_layer_time_fan_speed_max description" +msgid "" +"The layer time which sets the threshold between regular fan speed and " +"maximum fan speed. Layers that print slower than this time use regular fan " +"speed. For faster layers the fan speed gradually increases towards the " +"maximum fan speed." msgstr "" #: fdmprinter.json msgctxt "cool_fan_full_at_height label" -msgid "Fan Full on at Height" +msgid "Regular Fan Speed at Height" msgstr "" #: fdmprinter.json msgctxt "cool_fan_full_at_height description" msgid "" -"The height at which the fan is turned on completely. For the layers below " -"this the fan speed is scaled linearly with the fan off for the first layer." +"The height at which the fans spin on regular fan speed. At the layers below " +"the fan speed gradually increases from zero to regular fan speed." msgstr "" #: fdmprinter.json msgctxt "cool_fan_full_layer label" -msgid "Fan Full on at Layer" +msgid "Regular Fan Speed at Layer" msgstr "" #: fdmprinter.json msgctxt "cool_fan_full_layer description" msgid "" -"The layer number at which the fan is turned on completely. For the layers " -"below this the fan speed is scaled linearly with the fan off for the first " -"layer." +"The layer at which the fans spin on regular fan speed. If regular fan speed " +"at height is set, this value is calculated and rounded to a whole number." msgstr "" #: fdmprinter.json @@ -1152,24 +1111,9 @@ msgstr "" #: fdmprinter.json msgctxt "cool_min_layer_time description" msgid "" -"The minimum time spent in a layer: Gives the layer time to cool down before " -"the next one is put on top. If a layer would print in less time, then the " -"printer will slow down to make sure it has spent at least this many seconds " -"printing the layer." -msgstr "" - -#: fdmprinter.json -msgctxt "cool_min_layer_time_fan_speed_max label" -msgid "Minimum Layer Time Full Fan Speed" -msgstr "" - -#: fdmprinter.json -msgctxt "cool_min_layer_time_fan_speed_max description" -msgid "" -"The minimum time spent in a layer which will cause the fan to be at maximum " -"speed. The fan speed increases linearly from minimum fan speed for layers " -"taking the minimum layer time to maximum fan speed for layers taking the " -"time specified here." +"The minimum time spent in a layer. This forces the printer to slow down, to " +"at least spend the time set here in one layer. This allows the printed " +"material to cool down properly before printing the next layer." msgstr "" #: fdmprinter.json @@ -1180,9 +1124,9 @@ msgstr "" #: fdmprinter.json msgctxt "cool_min_speed description" msgid "" -"The minimum layer time can cause the print to slow down so much it starts to " -"droop. The minimum feedrate protects against this. Even if a print gets " -"slowed down it will never be slower than this minimum speed." +"The minimum print speed, despite slowing down due to the minimum layer time. " +"When the printer would slow down too much, the pressure in the nozzle would " +"be too low and result in bad print quality." msgstr "" #: fdmprinter.json @@ -1193,9 +1137,9 @@ msgstr "" #: fdmprinter.json msgctxt "cool_lift_head description" msgid "" -"Lift the head away from the print if the minimum speed is hit because of " -"cool slowdown, and wait the extra time away from the print surface until the " -"minimum layer time is used up." +"When the minimum speed is hit because of minimum layer time, lift the head " +"away from the print and wait the extra time until the minimum layer time is " +"reached." msgstr "" #: fdmprinter.json @@ -1206,9 +1150,8 @@ msgstr "" #: fdmprinter.json msgctxt "draft_shield_enabled description" msgid "" -"Enable exterior draft shield. This will create a wall around the object " -"which traps (hot) air and shields against gusts of wind. Especially useful " -"for materials which warp easily." +"This will create a wall around the object, which traps (hot) air and shields " +"against exterior airflow. Especially useful for materials which warp easily." msgstr "" #: fdmprinter.json @@ -1228,7 +1171,9 @@ msgstr "" #: fdmprinter.json msgctxt "draft_shield_height_limitation description" -msgid "Whether or not to limit the height of the draft shield." +msgid "" +"Set the height of the draft shield. Choose to print the draft shield at the " +"full height of the object or at a limited height." msgstr "" #: fdmprinter.json @@ -1249,7 +1194,7 @@ msgstr "" #: fdmprinter.json msgctxt "draft_shield_height description" msgid "" -"Height limitation on the draft shield. Above this height no draft shield " +"Height limitation of the draft shield. Above this height no draft shield " "will be printed." msgstr "" @@ -1266,8 +1211,8 @@ msgstr "" #: fdmprinter.json msgctxt "support_enable description" msgid "" -"Enable exterior support structures. This will build up supporting structures " -"below the model to prevent the model from sagging or printing in mid air." +"Enable support structures. These structures support parts of the model with " +"severe overhangs." msgstr "" #: fdmprinter.json @@ -1278,9 +1223,9 @@ msgstr "" #: fdmprinter.json msgctxt "support_type description" msgid "" -"Where to place support structures. The placement can be restricted so that " -"the support structures won't rest on the model, which could otherwise cause " -"scarring." +"Adjusts the placement of the support structures. The placement can be set to " +"touching build plate or everywhere. When set to everywhere the support " +"structures will also be printed on the model." msgstr "" #: fdmprinter.json @@ -1297,1176 +1242,3 @@ msgstr "" msgctxt "support_angle label" msgid "Overhang Angle" msgstr "" - -#: fdmprinter.json -msgctxt "support_angle description" -msgid "" -"The maximum angle of overhangs for which support will be added. With 0 " -"degrees being vertical, and 90 degrees being horizontal. A smaller overhang " -"angle leads to more support." -msgstr "" - -#: fdmprinter.json -msgctxt "support_xy_distance label" -msgid "X/Y Distance" -msgstr "" - -#: fdmprinter.json -msgctxt "support_xy_distance description" -msgid "" -"Distance of the support structure from the print in the X/Y directions. " -"0.7mm typically gives a nice distance from the print so the support does not " -"stick to the surface." -msgstr "" - -#: fdmprinter.json -msgctxt "support_z_distance label" -msgid "Z Distance" -msgstr "" - -#: fdmprinter.json -msgctxt "support_z_distance description" -msgid "" -"Distance from the top/bottom of the support to the print. A small gap here " -"makes it easier to remove the support but makes the print a bit uglier. " -"0.15mm allows for easier separation of the support structure." -msgstr "" - -#: fdmprinter.json -msgctxt "support_top_distance label" -msgid "Top Distance" -msgstr "" - -#: fdmprinter.json -msgctxt "support_top_distance description" -msgid "Distance from the top of the support to the print." -msgstr "" - -#: fdmprinter.json -msgctxt "support_bottom_distance label" -msgid "Bottom Distance" -msgstr "" - -#: fdmprinter.json -msgctxt "support_bottom_distance description" -msgid "Distance from the print to the bottom of the support." -msgstr "" - -#: fdmprinter.json -msgctxt "support_conical_enabled label" -msgid "Conical Support" -msgstr "" - -#: fdmprinter.json -msgctxt "support_conical_enabled description" -msgid "" -"Experimental feature: Make support areas smaller at the bottom than at the " -"overhang." -msgstr "" - -#: fdmprinter.json -msgctxt "support_conical_angle label" -msgid "Cone Angle" -msgstr "" - -#: fdmprinter.json -msgctxt "support_conical_angle description" -msgid "" -"The angle of the tilt of conical support. With 0 degrees being vertical, and " -"90 degrees being horizontal. Smaller angles cause the support to be more " -"sturdy, but consist of more material. Negative angles cause the base of the " -"support to be wider than the top." -msgstr "" - -#: fdmprinter.json -msgctxt "support_conical_min_width label" -msgid "Minimal Width" -msgstr "" - -#: fdmprinter.json -msgctxt "support_conical_min_width description" -msgid "" -"Minimal width to which conical support reduces the support areas. Small " -"widths can cause the base of the support to not act well as foundation for " -"support above." -msgstr "" - -#: fdmprinter.json -msgctxt "support_bottom_stair_step_height label" -msgid "Stair Step Height" -msgstr "" - -#: fdmprinter.json -msgctxt "support_bottom_stair_step_height description" -msgid "" -"The height of the steps of the stair-like bottom of support resting on the " -"model. Small steps can cause the support to be hard to remove from the top " -"of the model." -msgstr "" - -#: fdmprinter.json -msgctxt "support_join_distance label" -msgid "Join Distance" -msgstr "" - -#: fdmprinter.json -msgctxt "support_join_distance description" -msgid "" -"The maximum distance between support blocks in the X/Y directions, so that " -"the blocks will merge into a single block." -msgstr "" - -#: fdmprinter.json -msgctxt "support_offset label" -msgid "Horizontal Expansion" -msgstr "" - -#: fdmprinter.json -msgctxt "support_offset description" -msgid "" -"Amount of offset applied to all support polygons in each layer. Positive " -"values can smooth out the support areas and result in more sturdy support." -msgstr "" - -#: fdmprinter.json -msgctxt "support_area_smoothing label" -msgid "Area Smoothing" -msgstr "" - -#: fdmprinter.json -msgctxt "support_area_smoothing description" -msgid "" -"Maximum distance in the X/Y directions of a line segment which is to be " -"smoothed out. Ragged lines are introduced by the join distance and support " -"bridge, which cause the machine to resonate. Smoothing the support areas " -"won't cause them to break with the constraints, except it might change the " -"overhang." -msgstr "" - -#: fdmprinter.json -msgctxt "support_roof_enable label" -msgid "Enable Support Roof" -msgstr "" - -#: fdmprinter.json -msgctxt "support_roof_enable description" -msgid "" -"Generate a dense top skin at the top of the support on which the model sits." -msgstr "" - -#: fdmprinter.json -msgctxt "support_roof_height label" -msgid "Support Roof Thickness" -msgstr "" - -#: fdmprinter.json -msgctxt "support_roof_height description" -msgid "The height of the support roofs." -msgstr "" - -#: fdmprinter.json -msgctxt "support_roof_density label" -msgid "Support Roof Density" -msgstr "" - -#: fdmprinter.json -msgctxt "support_roof_density description" -msgid "" -"This controls how densely filled the roofs of the support will be. A higher " -"percentage results in better overhangs, but makes the support more difficult " -"to remove." -msgstr "" - -#: fdmprinter.json -msgctxt "support_roof_line_distance label" -msgid "Support Roof Line Distance" -msgstr "" - -#: fdmprinter.json -msgctxt "support_roof_line_distance description" -msgid "Distance between the printed support roof lines." -msgstr "" - -#: fdmprinter.json -msgctxt "support_roof_pattern label" -msgid "Support Roof Pattern" -msgstr "" - -#: fdmprinter.json -msgctxt "support_roof_pattern description" -msgid "The pattern with which the top of the support is printed." -msgstr "" - -#: fdmprinter.json -msgctxt "support_roof_pattern option lines" -msgid "Lines" -msgstr "" - -#: fdmprinter.json -msgctxt "support_roof_pattern option grid" -msgid "Grid" -msgstr "" - -#: fdmprinter.json -msgctxt "support_roof_pattern option triangles" -msgid "Triangles" -msgstr "" - -#: fdmprinter.json -msgctxt "support_roof_pattern option concentric" -msgid "Concentric" -msgstr "" - -#: fdmprinter.json -msgctxt "support_roof_pattern option zigzag" -msgid "Zig Zag" -msgstr "" - -#: fdmprinter.json -msgctxt "support_use_towers label" -msgid "Use towers" -msgstr "" - -#: fdmprinter.json -msgctxt "support_use_towers description" -msgid "" -"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." -msgstr "" - -#: fdmprinter.json -msgctxt "support_tower_diameter label" -msgid "Tower Diameter" -msgstr "" - -#: fdmprinter.json -msgctxt "support_tower_diameter description" -msgid "The diameter of a special tower." -msgstr "" - -#: fdmprinter.json -msgctxt "support_minimal_diameter label" -msgid "Minimum Diameter" -msgstr "" - -#: fdmprinter.json -msgctxt "support_minimal_diameter description" -msgid "" -"Minimum diameter in the X/Y directions of a small area which is to be " -"supported by a specialized support tower." -msgstr "" - -#: fdmprinter.json -msgctxt "support_tower_roof_angle label" -msgid "Tower Roof Angle" -msgstr "" - -#: fdmprinter.json -msgctxt "support_tower_roof_angle description" -msgid "" -"The angle of the rooftop of a tower. Larger angles mean more pointy towers." -msgstr "" - -#: fdmprinter.json -msgctxt "support_pattern label" -msgid "Pattern" -msgstr "" - -#: fdmprinter.json -msgctxt "support_pattern description" -msgid "" -"Cura can generate 3 distinct types of support structure. First is a grid " -"based support structure which is quite solid and can be removed in one " -"piece. The second is a line based support structure which has to be peeled " -"off line by line. The third is a structure in between the other two; it " -"consists of lines which are connected in an accordion fashion." -msgstr "" - -#: fdmprinter.json -msgctxt "support_pattern option lines" -msgid "Lines" -msgstr "" - -#: fdmprinter.json -msgctxt "support_pattern option grid" -msgid "Grid" -msgstr "" - -#: fdmprinter.json -msgctxt "support_pattern option triangles" -msgid "Triangles" -msgstr "" - -#: fdmprinter.json -msgctxt "support_pattern option concentric" -msgid "Concentric" -msgstr "" - -#: fdmprinter.json -msgctxt "support_pattern option zigzag" -msgid "Zig Zag" -msgstr "" - -#: fdmprinter.json -msgctxt "support_connect_zigzags label" -msgid "Connect ZigZags" -msgstr "" - -#: fdmprinter.json -msgctxt "support_connect_zigzags description" -msgid "" -"Connect the ZigZags. Makes them harder to remove, but prevents stringing of " -"disconnected zigzags." -msgstr "" - -#: fdmprinter.json -msgctxt "support_infill_rate label" -msgid "Fill Amount" -msgstr "" - -#: fdmprinter.json -msgctxt "support_infill_rate description" -msgid "" -"The amount of infill structure in the support; less infill gives weaker " -"support which is easier to remove." -msgstr "" - -#: fdmprinter.json -msgctxt "support_line_distance label" -msgid "Line distance" -msgstr "" - -#: fdmprinter.json -msgctxt "support_line_distance description" -msgid "Distance between the printed support lines." -msgstr "" - -#: fdmprinter.json -msgctxt "platform_adhesion label" -msgid "Platform Adhesion" -msgstr "" - -#: fdmprinter.json -msgctxt "adhesion_type label" -msgid "Type" -msgstr "" - -#: fdmprinter.json -msgctxt "adhesion_type description" -msgid "" -"Different options that help to improve priming your extrusion.\n" -"Brim and Raft help in preventing corners from lifting due to warping. Brim " -"adds a single-layer-thick flat area around your object which is easy to cut " -"off afterwards, and it is the recommended option.\n" -"Raft adds a thick grid below the object and a thin interface between this " -"and your object.\n" -"The skirt is a line drawn around the first layer of the print, this helps to " -"prime your extrusion and to see if the object fits on your platform." -msgstr "" - -#: fdmprinter.json -msgctxt "adhesion_type option skirt" -msgid "Skirt" -msgstr "" - -#: fdmprinter.json -msgctxt "adhesion_type option brim" -msgid "Brim" -msgstr "" - -#: fdmprinter.json -msgctxt "adhesion_type option raft" -msgid "Raft" -msgstr "" - -#: fdmprinter.json -msgctxt "skirt_line_count label" -msgid "Skirt Line Count" -msgstr "" - -#: fdmprinter.json -msgctxt "skirt_line_count description" -msgid "" -"Multiple skirt lines help to prime your extrusion better for small objects. " -"Setting this to 0 will disable the skirt." -msgstr "" - -#: fdmprinter.json -msgctxt "skirt_gap label" -msgid "Skirt Distance" -msgstr "" - -#: fdmprinter.json -msgctxt "skirt_gap description" -msgid "" -"The horizontal distance between the skirt and the first layer of the print.\n" -"This is the minimum distance, multiple skirt lines will extend outwards from " -"this distance." -msgstr "" - -#: fdmprinter.json -msgctxt "skirt_minimal_length label" -msgid "Skirt Minimum Length" -msgstr "" - -#: fdmprinter.json -msgctxt "skirt_minimal_length description" -msgid "" -"The minimum length of the skirt. If this minimum length is not reached, more " -"skirt lines will be added to reach this minimum length. Note: If the line " -"count is set to 0 this is ignored." -msgstr "" - -#: fdmprinter.json -msgctxt "brim_width label" -msgid "Brim Width" -msgstr "" - -#: fdmprinter.json -msgctxt "brim_width description" -msgid "" -"The distance from the model to the end of the brim. A larger brim sticks " -"better to the build platform, but also makes your effective print area " -"smaller." -msgstr "" - -#: fdmprinter.json -msgctxt "brim_line_count label" -msgid "Brim Line Count" -msgstr "" - -#: fdmprinter.json -msgctxt "brim_line_count description" -msgid "" -"The number of lines used for a brim. More lines means a larger brim which " -"sticks better to the build plate, but this also makes your effective print " -"area smaller." -msgstr "" - -#: fdmprinter.json -msgctxt "raft_margin label" -msgid "Raft Extra Margin" -msgstr "" - -#: fdmprinter.json -msgctxt "raft_margin description" -msgid "" -"If the raft is enabled, this is the extra raft area around the object which " -"is also given a raft. Increasing this margin will create a stronger raft " -"while using more material and leaving less area for your print." -msgstr "" - -#: fdmprinter.json -msgctxt "raft_airgap label" -msgid "Raft Air-gap" -msgstr "" - -#: fdmprinter.json -msgctxt "raft_airgap description" -msgid "" -"The gap between the final raft layer and the first layer of the object. Only " -"the first layer is raised by this amount to lower the bonding between the " -"raft layer and the object. Makes it easier to peel off the raft." -msgstr "" - -#: fdmprinter.json -msgctxt "raft_surface_layers label" -msgid "Raft Top Layers" -msgstr "" - -#: fdmprinter.json -msgctxt "raft_surface_layers description" -msgid "" -"The number of top layers on top of the 2nd raft layer. These are fully " -"filled layers that the object sits on. 2 layers result in a smoother top " -"surface than 1." -msgstr "" - -#: fdmprinter.json -msgctxt "raft_surface_thickness label" -msgid "Raft Top Layer Thickness" -msgstr "" - -#: fdmprinter.json -msgctxt "raft_surface_thickness description" -msgid "Layer thickness of the top raft layers." -msgstr "" - -#: fdmprinter.json -msgctxt "raft_surface_line_width label" -msgid "Raft Top Line Width" -msgstr "" - -#: fdmprinter.json -msgctxt "raft_surface_line_width description" -msgid "" -"Width of the lines in the top surface of the raft. These can be thin lines " -"so that the top of the raft becomes smooth." -msgstr "" - -#: fdmprinter.json -msgctxt "raft_surface_line_spacing label" -msgid "Raft Top Spacing" -msgstr "" - -#: fdmprinter.json -msgctxt "raft_surface_line_spacing description" -msgid "" -"The distance between the raft lines for the top raft layers. The spacing " -"should be equal to the line width, so that the surface is solid." -msgstr "" - -#: fdmprinter.json -msgctxt "raft_interface_thickness label" -msgid "Raft Middle Thickness" -msgstr "" - -#: fdmprinter.json -msgctxt "raft_interface_thickness description" -msgid "Layer thickness of the middle raft layer." -msgstr "" - -#: fdmprinter.json -msgctxt "raft_interface_line_width label" -msgid "Raft Middle Line Width" -msgstr "" - -#: fdmprinter.json -msgctxt "raft_interface_line_width description" -msgid "" -"Width of the lines in the middle raft layer. Making the second layer extrude " -"more causes the lines to stick to the bed." -msgstr "" - -#: fdmprinter.json -msgctxt "raft_interface_line_spacing label" -msgid "Raft Middle Spacing" -msgstr "" - -#: fdmprinter.json -msgctxt "raft_interface_line_spacing description" -msgid "" -"The distance between the raft lines for the middle raft layer. The spacing " -"of the middle should be quite wide, while being dense enough to support the " -"top raft layers." -msgstr "" - -#: fdmprinter.json -msgctxt "raft_base_thickness label" -msgid "Raft Base Thickness" -msgstr "" - -#: fdmprinter.json -msgctxt "raft_base_thickness description" -msgid "" -"Layer thickness of the base raft layer. This should be a thick layer which " -"sticks firmly to the printer bed." -msgstr "" - -#: fdmprinter.json -msgctxt "raft_base_line_width label" -msgid "Raft Base Line Width" -msgstr "" - -#: fdmprinter.json -msgctxt "raft_base_line_width description" -msgid "" -"Width of the lines in the base raft layer. These should be thick lines to " -"assist in bed adhesion." -msgstr "" - -#: fdmprinter.json -msgctxt "raft_base_line_spacing label" -msgid "Raft Line Spacing" -msgstr "" - -#: fdmprinter.json -msgctxt "raft_base_line_spacing description" -msgid "" -"The distance between the raft lines for the base raft layer. Wide spacing " -"makes for easy removal of the raft from the build plate." -msgstr "" - -#: fdmprinter.json -msgctxt "raft_speed label" -msgid "Raft Print Speed" -msgstr "" - -#: fdmprinter.json -msgctxt "raft_speed description" -msgid "The speed at which the raft is printed." -msgstr "" - -#: fdmprinter.json -msgctxt "raft_surface_speed label" -msgid "Raft Surface Print Speed" -msgstr "" - -#: fdmprinter.json -msgctxt "raft_surface_speed description" -msgid "" -"The speed at which the surface raft layers are printed. These should be " -"printed a bit slower, so that the nozzle can slowly smooth out adjacent " -"surface lines." -msgstr "" - -#: fdmprinter.json -msgctxt "raft_interface_speed label" -msgid "Raft Interface Print Speed" -msgstr "" - -#: fdmprinter.json -msgctxt "raft_interface_speed description" -msgid "" -"The speed at which the interface raft layer is printed. This should be " -"printed quite slowly, as the volume of material coming out of the nozzle is " -"quite high." -msgstr "" - -#: fdmprinter.json -msgctxt "raft_base_speed label" -msgid "Raft Base Print Speed" -msgstr "" - -#: fdmprinter.json -msgctxt "raft_base_speed description" -msgid "" -"The speed at which the base raft layer is printed. This should be printed " -"quite slowly, as the volume of material coming out of the nozzle is quite " -"high." -msgstr "" - -#: fdmprinter.json -msgctxt "raft_fan_speed label" -msgid "Raft Fan Speed" -msgstr "" - -#: fdmprinter.json -msgctxt "raft_fan_speed description" -msgid "The fan speed for the raft." -msgstr "" - -#: fdmprinter.json -msgctxt "raft_surface_fan_speed label" -msgid "Raft Surface Fan Speed" -msgstr "" - -#: fdmprinter.json -msgctxt "raft_surface_fan_speed description" -msgid "The fan speed for the surface raft layers." -msgstr "" - -#: fdmprinter.json -msgctxt "raft_interface_fan_speed label" -msgid "Raft Interface Fan Speed" -msgstr "" - -#: fdmprinter.json -msgctxt "raft_interface_fan_speed description" -msgid "The fan speed for the interface raft layer." -msgstr "" - -#: fdmprinter.json -msgctxt "raft_base_fan_speed label" -msgid "Raft Base Fan Speed" -msgstr "" - -#: fdmprinter.json -msgctxt "raft_base_fan_speed description" -msgid "The fan speed for the base raft layer." -msgstr "" - -#: fdmprinter.json -msgctxt "meshfix label" -msgid "Mesh Fixes" -msgstr "" - -#: fdmprinter.json -msgctxt "meshfix_union_all label" -msgid "Union Overlapping Volumes" -msgstr "" - -#: fdmprinter.json -msgctxt "meshfix_union_all description" -msgid "" -"Ignore the internal geometry arising from overlapping volumes and print the " -"volumes as one. This may cause internal cavities to disappear." -msgstr "" - -#: fdmprinter.json -msgctxt "meshfix_union_all_remove_holes label" -msgid "Remove All Holes" -msgstr "" - -#: fdmprinter.json -msgctxt "meshfix_union_all_remove_holes description" -msgid "" -"Remove the holes in each layer and keep only the outside shape. This will " -"ignore any invisible internal geometry. However, it also ignores layer holes " -"which can be viewed from above or below." -msgstr "" - -#: fdmprinter.json -msgctxt "meshfix_extensive_stitching label" -msgid "Extensive Stitching" -msgstr "" - -#: fdmprinter.json -msgctxt "meshfix_extensive_stitching description" -msgid "" -"Extensive stitching tries to stitch up open holes in the mesh by closing the " -"hole with touching polygons. This option can introduce a lot of processing " -"time." -msgstr "" - -#: fdmprinter.json -msgctxt "meshfix_keep_open_polygons label" -msgid "Keep Disconnected Faces" -msgstr "" - -#: fdmprinter.json -msgctxt "meshfix_keep_open_polygons description" -msgid "" -"Normally Cura tries to stitch up small holes in the mesh and remove parts of " -"a layer with big holes. Enabling this option keeps those parts which cannot " -"be stitched. This option should be used as a last resort option when " -"everything else fails to produce proper GCode." -msgstr "" - -#: fdmprinter.json -msgctxt "blackmagic label" -msgid "Special Modes" -msgstr "" - -#: fdmprinter.json -msgctxt "print_sequence label" -msgid "Print sequence" -msgstr "" - -#: fdmprinter.json -msgctxt "print_sequence description" -msgid "" -"Whether to print all objects one layer at a time or to wait for one object " -"to finish, before moving on to the next. One at a time mode is only possible " -"if all models are separated in such a way that the whole print head can move " -"in between and all models are lower than the distance between the nozzle and " -"the X/Y axes." -msgstr "" - -#: fdmprinter.json -msgctxt "print_sequence option all_at_once" -msgid "All at Once" -msgstr "" - -#: fdmprinter.json -msgctxt "print_sequence option one_at_a_time" -msgid "One at a Time" -msgstr "" - -#: fdmprinter.json -msgctxt "magic_mesh_surface_mode label" -msgid "Surface Mode" -msgstr "" - -#: fdmprinter.json -msgctxt "magic_mesh_surface_mode description" -msgid "" -"Print the surface instead of the volume. No infill, no top/bottom skin, just " -"a single wall of which the middle coincides with the surface of the mesh. " -"It's also possible to do both: print the insides of a closed volume as " -"normal, but print all polygons not part of a closed volume as surface." -msgstr "" - -#: fdmprinter.json -msgctxt "magic_mesh_surface_mode option normal" -msgid "Normal" -msgstr "" - -#: fdmprinter.json -msgctxt "magic_mesh_surface_mode option surface" -msgid "Surface" -msgstr "" - -#: fdmprinter.json -msgctxt "magic_mesh_surface_mode option both" -msgid "Both" -msgstr "" - -#: fdmprinter.json -msgctxt "magic_spiralize label" -msgid "Spiralize Outer Contour" -msgstr "" - -#: fdmprinter.json -msgctxt "magic_spiralize description" -msgid "" -"Spiralize smooths out the Z move of the outer edge. This will create a " -"steady Z increase over the whole print. This feature turns a solid object " -"into a single walled print with a solid bottom. This feature used to be " -"called Joris in older versions." -msgstr "" - -#: fdmprinter.json -msgctxt "magic_fuzzy_skin_enabled label" -msgid "Fuzzy Skin" -msgstr "" - -#: fdmprinter.json -msgctxt "magic_fuzzy_skin_enabled description" -msgid "" -"Randomly jitter while printing the outer wall, so that the surface has a " -"rough and fuzzy look." -msgstr "" - -#: fdmprinter.json -msgctxt "magic_fuzzy_skin_thickness label" -msgid "Fuzzy Skin Thickness" -msgstr "" - -#: fdmprinter.json -msgctxt "magic_fuzzy_skin_thickness description" -msgid "" -"The width within which to jitter. It's advised to keep this below the outer " -"wall width, since the inner walls are unaltered." -msgstr "" - -#: fdmprinter.json -msgctxt "magic_fuzzy_skin_point_density label" -msgid "Fuzzy Skin Density" -msgstr "" - -#: fdmprinter.json -msgctxt "magic_fuzzy_skin_point_density description" -msgid "" -"The average density of points introduced on each polygon in a layer. Note " -"that the original points of the polygon are discarded, so a low density " -"results in a reduction of the resolution." -msgstr "" - -#: fdmprinter.json -msgctxt "magic_fuzzy_skin_point_dist label" -msgid "Fuzzy Skin Point Distance" -msgstr "" - -#: fdmprinter.json -msgctxt "magic_fuzzy_skin_point_dist description" -msgid "" -"The average distance between the random points introduced on each line " -"segment. Note that the original points of the polygon are discarded, so a " -"high smoothness results in a reduction of the resolution. This value must be " -"higher than half the Fuzzy Skin Thickness." -msgstr "" - -#: fdmprinter.json -msgctxt "wireframe_enabled label" -msgid "Wire Printing" -msgstr "" - -#: fdmprinter.json -msgctxt "wireframe_enabled description" -msgid "" -"Print only the outside surface with a sparse webbed structure, printing 'in " -"thin air'. This is realized by horizontally printing the contours of the " -"model at given Z intervals which are connected via upward and diagonally " -"downward lines." -msgstr "" - -#: fdmprinter.json -msgctxt "wireframe_height label" -msgid "WP Connection Height" -msgstr "" - -#: fdmprinter.json -msgctxt "wireframe_height description" -msgid "" -"The height of the upward and diagonally downward lines between two " -"horizontal parts. This determines the overall density of the net structure. " -"Only applies to Wire Printing." -msgstr "" - -#: fdmprinter.json -msgctxt "wireframe_roof_inset label" -msgid "WP Roof Inset Distance" -msgstr "" - -#: fdmprinter.json -msgctxt "wireframe_roof_inset description" -msgid "" -"The distance covered when making a connection from a roof outline inward. " -"Only applies to Wire Printing." -msgstr "" - -#: fdmprinter.json -msgctxt "wireframe_printspeed label" -msgid "WP speed" -msgstr "" - -#: fdmprinter.json -msgctxt "wireframe_printspeed description" -msgid "" -"Speed at which the nozzle moves when extruding material. Only applies to " -"Wire Printing." -msgstr "" - -#: fdmprinter.json -msgctxt "wireframe_printspeed_bottom label" -msgid "WP Bottom Printing Speed" -msgstr "" - -#: fdmprinter.json -msgctxt "wireframe_printspeed_bottom description" -msgid "" -"Speed of printing the first layer, which is the only layer touching the " -"build platform. Only applies to Wire Printing." -msgstr "" - -#: fdmprinter.json -msgctxt "wireframe_printspeed_up label" -msgid "WP Upward Printing Speed" -msgstr "" - -#: fdmprinter.json -msgctxt "wireframe_printspeed_up description" -msgid "" -"Speed of printing a line upward 'in thin air'. Only applies to Wire Printing." -msgstr "" - -#: fdmprinter.json -msgctxt "wireframe_printspeed_down label" -msgid "WP Downward Printing Speed" -msgstr "" - -#: fdmprinter.json -msgctxt "wireframe_printspeed_down description" -msgid "" -"Speed of printing a line diagonally downward. Only applies to Wire Printing." -msgstr "" - -#: fdmprinter.json -msgctxt "wireframe_printspeed_flat label" -msgid "WP Horizontal Printing Speed" -msgstr "" - -#: fdmprinter.json -msgctxt "wireframe_printspeed_flat description" -msgid "" -"Speed of printing the horizontal contours of the object. Only applies to " -"Wire Printing." -msgstr "" - -#: fdmprinter.json -msgctxt "wireframe_flow label" -msgid "WP Flow" -msgstr "" - -#: fdmprinter.json -msgctxt "wireframe_flow description" -msgid "" -"Flow compensation: the amount of material extruded is multiplied by this " -"value. Only applies to Wire Printing." -msgstr "" - -#: fdmprinter.json -msgctxt "wireframe_flow_connection label" -msgid "WP Connection Flow" -msgstr "" - -#: fdmprinter.json -msgctxt "wireframe_flow_connection description" -msgid "Flow compensation when going up or down. Only applies to Wire Printing." -msgstr "" - -#: fdmprinter.json -msgctxt "wireframe_flow_flat label" -msgid "WP Flat Flow" -msgstr "" - -#: fdmprinter.json -msgctxt "wireframe_flow_flat description" -msgid "" -"Flow compensation when printing flat lines. Only applies to Wire Printing." -msgstr "" - -#: fdmprinter.json -msgctxt "wireframe_top_delay label" -msgid "WP Top Delay" -msgstr "" - -#: fdmprinter.json -msgctxt "wireframe_top_delay description" -msgid "" -"Delay time after an upward move, so that the upward line can harden. Only " -"applies to Wire Printing." -msgstr "" - -#: fdmprinter.json -msgctxt "wireframe_bottom_delay label" -msgid "WP Bottom Delay" -msgstr "" - -#: fdmprinter.json -msgctxt "wireframe_bottom_delay description" -msgid "Delay time after a downward move. Only applies to Wire Printing." -msgstr "" - -#: fdmprinter.json -msgctxt "wireframe_flat_delay label" -msgid "WP Flat Delay" -msgstr "" - -#: fdmprinter.json -msgctxt "wireframe_flat_delay description" -msgid "" -"Delay time between two horizontal segments. Introducing such a delay can " -"cause better adhesion to previous layers at the connection points, while too " -"long delays cause sagging. Only applies to Wire Printing." -msgstr "" - -#: fdmprinter.json -msgctxt "wireframe_up_half_speed label" -msgid "WP Ease Upward" -msgstr "" - -#: fdmprinter.json -msgctxt "wireframe_up_half_speed description" -msgid "" -"Distance of an upward move which is extruded with half speed.\n" -"This can cause better adhesion to previous layers, while not heating the " -"material in those layers too much. Only applies to Wire Printing." -msgstr "" - -#: fdmprinter.json -msgctxt "wireframe_top_jump label" -msgid "WP Knot Size" -msgstr "" - -#: fdmprinter.json -msgctxt "wireframe_top_jump description" -msgid "" -"Creates a small knot at the top of an upward line, so that the consecutive " -"horizontal layer has a better chance to connect to it. Only applies to Wire " -"Printing." -msgstr "" - -#: fdmprinter.json -msgctxt "wireframe_fall_down label" -msgid "WP Fall Down" -msgstr "" - -#: fdmprinter.json -msgctxt "wireframe_fall_down description" -msgid "" -"Distance with which the material falls down after an upward extrusion. This " -"distance is compensated for. Only applies to Wire Printing." -msgstr "" - -#: fdmprinter.json -msgctxt "wireframe_drag_along label" -msgid "WP Drag along" -msgstr "" - -#: fdmprinter.json -msgctxt "wireframe_drag_along description" -msgid "" -"Distance with which the material of an upward extrusion is dragged along " -"with the diagonally downward extrusion. This distance is compensated for. " -"Only applies to Wire Printing." -msgstr "" - -#: fdmprinter.json -msgctxt "wireframe_strategy label" -msgid "WP Strategy" -msgstr "" - -#: fdmprinter.json -msgctxt "wireframe_strategy description" -msgid "" -"Strategy for making sure two consecutive layers connect at each connection " -"point. Retraction lets the upward lines harden in the right position, but " -"may cause filament grinding. A knot can be made at the end of an upward line " -"to heighten the chance of connecting to it and to let the line cool; " -"however, it may require slow printing speeds. Another strategy is to " -"compensate for the sagging of the top of an upward line; however, the lines " -"won't always fall down as predicted." -msgstr "" - -#: fdmprinter.json -msgctxt "wireframe_strategy option compensate" -msgid "Compensate" -msgstr "" - -#: fdmprinter.json -msgctxt "wireframe_strategy option knot" -msgid "Knot" -msgstr "" - -#: fdmprinter.json -msgctxt "wireframe_strategy option retract" -msgid "Retract" -msgstr "" - -#: fdmprinter.json -msgctxt "wireframe_straight_before_down label" -msgid "WP Straighten Downward Lines" -msgstr "" - -#: fdmprinter.json -msgctxt "wireframe_straight_before_down description" -msgid "" -"Percentage of a diagonally downward line which is covered by a horizontal " -"line piece. This can prevent sagging of the top most point of upward lines. " -"Only applies to Wire Printing." -msgstr "" - -#: fdmprinter.json -msgctxt "wireframe_roof_fall_down label" -msgid "WP Roof Fall Down" -msgstr "" - -#: fdmprinter.json -msgctxt "wireframe_roof_fall_down description" -msgid "" -"The distance which horizontal roof lines printed 'in thin air' fall down " -"when being printed. This distance is compensated for. Only applies to Wire " -"Printing." -msgstr "" - -#: fdmprinter.json -msgctxt "wireframe_roof_drag_along label" -msgid "WP Roof Drag Along" -msgstr "" - -#: fdmprinter.json -msgctxt "wireframe_roof_drag_along description" -msgid "" -"The distance of the end piece of an inward line which gets dragged along " -"when going back to the outer outline of the roof. This distance is " -"compensated for. Only applies to Wire Printing." -msgstr "" - -#: fdmprinter.json -msgctxt "wireframe_roof_outer_delay label" -msgid "WP Roof Outer Delay" -msgstr "" - -#: fdmprinter.json -msgctxt "wireframe_roof_outer_delay description" -msgid "" -"Time spent at the outer perimeters of hole which is to become a roof. Longer " -"times can ensure a better connection. Only applies to Wire Printing." -msgstr "" - -#: fdmprinter.json -msgctxt "wireframe_nozzle_clearance label" -msgid "WP Nozzle Clearance" -msgstr "" - -#: fdmprinter.json -msgctxt "wireframe_nozzle_clearance description" -msgid "" -"Distance between the nozzle and horizontally downward lines. Larger " -"clearance results in diagonally downward lines with a less steep angle, " -"which in turn results in less upward connections with the next layer. Only " -"applies to Wire Printing." -msgstr "" From ca70b275d869046c4909ab87191bde03280ef5a7 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 1 Apr 2016 13:58:11 +0200 Subject: [PATCH 81/89] Revert "Changed wait for subprocess to poll" This reverts commit e463c93f77a8015b00ab49aa7b8f9f6433cba26b. --- plugins/CuraEngineBackend/CuraEngineBackend.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/CuraEngineBackend/CuraEngineBackend.py b/plugins/CuraEngineBackend/CuraEngineBackend.py index cf32bfd93a..81fc0ab7c2 100644 --- a/plugins/CuraEngineBackend/CuraEngineBackend.py +++ b/plugins/CuraEngineBackend/CuraEngineBackend.py @@ -162,7 +162,7 @@ class CuraEngineBackend(Backend): Logger.log("d", "Killing engine process") try: self._process.terminate() - Logger.log("d", "Engine process is killed. Recieved return code %s", self._process.poll()) + Logger.log("d", "Engine process is killed. Recieved return code %s", self._process.wait()) self._process = None #self._createSocket() # Re create the socket except Exception as e: # terminating a process that is already terminating causes an exception, silently ignore this. @@ -289,6 +289,6 @@ class CuraEngineBackend(Backend): def _onBackendQuit(self): if not self._restart and self._process: - Logger.log("d", "Backend quit with return code %s. Resetting process and socket.", self._process.poll()) + Logger.log("d", "Backend quit with return code %s. Resetting process and socket.", self._process.wait()) self._process = None self._createSocket() From fdb951ffe682a7d8daa59e7b930036916e63ec05 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 1 Apr 2016 16:33:33 +0200 Subject: [PATCH 82/89] Changed silly typo No issue number, but this *needs* to be in 2.1 Signed off by Jaime & Ruben --- cura/BuildVolume.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/BuildVolume.py b/cura/BuildVolume.py index cc1411e52d..52c24069e7 100644 --- a/cura/BuildVolume.py +++ b/cura/BuildVolume.py @@ -168,7 +168,7 @@ class BuildVolume(SceneNode): if Application.getInstance().getMachineManager().getWorkingProfile().getSettingValue("print_sequence") == "one_at_a_time": self._height = Application.getInstance().getMachineManager().getWorkingProfile().getSettingValue("gantry_height") else: - self._height = self._active_instance.getMachineSettingValue("machine_depth") + self._height = self._active_instance.getMachineSettingValue("machine_height") self._depth = self._active_instance.getMachineSettingValue("machine_depth") self._updateDisallowedAreas() From 2b8914ea46fdd4da17ebb2931cdb5ba728541e79 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 1 Apr 2016 16:39:32 +0200 Subject: [PATCH 83/89] Removed duplicate settings from machine profiles CURA-1166 --- resources/machines/ultimaker2_extended.json | 2 -- resources/machines/ultimaker2_extended_olsson.json | 2 -- resources/machines/ultimaker2_extended_plus.json | 2 -- resources/machines/ultimaker2plus.json | 2 -- 4 files changed, 8 deletions(-) diff --git a/resources/machines/ultimaker2_extended.json b/resources/machines/ultimaker2_extended.json index cb81b51fc6..72b2ad53e6 100644 --- a/resources/machines/ultimaker2_extended.json +++ b/resources/machines/ultimaker2_extended.json @@ -15,8 +15,6 @@ ], "machine_settings": { - "machine_width": { "default": 230 }, - "machine_depth": { "default": 225 }, "machine_height": { "default": 315 } } } diff --git a/resources/machines/ultimaker2_extended_olsson.json b/resources/machines/ultimaker2_extended_olsson.json index 4398e4efb6..d144a97014 100644 --- a/resources/machines/ultimaker2_extended_olsson.json +++ b/resources/machines/ultimaker2_extended_olsson.json @@ -11,8 +11,6 @@ "inherits": "ultimaker2_olsson.json", "machine_settings": { - "machine_width": { "default": 230 }, - "machine_depth": { "default": 225 }, "machine_height": { "default": 313 }, "machine_show_variants": { "default": true } } diff --git a/resources/machines/ultimaker2_extended_plus.json b/resources/machines/ultimaker2_extended_plus.json index e6813fcce3..318361a894 100644 --- a/resources/machines/ultimaker2_extended_plus.json +++ b/resources/machines/ultimaker2_extended_plus.json @@ -11,8 +11,6 @@ "inherits": "ultimaker2plus.json", "machine_settings": { - "machine_width": { "default": 230 }, - "machine_depth": { "default": 225 }, "machine_height": { "default": 313 }, "machine_show_variants": { "default": true }, "machine_nozzle_head_distance": { "default": 5 }, diff --git a/resources/machines/ultimaker2plus.json b/resources/machines/ultimaker2plus.json index 56635f915f..2eb5ecc78c 100644 --- a/resources/machines/ultimaker2plus.json +++ b/resources/machines/ultimaker2plus.json @@ -11,8 +11,6 @@ "inherits": "ultimaker2.json", "overrides": { - "machine_width": { "default": 230 }, - "machine_depth": { "default": 225 }, "machine_height": { "default": 203 }, "machine_show_variants": { "default": true }, "gantry_height": { "default": 52 }, From 14f7299a6c69a6b57fa5249ddc645249b417a0ea Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 1 Apr 2016 16:45:42 +0200 Subject: [PATCH 84/89] Update template files Contributes to issue CURA-1190. --- resources/i18n/cura.pot | 2 +- resources/i18n/fdmprinter.json.pot | 1174 +++++++++++++++++++++++++++- 2 files changed, 1174 insertions(+), 2 deletions(-) diff --git a/resources/i18n/cura.pot b/resources/i18n/cura.pot index 3b0946f58f..d54d173ad3 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-04-01 10:50+0200\n" +"POT-Creation-Date: 2016-04-01 13:45+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/resources/i18n/fdmprinter.json.pot b/resources/i18n/fdmprinter.json.pot index 7049db0f30..b7c6f07b46 100644 --- a/resources/i18n/fdmprinter.json.pot +++ b/resources/i18n/fdmprinter.json.pot @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: Uranium json setting files\n" "Report-Msgid-Bugs-To: http://github.com/ultimaker/uranium\n" -"POT-Creation-Date: 2016-04-01 10:50+0000\n" +"POT-Creation-Date: 2016-04-01 13:45+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE\n" @@ -1242,3 +1242,1175 @@ msgstr "" msgctxt "support_angle label" msgid "Overhang Angle" msgstr "" + +#: fdmprinter.json +msgctxt "support_angle description" +msgid "" +"The minimum angle of overhangs for which support is added. At a value of 0° " +"all overhangs are supported, 90° will not provide any support." +msgstr "" + +#: fdmprinter.json +msgctxt "support_pattern label" +msgid "Support Pattern" +msgstr "" + +#: fdmprinter.json +msgctxt "support_pattern description" +msgid "" +"The pattern of the support structures of the print. The different options " +"available result in sturdy or easy to remove support." +msgstr "" + +#: fdmprinter.json +msgctxt "support_pattern option lines" +msgid "Lines" +msgstr "" + +#: fdmprinter.json +msgctxt "support_pattern option grid" +msgid "Grid" +msgstr "" + +#: fdmprinter.json +msgctxt "support_pattern option triangles" +msgid "Triangles" +msgstr "" + +#: fdmprinter.json +msgctxt "support_pattern option concentric" +msgid "Concentric" +msgstr "" + +#: fdmprinter.json +msgctxt "support_pattern option zigzag" +msgid "Zig Zag" +msgstr "" + +#: fdmprinter.json +msgctxt "support_connect_zigzags label" +msgid "Connect ZigZags" +msgstr "" + +#: fdmprinter.json +msgctxt "support_connect_zigzags description" +msgid "" +"Connect the ZigZags. This will increase the strength of the zig zag support " +"structure." +msgstr "" + +#: fdmprinter.json +msgctxt "support_infill_rate label" +msgid "Support Density" +msgstr "" + +#: fdmprinter.json +msgctxt "support_infill_rate description" +msgid "" +"Adjusts the density of the support structure. A higher value results in " +"better overhangs, but the supports are harder to remove." +msgstr "" + +#: fdmprinter.json +msgctxt "support_line_distance label" +msgid "Support Line Distance" +msgstr "" + +#: fdmprinter.json +msgctxt "support_line_distance description" +msgid "" +"Distance between the printed support structure lines. This setting is " +"calculated by the support density." +msgstr "" + +#: fdmprinter.json +msgctxt "support_xy_distance label" +msgid "X/Y Distance" +msgstr "" + +#: fdmprinter.json +msgctxt "support_xy_distance description" +msgid "Distance of the support structure from the print in the X/Y directions." +msgstr "" + +#: fdmprinter.json +msgctxt "support_z_distance label" +msgid "Z Distance" +msgstr "" + +#: fdmprinter.json +msgctxt "support_z_distance description" +msgid "" +"Distance from the top/bottom of the support structure to the print. This gap " +"provides clearance to remove the supports after the model is printed. This " +"value is rounded down to a multiple of the layer height." +msgstr "" + +#: fdmprinter.json +msgctxt "support_top_distance label" +msgid "Top Distance" +msgstr "" + +#: fdmprinter.json +msgctxt "support_top_distance description" +msgid "Distance from the top of the support to the print." +msgstr "" + +#: fdmprinter.json +msgctxt "support_bottom_distance label" +msgid "Bottom Distance" +msgstr "" + +#: fdmprinter.json +msgctxt "support_bottom_distance description" +msgid "Distance from the print to the bottom of the support." +msgstr "" + +#: fdmprinter.json +msgctxt "support_bottom_stair_step_height label" +msgid "Stair Step Height" +msgstr "" + +#: fdmprinter.json +msgctxt "support_bottom_stair_step_height description" +msgid "" +"The height of the steps of the stair-like bottom of support resting on the " +"model. A low value makes the support harder to remove, but too high values " +"can lead to unstable support structures." +msgstr "" + +#: fdmprinter.json +msgctxt "support_join_distance label" +msgid "Join Distance" +msgstr "" + +#: fdmprinter.json +msgctxt "support_join_distance description" +msgid "" +"The maximum distance between support structures in the X/Y directions. When " +"seperate structures are closer together than this value, the structures " +"merge into one." +msgstr "" + +#: fdmprinter.json +msgctxt "support_offset label" +msgid "Horizontal Expansion" +msgstr "" + +#: fdmprinter.json +msgctxt "support_offset description" +msgid "" +"Amount of offset applied to all support polygons in each layer. Positive " +"values can smooth out the support areas and result in more sturdy support." +msgstr "" + +#: fdmprinter.json +msgctxt "support_area_smoothing label" +msgid "Area Smoothing" +msgstr "" + +#: fdmprinter.json +msgctxt "support_area_smoothing description" +msgid "" +"Maximum distance in the X/Y directions of a line segment which is to be " +"smoothed out. Ragged lines are introduced by the join distance and support " +"bridge, which cause the machine to resonate. Smoothing the support areas " +"won't cause them to break with the constraints, except it might change the " +"overhang." +msgstr "" + +#: fdmprinter.json +msgctxt "support_roof_enable label" +msgid "Enable Support Roof" +msgstr "" + +#: fdmprinter.json +msgctxt "support_roof_enable description" +msgid "" +"Generate a dense top skin at the top of the support on which the model is " +"printed." +msgstr "" + +#: fdmprinter.json +msgctxt "support_roof_height label" +msgid "Support Roof Thickness" +msgstr "" + +#: fdmprinter.json +msgctxt "support_roof_height description" +msgid "The thickness of the support roofs." +msgstr "" + +#: fdmprinter.json +msgctxt "support_roof_density label" +msgid "Support Roof Density" +msgstr "" + +#: fdmprinter.json +msgctxt "support_roof_density description" +msgid "" +"Adjusts the density of the roof of the support structure. A higher value " +"results in better overhangs, but the supports are harder to remove." +msgstr "" + +#: fdmprinter.json +msgctxt "support_roof_line_distance label" +msgid "Support Roof Line Distance" +msgstr "" + +#: fdmprinter.json +msgctxt "support_roof_line_distance description" +msgid "" +"Distance between the printed support roof lines. This setting is calculated " +"by the support roof Density, but can be adjusted separately." +msgstr "" + +#: fdmprinter.json +msgctxt "support_roof_pattern label" +msgid "Support Roof Pattern" +msgstr "" + +#: fdmprinter.json +msgctxt "support_roof_pattern description" +msgid "The pattern with which the top of the support is printed." +msgstr "" + +#: fdmprinter.json +msgctxt "support_roof_pattern option lines" +msgid "Lines" +msgstr "" + +#: fdmprinter.json +msgctxt "support_roof_pattern option grid" +msgid "Grid" +msgstr "" + +#: fdmprinter.json +msgctxt "support_roof_pattern option triangles" +msgid "Triangles" +msgstr "" + +#: fdmprinter.json +msgctxt "support_roof_pattern option concentric" +msgid "Concentric" +msgstr "" + +#: fdmprinter.json +msgctxt "support_roof_pattern option zigzag" +msgid "Zig Zag" +msgstr "" + +#: fdmprinter.json +msgctxt "support_conical_enabled label" +msgid "Conical Support" +msgstr "" + +#: fdmprinter.json +msgctxt "support_conical_enabled description" +msgid "" +"Experimental feature: Make support areas smaller at the bottom than at the " +"overhang." +msgstr "" + +#: fdmprinter.json +msgctxt "support_conical_angle label" +msgid "Cone Angle" +msgstr "" + +#: fdmprinter.json +msgctxt "support_conical_angle description" +msgid "" +"The angle of the tilt of conical support. With 0 degrees being vertical, and " +"90 degrees being horizontal. Smaller angles cause the support to be more " +"sturdy, but consist of more material. Negative angles cause the base of the " +"support to be wider than the top." +msgstr "" + +#: fdmprinter.json +msgctxt "support_conical_min_width label" +msgid "Cone Minimal Width" +msgstr "" + +#: fdmprinter.json +msgctxt "support_conical_min_width description" +msgid "" +"Minimal width to which the base of the conical support area is reduced. " +"Small widths can lead to unstable support structures." +msgstr "" + +#: fdmprinter.json +msgctxt "support_use_towers label" +msgid "Use Towers" +msgstr "" + +#: fdmprinter.json +msgctxt "support_use_towers description" +msgid "" +"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." +msgstr "" + +#: fdmprinter.json +msgctxt "support_tower_diameter label" +msgid "Tower Diameter" +msgstr "" + +#: fdmprinter.json +msgctxt "support_tower_diameter description" +msgid "The diameter of a special tower." +msgstr "" + +#: fdmprinter.json +msgctxt "support_minimal_diameter label" +msgid "Minimum Diameter" +msgstr "" + +#: fdmprinter.json +msgctxt "support_minimal_diameter description" +msgid "" +"Minimum diameter in the X/Y directions of a small area which is to be " +"supported by a specialized support tower." +msgstr "" + +#: fdmprinter.json +msgctxt "support_tower_roof_angle label" +msgid "Tower Roof Angle" +msgstr "" + +#: fdmprinter.json +msgctxt "support_tower_roof_angle description" +msgid "" +"The angle of a rooftop of a tower. A higher value results in pointed tower " +"roofs, a lower value results in flattened tower roofs." +msgstr "" + +#: fdmprinter.json +msgctxt "platform_adhesion label" +msgid "Platform Adhesion" +msgstr "" + +#: fdmprinter.json +msgctxt "adhesion_type label" +msgid "Type" +msgstr "" + +#: fdmprinter.json +msgctxt "adhesion_type description" +msgid "" +"Different options that help to improve both priming your extrusion and " +"adhesion to the build plate. Brim adds a single layer flat area around the " +"base of your object to prevent warping. Raft adds a thick grid with a roof " +"below the object. Skirt is a line printed around the object, but not " +"connected to the model." +msgstr "" + +#: fdmprinter.json +msgctxt "adhesion_type option skirt" +msgid "Skirt" +msgstr "" + +#: fdmprinter.json +msgctxt "adhesion_type option brim" +msgid "Brim" +msgstr "" + +#: fdmprinter.json +msgctxt "adhesion_type option raft" +msgid "Raft" +msgstr "" + +#: fdmprinter.json +msgctxt "skirt_line_count label" +msgid "Skirt Line Count" +msgstr "" + +#: fdmprinter.json +msgctxt "skirt_line_count description" +msgid "" +"Multiple skirt lines help to prime your extrusion better for small objects. " +"Setting this to 0 will disable the skirt." +msgstr "" + +#: fdmprinter.json +msgctxt "skirt_gap label" +msgid "Skirt Distance" +msgstr "" + +#: fdmprinter.json +msgctxt "skirt_gap description" +msgid "" +"The horizontal distance between the skirt and the first layer of the print.\n" +"This is the minimum distance, multiple skirt lines will extend outwards from " +"this distance." +msgstr "" + +#: fdmprinter.json +msgctxt "skirt_minimal_length label" +msgid "Skirt Minimum Length" +msgstr "" + +#: fdmprinter.json +msgctxt "skirt_minimal_length description" +msgid "" +"The minimum length of the skirt. If this length is not reached by the skirt " +"line count, more skirt lines will be added until the minimum length is " +"reached. Note: If the line count is set to 0 this is ignored." +msgstr "" + +#: fdmprinter.json +msgctxt "brim_width label" +msgid "Brim Width" +msgstr "" + +#: fdmprinter.json +msgctxt "brim_width description" +msgid "" +"The distance from the model to the outermost brim line. A larger brim " +"enhances adhesion to the build plate, but also reduces the effective print " +"area." +msgstr "" + +#: fdmprinter.json +msgctxt "brim_line_count label" +msgid "Brim Line Count" +msgstr "" + +#: fdmprinter.json +msgctxt "brim_line_count description" +msgid "" +"The number of lines used for a brim. More brim lines enhance adhesion to the " +"build plate, but also reduces the effective print area." +msgstr "" + +#: fdmprinter.json +msgctxt "raft_margin label" +msgid "Raft Extra Margin" +msgstr "" + +#: fdmprinter.json +msgctxt "raft_margin description" +msgid "" +"If the raft is enabled, this is the extra raft area around the object which " +"is also given a raft. Increasing this margin will create a stronger raft " +"while using more material and leaving less area for your print." +msgstr "" + +#: fdmprinter.json +msgctxt "raft_airgap label" +msgid "Raft Air-gap" +msgstr "" + +#: fdmprinter.json +msgctxt "raft_airgap description" +msgid "" +"The gap between the final raft layer and the first layer of the object. Only " +"the first layer is raised by this amount to lower the bonding between the " +"raft layer and the object. Makes it easier to peel off the raft." +msgstr "" + +#: fdmprinter.json +msgctxt "raft_surface_layers label" +msgid "Raft Top Layers" +msgstr "" + +#: fdmprinter.json +msgctxt "raft_surface_layers description" +msgid "" +"The number of top layers on top of the 2nd raft layer. These are fully " +"filled layers that the object sits on. 2 layers result in a smoother top " +"surface than 1." +msgstr "" + +#: fdmprinter.json +msgctxt "raft_surface_thickness label" +msgid "Raft Top Layer Thickness" +msgstr "" + +#: fdmprinter.json +msgctxt "raft_surface_thickness description" +msgid "Layer thickness of the top raft layers." +msgstr "" + +#: fdmprinter.json +msgctxt "raft_surface_line_width label" +msgid "Raft Top Line Width" +msgstr "" + +#: fdmprinter.json +msgctxt "raft_surface_line_width description" +msgid "" +"Width of the lines in the top surface of the raft. These can be thin lines " +"so that the top of the raft becomes smooth." +msgstr "" + +#: fdmprinter.json +msgctxt "raft_surface_line_spacing label" +msgid "Raft Top Spacing" +msgstr "" + +#: fdmprinter.json +msgctxt "raft_surface_line_spacing description" +msgid "" +"The distance between the raft lines for the top raft layers. The spacing " +"should be equal to the line width, so that the surface is solid." +msgstr "" + +#: fdmprinter.json +msgctxt "raft_interface_thickness label" +msgid "Raft Middle Thickness" +msgstr "" + +#: fdmprinter.json +msgctxt "raft_interface_thickness description" +msgid "Layer thickness of the middle raft layer." +msgstr "" + +#: fdmprinter.json +msgctxt "raft_interface_line_width label" +msgid "Raft Middle Line Width" +msgstr "" + +#: fdmprinter.json +msgctxt "raft_interface_line_width description" +msgid "" +"Width of the lines in the middle raft layer. Making the second layer extrude " +"more causes the lines to stick to the bed." +msgstr "" + +#: fdmprinter.json +msgctxt "raft_interface_line_spacing label" +msgid "Raft Middle Spacing" +msgstr "" + +#: fdmprinter.json +msgctxt "raft_interface_line_spacing description" +msgid "" +"The distance between the raft lines for the middle raft layer. The spacing " +"of the middle should be quite wide, while being dense enough to support the " +"top raft layers." +msgstr "" + +#: fdmprinter.json +msgctxt "raft_base_thickness label" +msgid "Raft Base Thickness" +msgstr "" + +#: fdmprinter.json +msgctxt "raft_base_thickness description" +msgid "" +"Layer thickness of the base raft layer. This should be a thick layer which " +"sticks firmly to the printer bed." +msgstr "" + +#: fdmprinter.json +msgctxt "raft_base_line_width label" +msgid "Raft Base Line Width" +msgstr "" + +#: fdmprinter.json +msgctxt "raft_base_line_width description" +msgid "" +"Width of the lines in the base raft layer. These should be thick lines to " +"assist in bed adhesion." +msgstr "" + +#: fdmprinter.json +msgctxt "raft_base_line_spacing label" +msgid "Raft Line Spacing" +msgstr "" + +#: fdmprinter.json +msgctxt "raft_base_line_spacing description" +msgid "" +"The distance between the raft lines for the base raft layer. Wide spacing " +"makes for easy removal of the raft from the build plate." +msgstr "" + +#: fdmprinter.json +msgctxt "raft_speed label" +msgid "Raft Print Speed" +msgstr "" + +#: fdmprinter.json +msgctxt "raft_speed description" +msgid "The speed at which the raft is printed." +msgstr "" + +#: fdmprinter.json +msgctxt "raft_surface_speed label" +msgid "Raft Surface Print Speed" +msgstr "" + +#: fdmprinter.json +msgctxt "raft_surface_speed description" +msgid "" +"The speed at which the surface raft layers are printed. These should be " +"printed a bit slower, so that the nozzle can slowly smooth out adjacent " +"surface lines." +msgstr "" + +#: fdmprinter.json +msgctxt "raft_interface_speed label" +msgid "Raft Interface Print Speed" +msgstr "" + +#: fdmprinter.json +msgctxt "raft_interface_speed description" +msgid "" +"The speed at which the interface raft layer is printed. This should be " +"printed quite slowly, as the volume of material coming out of the nozzle is " +"quite high." +msgstr "" + +#: fdmprinter.json +msgctxt "raft_base_speed label" +msgid "Raft Base Print Speed" +msgstr "" + +#: fdmprinter.json +msgctxt "raft_base_speed description" +msgid "" +"The speed at which the base raft layer is printed. This should be printed " +"quite slowly, as the volume of material coming out of the nozzle is quite " +"high." +msgstr "" + +#: fdmprinter.json +msgctxt "raft_fan_speed label" +msgid "Raft Fan Speed" +msgstr "" + +#: fdmprinter.json +msgctxt "raft_fan_speed description" +msgid "The fan speed for the raft." +msgstr "" + +#: fdmprinter.json +msgctxt "raft_surface_fan_speed label" +msgid "Raft Surface Fan Speed" +msgstr "" + +#: fdmprinter.json +msgctxt "raft_surface_fan_speed description" +msgid "The fan speed for the surface raft layers." +msgstr "" + +#: fdmprinter.json +msgctxt "raft_interface_fan_speed label" +msgid "Raft Interface Fan Speed" +msgstr "" + +#: fdmprinter.json +msgctxt "raft_interface_fan_speed description" +msgid "The fan speed for the interface raft layer." +msgstr "" + +#: fdmprinter.json +msgctxt "raft_base_fan_speed label" +msgid "Raft Base Fan Speed" +msgstr "" + +#: fdmprinter.json +msgctxt "raft_base_fan_speed description" +msgid "The fan speed for the base raft layer." +msgstr "" + +#: fdmprinter.json +msgctxt "meshfix label" +msgid "Mesh Fixes" +msgstr "" + +#: fdmprinter.json +msgctxt "meshfix_union_all label" +msgid "Union Overlapping Volumes" +msgstr "" + +#: fdmprinter.json +msgctxt "meshfix_union_all description" +msgid "" +"Ignore the internal geometry arising from overlapping volumes and print the " +"volumes as one. This may cause internal cavities to disappear." +msgstr "" + +#: fdmprinter.json +msgctxt "meshfix_union_all_remove_holes label" +msgid "Remove All Holes" +msgstr "" + +#: fdmprinter.json +msgctxt "meshfix_union_all_remove_holes description" +msgid "" +"Remove the holes in each layer and keep only the outside shape. This will " +"ignore any invisible internal geometry. However, it also ignores layer holes " +"which can be viewed from above or below." +msgstr "" + +#: fdmprinter.json +msgctxt "meshfix_extensive_stitching label" +msgid "Extensive Stitching" +msgstr "" + +#: fdmprinter.json +msgctxt "meshfix_extensive_stitching description" +msgid "" +"Extensive stitching tries to stitch up open holes in the mesh by closing the " +"hole with touching polygons. This option can introduce a lot of processing " +"time." +msgstr "" + +#: fdmprinter.json +msgctxt "meshfix_keep_open_polygons label" +msgid "Keep Disconnected Faces" +msgstr "" + +#: fdmprinter.json +msgctxt "meshfix_keep_open_polygons description" +msgid "" +"Normally Cura tries to stitch up small holes in the mesh and remove parts of " +"a layer with big holes. Enabling this option keeps those parts which cannot " +"be stitched. This option should be used as a last resort option when " +"everything else fails to produce proper GCode." +msgstr "" + +#: fdmprinter.json +msgctxt "blackmagic label" +msgid "Special Modes" +msgstr "" + +#: fdmprinter.json +msgctxt "print_sequence label" +msgid "Print Sequence" +msgstr "" + +#: fdmprinter.json +msgctxt "print_sequence description" +msgid "" +"Whether to print all objects one layer at a time or to wait for one object " +"to finish, before moving on to the next. One at a time mode is only possible " +"if all models are separated in such a way that the whole print head can move " +"in between and all models are lower than the distance between the nozzle and " +"the X/Y axes." +msgstr "" + +#: fdmprinter.json +msgctxt "print_sequence option all_at_once" +msgid "All at Once" +msgstr "" + +#: fdmprinter.json +msgctxt "print_sequence option one_at_a_time" +msgid "One at a Time" +msgstr "" + +#: fdmprinter.json +msgctxt "magic_mesh_surface_mode label" +msgid "Surface Mode" +msgstr "" + +#: fdmprinter.json +msgctxt "magic_mesh_surface_mode description" +msgid "" +"Print the surface instead of the volume. No infill, no top/bottom skin, just " +"a single wall of which the middle coincides with the surface of the mesh. " +"It's also possible to do both: print the insides of a closed volume as " +"normal, but print all polygons not part of a closed volume as surface." +msgstr "" + +#: fdmprinter.json +msgctxt "magic_mesh_surface_mode option normal" +msgid "Normal" +msgstr "" + +#: fdmprinter.json +msgctxt "magic_mesh_surface_mode option surface" +msgid "Surface" +msgstr "" + +#: fdmprinter.json +msgctxt "magic_mesh_surface_mode option both" +msgid "Both" +msgstr "" + +#: fdmprinter.json +msgctxt "magic_spiralize label" +msgid "Spiralize Outer Contour" +msgstr "" + +#: fdmprinter.json +msgctxt "magic_spiralize description" +msgid "" +"Spiralize smooths out the Z move of the outer edge. This will create a " +"steady Z increase over the whole print. This feature turns a solid object " +"into a single walled print with a solid bottom. This feature used to be " +"called Joris in older versions." +msgstr "" + +#: fdmprinter.json +msgctxt "experimental label" +msgid "Experimental" +msgstr "" + +#: fdmprinter.json +msgctxt "magic_fuzzy_skin_enabled label" +msgid "Fuzzy Skin" +msgstr "" + +#: fdmprinter.json +msgctxt "magic_fuzzy_skin_enabled description" +msgid "" +"Randomly jitter while printing the outer wall, so that the surface has a " +"rough and fuzzy look." +msgstr "" + +#: fdmprinter.json +msgctxt "magic_fuzzy_skin_thickness label" +msgid "Fuzzy Skin Thickness" +msgstr "" + +#: fdmprinter.json +msgctxt "magic_fuzzy_skin_thickness description" +msgid "" +"The width within which to jitter. It's advised to keep this below the outer " +"wall width, since the inner walls are unaltered." +msgstr "" + +#: fdmprinter.json +msgctxt "magic_fuzzy_skin_point_density label" +msgid "Fuzzy Skin Density" +msgstr "" + +#: fdmprinter.json +msgctxt "magic_fuzzy_skin_point_density description" +msgid "" +"The average density of points introduced on each polygon in a layer. Note " +"that the original points of the polygon are discarded, so a low density " +"results in a reduction of the resolution." +msgstr "" + +#: fdmprinter.json +msgctxt "magic_fuzzy_skin_point_dist label" +msgid "Fuzzy Skin Point Distance" +msgstr "" + +#: fdmprinter.json +msgctxt "magic_fuzzy_skin_point_dist description" +msgid "" +"The average distance between the random points introduced on each line " +"segment. Note that the original points of the polygon are discarded, so a " +"high smoothness results in a reduction of the resolution. This value must be " +"higher than half the Fuzzy Skin Thickness." +msgstr "" + +#: fdmprinter.json +msgctxt "wireframe_enabled label" +msgid "Wire Printing" +msgstr "" + +#: fdmprinter.json +msgctxt "wireframe_enabled description" +msgid "" +"Print only the outside surface with a sparse webbed structure, printing 'in " +"thin air'. This is realized by horizontally printing the contours of the " +"model at given Z intervals which are connected via upward and diagonally " +"downward lines." +msgstr "" + +#: fdmprinter.json +msgctxt "wireframe_height label" +msgid "WP Connection Height" +msgstr "" + +#: fdmprinter.json +msgctxt "wireframe_height description" +msgid "" +"The height of the upward and diagonally downward lines between two " +"horizontal parts. This determines the overall density of the net structure. " +"Only applies to Wire Printing." +msgstr "" + +#: fdmprinter.json +msgctxt "wireframe_roof_inset label" +msgid "WP Roof Inset Distance" +msgstr "" + +#: fdmprinter.json +msgctxt "wireframe_roof_inset description" +msgid "" +"The distance covered when making a connection from a roof outline inward. " +"Only applies to Wire Printing." +msgstr "" + +#: fdmprinter.json +msgctxt "wireframe_printspeed label" +msgid "WP speed" +msgstr "" + +#: fdmprinter.json +msgctxt "wireframe_printspeed description" +msgid "" +"Speed at which the nozzle moves when extruding material. Only applies to " +"Wire Printing." +msgstr "" + +#: fdmprinter.json +msgctxt "wireframe_printspeed_bottom label" +msgid "WP Bottom Printing Speed" +msgstr "" + +#: fdmprinter.json +msgctxt "wireframe_printspeed_bottom description" +msgid "" +"Speed of printing the first layer, which is the only layer touching the " +"build platform. Only applies to Wire Printing." +msgstr "" + +#: fdmprinter.json +msgctxt "wireframe_printspeed_up label" +msgid "WP Upward Printing Speed" +msgstr "" + +#: fdmprinter.json +msgctxt "wireframe_printspeed_up description" +msgid "" +"Speed of printing a line upward 'in thin air'. Only applies to Wire Printing." +msgstr "" + +#: fdmprinter.json +msgctxt "wireframe_printspeed_down label" +msgid "WP Downward Printing Speed" +msgstr "" + +#: fdmprinter.json +msgctxt "wireframe_printspeed_down description" +msgid "" +"Speed of printing a line diagonally downward. Only applies to Wire Printing." +msgstr "" + +#: fdmprinter.json +msgctxt "wireframe_printspeed_flat label" +msgid "WP Horizontal Printing Speed" +msgstr "" + +#: fdmprinter.json +msgctxt "wireframe_printspeed_flat description" +msgid "" +"Speed of printing the horizontal contours of the object. Only applies to " +"Wire Printing." +msgstr "" + +#: fdmprinter.json +msgctxt "wireframe_flow label" +msgid "WP Flow" +msgstr "" + +#: fdmprinter.json +msgctxt "wireframe_flow description" +msgid "" +"Flow compensation: the amount of material extruded is multiplied by this " +"value. Only applies to Wire Printing." +msgstr "" + +#: fdmprinter.json +msgctxt "wireframe_flow_connection label" +msgid "WP Connection Flow" +msgstr "" + +#: fdmprinter.json +msgctxt "wireframe_flow_connection description" +msgid "Flow compensation when going up or down. Only applies to Wire Printing." +msgstr "" + +#: fdmprinter.json +msgctxt "wireframe_flow_flat label" +msgid "WP Flat Flow" +msgstr "" + +#: fdmprinter.json +msgctxt "wireframe_flow_flat description" +msgid "" +"Flow compensation when printing flat lines. Only applies to Wire Printing." +msgstr "" + +#: fdmprinter.json +msgctxt "wireframe_top_delay label" +msgid "WP Top Delay" +msgstr "" + +#: fdmprinter.json +msgctxt "wireframe_top_delay description" +msgid "" +"Delay time after an upward move, so that the upward line can harden. Only " +"applies to Wire Printing." +msgstr "" + +#: fdmprinter.json +msgctxt "wireframe_bottom_delay label" +msgid "WP Bottom Delay" +msgstr "" + +#: fdmprinter.json +msgctxt "wireframe_bottom_delay description" +msgid "Delay time after a downward move. Only applies to Wire Printing." +msgstr "" + +#: fdmprinter.json +msgctxt "wireframe_flat_delay label" +msgid "WP Flat Delay" +msgstr "" + +#: fdmprinter.json +msgctxt "wireframe_flat_delay description" +msgid "" +"Delay time between two horizontal segments. Introducing such a delay can " +"cause better adhesion to previous layers at the connection points, while too " +"long delays cause sagging. Only applies to Wire Printing." +msgstr "" + +#: fdmprinter.json +msgctxt "wireframe_up_half_speed label" +msgid "WP Ease Upward" +msgstr "" + +#: fdmprinter.json +msgctxt "wireframe_up_half_speed description" +msgid "" +"Distance of an upward move which is extruded with half speed.\n" +"This can cause better adhesion to previous layers, while not heating the " +"material in those layers too much. Only applies to Wire Printing." +msgstr "" + +#: fdmprinter.json +msgctxt "wireframe_top_jump label" +msgid "WP Knot Size" +msgstr "" + +#: fdmprinter.json +msgctxt "wireframe_top_jump description" +msgid "" +"Creates a small knot at the top of an upward line, so that the consecutive " +"horizontal layer has a better chance to connect to it. Only applies to Wire " +"Printing." +msgstr "" + +#: fdmprinter.json +msgctxt "wireframe_fall_down label" +msgid "WP Fall Down" +msgstr "" + +#: fdmprinter.json +msgctxt "wireframe_fall_down description" +msgid "" +"Distance with which the material falls down after an upward extrusion. This " +"distance is compensated for. Only applies to Wire Printing." +msgstr "" + +#: fdmprinter.json +msgctxt "wireframe_drag_along label" +msgid "WP Drag along" +msgstr "" + +#: fdmprinter.json +msgctxt "wireframe_drag_along description" +msgid "" +"Distance with which the material of an upward extrusion is dragged along " +"with the diagonally downward extrusion. This distance is compensated for. " +"Only applies to Wire Printing." +msgstr "" + +#: fdmprinter.json +msgctxt "wireframe_strategy label" +msgid "WP Strategy" +msgstr "" + +#: fdmprinter.json +msgctxt "wireframe_strategy description" +msgid "" +"Strategy for making sure two consecutive layers connect at each connection " +"point. Retraction lets the upward lines harden in the right position, but " +"may cause filament grinding. A knot can be made at the end of an upward line " +"to heighten the chance of connecting to it and to let the line cool; " +"however, it may require slow printing speeds. Another strategy is to " +"compensate for the sagging of the top of an upward line; however, the lines " +"won't always fall down as predicted." +msgstr "" + +#: fdmprinter.json +msgctxt "wireframe_strategy option compensate" +msgid "Compensate" +msgstr "" + +#: fdmprinter.json +msgctxt "wireframe_strategy option knot" +msgid "Knot" +msgstr "" + +#: fdmprinter.json +msgctxt "wireframe_strategy option retract" +msgid "Retract" +msgstr "" + +#: fdmprinter.json +msgctxt "wireframe_straight_before_down label" +msgid "WP Straighten Downward Lines" +msgstr "" + +#: fdmprinter.json +msgctxt "wireframe_straight_before_down description" +msgid "" +"Percentage of a diagonally downward line which is covered by a horizontal " +"line piece. This can prevent sagging of the top most point of upward lines. " +"Only applies to Wire Printing." +msgstr "" + +#: fdmprinter.json +msgctxt "wireframe_roof_fall_down label" +msgid "WP Roof Fall Down" +msgstr "" + +#: fdmprinter.json +msgctxt "wireframe_roof_fall_down description" +msgid "" +"The distance which horizontal roof lines printed 'in thin air' fall down " +"when being printed. This distance is compensated for. Only applies to Wire " +"Printing." +msgstr "" + +#: fdmprinter.json +msgctxt "wireframe_roof_drag_along label" +msgid "WP Roof Drag Along" +msgstr "" + +#: fdmprinter.json +msgctxt "wireframe_roof_drag_along description" +msgid "" +"The distance of the end piece of an inward line which gets dragged along " +"when going back to the outer outline of the roof. This distance is " +"compensated for. Only applies to Wire Printing." +msgstr "" + +#: fdmprinter.json +msgctxt "wireframe_roof_outer_delay label" +msgid "WP Roof Outer Delay" +msgstr "" + +#: fdmprinter.json +msgctxt "wireframe_roof_outer_delay description" +msgid "" +"Time spent at the outer perimeters of hole which is to become a roof. Longer " +"times can ensure a better connection. Only applies to Wire Printing." +msgstr "" + +#: fdmprinter.json +msgctxt "wireframe_nozzle_clearance label" +msgid "WP Nozzle Clearance" +msgstr "" + +#: fdmprinter.json +msgctxt "wireframe_nozzle_clearance description" +msgid "" +"Distance between the nozzle and horizontally downward lines. Larger " +"clearance results in diagonally downward lines with a less steep angle, " +"which in turn results in less upward connections with the next layer. Only " +"applies to Wire Printing." +msgstr "" From 819c9568b1fc0450f202bf0dd70c4495cea996da Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 4 Apr 2016 10:29:42 +0200 Subject: [PATCH 85/89] Backend now correctly handles machine instance change CURA-1323 --- plugins/CuraEngineBackend/CuraEngineBackend.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/CuraEngineBackend/CuraEngineBackend.py b/plugins/CuraEngineBackend/CuraEngineBackend.py index 81fc0ab7c2..4985852247 100644 --- a/plugins/CuraEngineBackend/CuraEngineBackend.py +++ b/plugins/CuraEngineBackend/CuraEngineBackend.py @@ -53,7 +53,9 @@ class CuraEngineBackend(Backend): self._onActiveViewChanged() self._stored_layer_data = None - Application.getInstance().getMachineManager().activeMachineInstanceChanged.connect(self._onChanged) + # When there are current settings and machine instance is changed, there is no profile changed event. We should + # pretend there is though. + Application.getInstance().getMachineManager().activeMachineInstanceChanged.connect(self._onActiveProfileChanged) self._profile = None Application.getInstance().getMachineManager().activeProfileChanged.connect(self._onActiveProfileChanged) From f5457504d32e412d727a3e3861e2b1f8eaab9adb Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 4 Apr 2016 11:25:41 +0200 Subject: [PATCH 86/89] One at a time iterator no longer ignores objects higher than gantry height Due to changes in build volume, those objects are already ignored. CURA-1224 --- cura/OneAtATimeIterator.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/cura/OneAtATimeIterator.py b/cura/OneAtATimeIterator.py index 6ecd49d8b3..b700fe83b3 100644 --- a/cura/OneAtATimeIterator.py +++ b/cura/OneAtATimeIterator.py @@ -21,8 +21,6 @@ class OneAtATimeIterator(Iterator.Iterator): if not type(node) is SceneNode: continue - if node.getBoundingBox().height > Application.getInstance().getMachineManager().getWorkingProfile().getSettingValue("gantry_height"): - return if node.callDecoration("getConvexHull"): node_list.append(node) From 9fce463153dac2b8e220ecdc7b117d4a254386ce Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 4 Apr 2016 13:34:43 +0200 Subject: [PATCH 87/89] Removed olson block as upgrade from UM2 Fixes CURA-1280 --- resources/machines/ultimaker2.json | 4 ---- resources/machines/ultimaker2_olsson.json | 21 ----------------- resources/machines/ultimaker2_olsson_025.json | 22 ------------------ resources/machines/ultimaker2_olsson_040.json | 19 --------------- resources/machines/ultimaker2_olsson_060.json | 20 ---------------- resources/machines/ultimaker2_olsson_080.json | 20 ---------------- .../ultimaker2_olsson/0.25_normal.curaprofile | 23 ------------------- .../ultimaker2_olsson/0.4_fast.curaprofile | 22 ------------------ .../ultimaker2_olsson/0.4_high.curaprofile | 22 ------------------ .../ultimaker2_olsson/0.4_normal.curaprofile | 21 ----------------- .../ultimaker2_olsson/0.4_ulti.curaprofile | 22 ------------------ .../ultimaker2_olsson/0.6_normal.curaprofile | 22 ------------------ .../ultimaker2_olsson/0.8_normal.curaprofile | 23 ------------------- 13 files changed, 261 deletions(-) delete mode 100644 resources/machines/ultimaker2_olsson.json delete mode 100644 resources/machines/ultimaker2_olsson_025.json delete mode 100644 resources/machines/ultimaker2_olsson_040.json delete mode 100644 resources/machines/ultimaker2_olsson_060.json delete mode 100644 resources/machines/ultimaker2_olsson_080.json delete mode 100644 resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile delete mode 100644 resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile delete mode 100644 resources/profiles/ultimaker2_olsson/0.4_high.curaprofile delete mode 100644 resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile delete mode 100644 resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile delete mode 100644 resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile delete mode 100644 resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile diff --git a/resources/machines/ultimaker2.json b/resources/machines/ultimaker2.json index 1274cff8cf..214dbba1e0 100644 --- a/resources/machines/ultimaker2.json +++ b/resources/machines/ultimaker2.json @@ -11,10 +11,6 @@ "inherits": "ultimaker.json", - "pages": [ - "SelectUpgradedPartsUM2" - ], - "machine_extruder_trains": [ { "machine_nozzle_heat_up_speed": { diff --git a/resources/machines/ultimaker2_olsson.json b/resources/machines/ultimaker2_olsson.json deleted file mode 100644 index eac32e88a2..0000000000 --- a/resources/machines/ultimaker2_olsson.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "id": "ultimaker2_olsson_base", - "version": 1, - "name": "Ultimaker 2 with Olsson Block", - "manufacturer": "Ultimaker", - "author": "Ultimaker", - "platform": "ultimaker2_platform.obj", - "platform_texture": "Ultimaker2backplate.png", - "visible": false, - "file_formats": "text/x-gcode", - "inherits": "ultimaker2.json", - - "overrides": { - "machine_show_variants": { "default": true }, - "machine_nozzle_head_distance": { "default": 5 }, - "machine_nozzle_expansion_angle": { "default": 45 }, - "machine_height": { "default": 203 }, - "machine_heat_zone_length": { "default": 20 }, - "gantry_height": { "default": 52 } - } -} diff --git a/resources/machines/ultimaker2_olsson_025.json b/resources/machines/ultimaker2_olsson_025.json deleted file mode 100644 index 71552cddfd..0000000000 --- a/resources/machines/ultimaker2_olsson_025.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "id": "ultimaker2_olsson", - "version": 1, - "name": "Ultimaker 2 with Olsson Block", - "manufacturer": "Ultimaker", - "author": "Ultimaker", - "platform": "ultimaker2_platform.obj", - "platform_texture": "Ultimaker2backplate.png", - "visible": false, - "file_formats": "text/x-gcode", - "inherits": "ultimaker2_olsson.json", - - "variant": "0.25 mm", - - "overrides": { - "machine_nozzle_size": { "default": 0.25 }, - "machine_nozzle_tip_outer_diameter": { "default": 0.8 }, - - "coasting_volume": { "default": 0.1 }, - "coasting_min_volume": { "default": 0.17 } - } -} diff --git a/resources/machines/ultimaker2_olsson_040.json b/resources/machines/ultimaker2_olsson_040.json deleted file mode 100644 index ae1c3073d0..0000000000 --- a/resources/machines/ultimaker2_olsson_040.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "id": "ultimaker2_olsson", - "version": 1, - "name": "Ultimaker 2 with Olsson Block", - "manufacturer": "Ultimaker", - "author": "Ultimaker", - "platform": "ultimaker2_platform.obj", - "platform_texture": "Ultimaker2backplate.png", - "visible": false, - "file_formats": "text/x-gcode", - "inherits": "ultimaker2_olsson.json", - - "variant": "0.4 mm", - - "overrides": { - "machine_nozzle_size": { "default": 0.40 }, - "machine_nozzle_tip_outer_diameter": { "default": 1.05 } - } -} diff --git a/resources/machines/ultimaker2_olsson_060.json b/resources/machines/ultimaker2_olsson_060.json deleted file mode 100644 index f87b79b64e..0000000000 --- a/resources/machines/ultimaker2_olsson_060.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "id": "ultimaker2_olsson", - "version": 1, - "name": "Ultimaker 2 with Olsson Block", - "manufacturer": "Ultimaker", - "author": "Ultimaker", - "platform": "ultimaker2_platform.obj", - "platform_texture": "Ultimaker2backplate.png", - "visible": false, - "file_formats": "text/x-gcode", - "inherits": "ultimaker2_olsson.json", - - "variant": "0.6 mm", - - "overrides": { - "machine_nozzle_size": { "default": 0.60 }, - "machine_nozzle_tip_outer_diameter": { "default": 1.25 }, - "coasting_volume": { "default": 1.36 } - } -} diff --git a/resources/machines/ultimaker2_olsson_080.json b/resources/machines/ultimaker2_olsson_080.json deleted file mode 100644 index e3018e42ad..0000000000 --- a/resources/machines/ultimaker2_olsson_080.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "id": "ultimaker2_olsson", - "version": 1, - "name": "Ultimaker 2 with Olsson Block", - "manufacturer": "Ultimaker", - "author": "Ultimaker", - "platform": "ultimaker2_platform.obj", - "platform_texture": "Ultimaker2backplate.png", - "visible": false, - "file_formats": "text/x-gcode", - "inherits": "ultimaker2_olsson.json", - - "variant": "0.8 mm", - - "overrides": { - "machine_nozzle_size": { "default": 0.80 }, - "machine_nozzle_tip_outer_diameter": { "default": 1.35 }, - "coasting_volume": { "default": 3.22 } - } -} diff --git a/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile deleted file mode 100644 index bde58062f0..0000000000 --- a/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile +++ /dev/null @@ -1,23 +0,0 @@ -[general] -version = 1 -name = Normal Quality -machine_type = ultimaker2_olsson -machine_variant = 0.25 mm -weight = -2 - -[settings] -line_width = 0.22 -layer_height = 0.06 -layer_height_0 = 0.15 -wall_thickness = 0.88 -top_bottom_thickness = 0.72 -infill_sparse_density = 22 -infill_overlap = 0.022 -retraction_amount = 6 -retraction_extrusion_window = 6 -speed_infill = 30 -speed_wall_0 = 20 -speed_wall_x = 25 -speed_topbottom = 20 -speed_layer_0 = 25 -cool_min_layer_time_fan_speed_max = 15 diff --git a/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile deleted file mode 100644 index b31b36267a..0000000000 --- a/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile +++ /dev/null @@ -1,22 +0,0 @@ -[general] -version = 1 -name = Fast Print -machine_type = ultimaker2_olsson -machine_variant = 0.4 mm -weight = -1 - -[settings] -line_width = 0.35 -layer_height = 0.15 -layer_height_0 = 0.26 -wall_thickness = 0.7 -top_bottom_thickness = 0.6 -infill_sparse_density = 18 -infill_overlap = 0.035 -retraction_amount = 5.5 -retraction_extrusion_window = 6 -speed_wall_0 = 40 -speed_wall_x = 50 -speed_travel = 150 -speed_layer_0 = 25 -cool_min_layer_time_fan_speed_max = 15 diff --git a/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile deleted file mode 100644 index 16e9a6cfd5..0000000000 --- a/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile +++ /dev/null @@ -1,22 +0,0 @@ -[general] -version = 1 -name = High Quality -machine_type = ultimaker2_olsson -machine_variant = 0.4 mm -weight = -3 - -[settings] -line_width = 0.35 -layer_height = 0.06 -layer_height_0 = 0.26 -wall_thickness = 1.05 -top_bottom_thickness = 0.84 -infill_sparse_density = 22 -infill_overlap = 0.035 -retraction_amount = 5.5 -retraction_extrusion_window = 6 -speed_infill = 50 -speed_wall_x = 40 -speed_topbottom = 20 -speed_layer_0 = 25 -cool_min_layer_time_fan_speed_max = 15 diff --git a/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile deleted file mode 100644 index 9e745b37cd..0000000000 --- a/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile +++ /dev/null @@ -1,21 +0,0 @@ -[general] -version = 1 -name = Normal Quality -machine_type = ultimaker2_olsson -machine_variant = 0.4 mm -weight = -2 - -[settings] -line_width = 0.35 -layer_height = 0.1 -layer_height_0 = 0.26 -wall_thickness = 1.05 -top_bottom_thickness = 0.8 -infill_overlap = 0.035 -retraction_amount = 5.5 -retraction_extrusion_window = 6 -speed_infill = 50 -speed_wall_x = 40 -speed_topbottom = 20 -speed_layer_0 = 25 -cool_min_layer_time_fan_speed_max = 15 \ No newline at end of file diff --git a/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile deleted file mode 100644 index 1970a0c96c..0000000000 --- a/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile +++ /dev/null @@ -1,22 +0,0 @@ -[general] -version = 1 -name = Ulti Quality -machine_type = ultimaker2_olsson -machine_variant = 0.4 mm -weight = -4 - -[settings] -line_width = 0.35 -layer_height = 0.04 -layer_height_0 = 0.26 -wall_thickness = 1.4 -top_bottom_thickness = 1.12 -infill_sparse_density = 25 -infill_overlap = 0.035 -retraction_amount = 5.5 -retraction_extrusion_window = 6 -speed_infill = 50 -speed_wall_x = 40 -speed_topbottom = 20 -speed_layer_0 = 25 -cool_min_layer_time_fan_speed_max = 15 diff --git a/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile deleted file mode 100644 index cd2cc7dee7..0000000000 --- a/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile +++ /dev/null @@ -1,22 +0,0 @@ -[general] -version = 1 -name = Normal Quality -machine_type = ultimaker2_olsson -machine_variant = 0.6 mm -weight = -2 - -[settings] -line_width = 0.53 -layer_height = 0.15 -layer_height_0 = 0.4 -wall_thickness = 1.59 -top_bottom_thickness = 1.2 -infill_overlap = 0.053 -retraction_amount = 6 -retraction_extrusion_window = 6 -speed_infill = 55 -speed_wall_0 = 25 -speed_wall_x = 40 -speed_topbottom = 20 -speed_layer_0 = 25 -cool_min_layer_time_fan_speed_max = 20 \ No newline at end of file diff --git a/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile deleted file mode 100644 index 27fd2701a1..0000000000 --- a/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile +++ /dev/null @@ -1,23 +0,0 @@ -[general] -version = 1 -name = Normal Quality -machine_type = ultimaker2_olsson -machine_variant = 0.8 mm -weight = -2 - -[settings] -line_width = 0.7 -layer_height = 0.2 -layer_height_0 = 0.5 -wall_thickness = 2.1 -top_bottom_thickness = 1.6 -infill_sparse_density = 20 -infill_overlap = 0.07 -retraction_amount = 6 -retraction_extrusion_window = 6 -speed_infill = 40 -speed_wall_0 = 20 -speed_wall_x = 30 -speed_topbottom = 20 -speed_layer_0 = 25 -cool_min_layer_time_fan_speed_max = 25 From c1e0b38b8e0c0144f4201f1270f21696e8b4a39b Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 4 Apr 2016 13:42:15 +0200 Subject: [PATCH 88/89] Moved multiple settings (draft shield, coasting, conical support, etc) into experimental CURA-1267 --- resources/machines/fdmprinter.json | 280 ++++++++++++++--------------- 1 file changed, 140 insertions(+), 140 deletions(-) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index 594d854497..1695df01bc 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -429,22 +429,6 @@ "default": "lines", "visible": false }, - "skin_alternate_rotation": { - "label": "Alternate Skin Rotation", - "description": "Alternate the direction in which the top/bottom layers are printed. Normally they are printed diagonally only. This setting adds the X-only and Y-only directions.", - "type": "boolean", - "default": false, - "visible": false - }, - "skin_outline_count": { - "label": "Extra Skin Wall Count", - "description": "Replaces the outermost part of the top/bottom pattern with a number of concentric lines. Using one or two lines improves roofs that start on infill material.", - "default": 0, - "min_value": "0", - "max_value_warning": "10", - "type": "int", - "visible": false - }, "alternate_extra_perimeter": { "label": "Alternate Extra Wall", "description": "Prints an extra wall at every other layer. This way infill gets caught between these extra walls, resulting in stronger prints.", @@ -1001,52 +985,6 @@ "inherit": false, "enabled": "retraction_combing and travel_avoid_other_parts", "global_only": "True" - }, - "coasting_enable": { - "label": "Enable Coasting", - "description": "Coasting replaces the last part of an extrusion path with a travel path. The oozed material is used to print the last piece of the extrusion path in order to reduce stringing.", - "type": "boolean", - "default": false, - "visible": false, - "global_only": true - }, - "coasting_volume": { - "label": "Coasting Volume", - "description": "The volume otherwise oozed. This value should generally be close to the nozzle diameter cubed.", - "unit": "mm³", - "type": "float", - "default": 0.064, - "min_value": "0", - "max_value_warning": "2.0", - "visible": false, - "inherit": false, - "enabled": "coasting_enable", - "global_only": true - }, - "coasting_min_volume": { - "label": "Minimum Volume Before Coasting", - "description": "The lowest volume an extrusion path should have before allowing coasting. For smaller extrusion paths, less pressure has been built up in the bowden tube and so the coasted volume is scaled linearly. This value should always be larger than the Coasting Volume.", - "unit": "mm³", - "type": "float", - "default": 0.8, - "min_value": "0", - "max_value_warning": "10.0", - "visible": false, - "enabled": "coasting_enable", - "global_only": true - }, - "coasting_speed": { - "label": "Coasting Speed", - "description": "The speed by which to move during coasting, relative to the speed of the extrusion path. A value slightly under 100% is advised, since during the coasting move the pressure in the bowden tube drops.", - "unit": "%", - "type": "float", - "default": 90, - "min_value": "0.0001", - "max_value_warning": "100", - "visible": false, - "inherit": false, - "enabled": "coasting_enable", - "global_only": true } } }, @@ -1167,51 +1105,6 @@ "default": false, "visible": false, "global_only": "True" - }, - "draft_shield_enabled": { - "label": "Enable Draft Shield", - "description": "This will create a wall around the object, which traps (hot) air and shields against exterior airflow. Especially useful for materials which warp easily.", - "type": "boolean", - "default": false, - "global_only": true - }, - "draft_shield_dist": { - "label": "Draft Shield X/Y Distance", - "description": "Distance of the draft shield from the print, in the X/Y directions.", - "unit": "mm", - "type": "float", - "min_value": "0", - "max_value_warning": "100", - "default": 10, - "visible": false, - "enabled": "draft_shield_enabled", - "global_only": true - }, - "draft_shield_height_limitation": { - "label": "Draft Shield Limitation", - "description": "Set the height of the draft shield. Choose to print the draft shield at the full height of the object or at a limited height.", - "type": "enum", - "options": { - "full": "Full", - "limited": "Limited" - }, - "default": "full", - "visible": false, - "enabled": "draft_shield_enabled", - "global_only": true - }, - "draft_shield_height": { - "label": "Draft Shield Height", - "description": "Height limitation of the draft shield. Above this height no draft shield will be printed.", - "unit": "mm", - "type": "float", - "min_value": "0", - "max_value_warning": "9999", - "default": 0, - "inherit_function": "9999 if draft_shield_height_limitation == 'full' and draft_shield_enabled else 0.0", - "visible": false, - "enabled": "draft_shield_height_limitation == \"limited\"", - "global_only": true } } }, @@ -1450,39 +1343,6 @@ "enabled": "support_roof_enable", "global_only": true }, - "support_conical_enabled": { - "label": "Conical Support", - "description": "Experimental feature: Make support areas smaller at the bottom than at the overhang.", - "type": "boolean", - "default": false, - "visible": true, - "enabled": "support_enable" - }, - "support_conical_angle": { - "label": "Cone Angle", - "description": "The angle of the tilt of conical support. With 0 degrees being vertical, and 90 degrees being horizontal. Smaller angles cause the support to be more sturdy, but consist of more material. Negative angles cause the base of the support to be wider than the top.", - "unit": "°", - "type": "float", - "min_value": "-90", - "min_value_warning": "-45", - "max_value_warning": "45", - "max_value": "90", - "default": 30, - "visible": false, - "enabled": "support_conical_enabled and support_enable" - }, - "support_conical_min_width": { - "label": "Cone Minimal Width", - "description": "Minimal width to which the base of the conical support area is reduced. Small widths can lead to unstable support structures.", - "unit": "mm", - "default": 5.0, - "min_value": "0", - "min_value_warning": "machine_nozzle_size * 3", - "max_value_warning": "100.0", - "type": "float", - "visible": false, - "enabled": "support_conical_enabled and support_enable" - }, "support_use_towers": { "label": "Use Towers", "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.", @@ -1940,6 +1800,146 @@ "visible": true, "icon": "category_blackmagic", "settings": { + "draft_shield_enabled": { + "label": "Enable Draft Shield", + "description": "This will create a wall around the object, which traps (hot) air and shields against exterior airflow. Especially useful for materials which warp easily.", + "type": "boolean", + "default": false, + "global_only": true + }, + "draft_shield_dist": { + "label": "Draft Shield X/Y Distance", + "description": "Distance of the draft shield from the print, in the X/Y directions.", + "unit": "mm", + "type": "float", + "min_value": "0", + "max_value_warning": "100", + "default": 10, + "visible": false, + "enabled": "draft_shield_enabled", + "global_only": true + }, + "draft_shield_height_limitation": { + "label": "Draft Shield Limitation", + "description": "Set the height of the draft shield. Choose to print the draft shield at the full height of the object or at a limited height.", + "type": "enum", + "options": { + "full": "Full", + "limited": "Limited" + }, + "default": "full", + "visible": false, + "enabled": "draft_shield_enabled", + "global_only": true + }, + "draft_shield_height": { + "label": "Draft Shield Height", + "description": "Height limitation of the draft shield. Above this height no draft shield will be printed.", + "unit": "mm", + "type": "float", + "min_value": "0", + "max_value_warning": "9999", + "default": 0, + "inherit_function": "9999 if draft_shield_height_limitation == 'full' and draft_shield_enabled else 0.0", + "visible": false, + "enabled": "draft_shield_height_limitation == \"limited\"", + "global_only": true + }, + "coasting_enable": { + "label": "Enable Coasting", + "description": "Coasting replaces the last part of an extrusion path with a travel path. The oozed material is used to print the last piece of the extrusion path in order to reduce stringing.", + "type": "boolean", + "default": false, + "visible": false, + "global_only": true + }, + "coasting_volume": { + "label": "Coasting Volume", + "description": "The volume otherwise oozed. This value should generally be close to the nozzle diameter cubed.", + "unit": "mm³", + "type": "float", + "default": 0.064, + "min_value": "0", + "max_value_warning": "2.0", + "visible": false, + "inherit": false, + "enabled": "coasting_enable", + "global_only": true + }, + "coasting_min_volume": { + "label": "Minimum Volume Before Coasting", + "description": "The lowest volume an extrusion path should have before allowing coasting. For smaller extrusion paths, less pressure has been built up in the bowden tube and so the coasted volume is scaled linearly. This value should always be larger than the Coasting Volume.", + "unit": "mm³", + "type": "float", + "default": 0.8, + "min_value": "0", + "max_value_warning": "10.0", + "visible": false, + "enabled": "coasting_enable", + "global_only": true + }, + "coasting_speed": { + "label": "Coasting Speed", + "description": "The speed by which to move during coasting, relative to the speed of the extrusion path. A value slightly under 100% is advised, since during the coasting move the pressure in the bowden tube drops.", + "unit": "%", + "type": "float", + "default": 90, + "min_value": "0.0001", + "max_value_warning": "100", + "visible": false, + "inherit": false, + "enabled": "coasting_enable", + "global_only": true + }, + "skin_outline_count": { + "label": "Extra Skin Wall Count", + "description": "Replaces the outermost part of the top/bottom pattern with a number of concentric lines. Using one or two lines improves roofs that start on infill material.", + "default": 0, + "min_value": "0", + "max_value_warning": "10", + "type": "int", + "visible": false + }, + "skin_alternate_rotation": { + "label": "Alternate Skin Rotation", + "description": "Alternate the direction in which the top/bottom layers are printed. Normally they are printed diagonally only. This setting adds the X-only and Y-only directions.", + "type": "boolean", + "default": false, + "visible": false + }, + "support_conical_enabled": { + "label": "Conical Support", + "description": "Experimental feature: Make support areas smaller at the bottom than at the overhang.", + "type": "boolean", + "default": false, + "visible": true, + "enabled": "support_enable" + }, + "support_conical_angle": { + "label": "Cone Angle", + "description": "The angle of the tilt of conical support. With 0 degrees being vertical, and 90 degrees being horizontal. Smaller angles cause the support to be more sturdy, but consist of more material. Negative angles cause the base of the support to be wider than the top.", + "unit": "°", + "type": "float", + "min_value": "-90", + "min_value_warning": "-45", + "max_value_warning": "45", + "max_value": "90", + "default": 30, + "visible": false, + "enabled": "support_conical_enabled and support_enable" + }, + "support_conical_min_width": { + "label": "Cone Minimal Width", + "description": "Minimal width to which the base of the conical support area is reduced. Small widths can lead to unstable support structures.", + "unit": "mm", + "default": 5.0, + "min_value": "0", + "min_value_warning": "machine_nozzle_size * 3", + "max_value_warning": "100.0", + "type": "float", + "visible": false, + "enabled": "support_conical_enabled and support_enable" + }, "magic_fuzzy_skin_enabled": { "label": "Fuzzy Skin", "description": "Randomly jitter while printing the outer wall, so that the surface has a rough and fuzzy look.", From efdd92d358926cbc88fd30b5db587827b2d908d9 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Mon, 4 Apr 2016 14:27:19 +0200 Subject: [PATCH 89/89] JSON: fix: hide alternate skin rotation when skin pattern is concentric (CURA-1235) --- resources/machines/fdmprinter.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index 1695df01bc..1e3073647a 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -1905,7 +1905,8 @@ "description": "Alternate the direction in which the top/bottom layers are printed. Normally they are printed diagonally only. This setting adds the X-only and Y-only directions.", "type": "boolean", "default": false, - "visible": false + "visible": false, + "enabled": "top_bottom_pattern != \"concentric\"" }, "support_conical_enabled": { "label": "Conical Support",