fix typo & use s_seam_position for all modes

supermerill/SuperSlicer#2491

8 files changed, 23 insertions, 271 deletions

diff --git a/resources/ui_layout/default/print.ui b/resources/ui_layout/default/print.ui
index d3da32540..06cade01b 100644
--- a/resources/ui_layout/default/print.ui
+++ b/resources/ui_layout/default/print.ui
@@ -72,8 +72,8 @@ group:Advanced
 		setting:width$5:gap_fill_last
 	end_line
 	line:Seam
-		setting:tags$Simple$Advanced$Prusa$SuSi:script:enum$corners$Corners$nearest$Nearest$random$Random$aligned$Aligned$rear$Rear$custom$Custom:depends$seam_position$seam_angle_cost$seam_travel_cost:label$Seam position:label_width$12:sidetext_width$0:tooltip$Position of perimeters' starting points.\nCustom can be defeined in Advanced or Expert mode.:s_seam_position
-		setting:tags$Expert:label_width$12:sidetext_width$0:seam_position
+		setting:tags$Simple$Advanced$Expert$Prusa$SuSi:script:enum$corners$Corners$nearest$Nearest$random$Random$aligned$Aligned$rear$Rear$custom$Custom:depends$seam_position$seam_angle_cost$seam_travel_cost:label$Seam position:label_width$12:sidetext_width$0:tooltip$Position of perimeters' starting points.\nCustom can be defined in Advanced or Expert mode. Cost-based settings let you choose the angle and travel cost. A high angle cost will place the seam where it can be hidden by a corner, the travel cost place the seam near the last position (often at the end of the previous infill).:s_seam_position
+#		setting:tags$Expert:label_width$12:sidetext_width$0:seam_position
 		setting:tags$Advanced$Expert$SuSi:width$3:sidetext_width$0:seam_angle_cost
 		setting:tags$Advanced$Expert$SuSi:width$3:sidetext_width$0:seam_travel_cost
 	end_line
@@ -389,7 +389,7 @@ group:sidetext_width$2:Flow
 	end_line
 	line:Bridge type
 		setting:bridge_type
-		setting:script:bool:advanced:depends$bridge_type$bridge_overlap$layer_height$nozzle_diameter:label$ Simulate Prusa "no thick bridge":label_width$0:tooltip$Change the bridge type and the bridge overlap to compute the same extrusions as when the PrusaSlicer "thick bridge" isn't selected.\nAs long as it's selected, it will modify them.\nUnselect it to deactivate this enforcement.:s_not_thick_bridge
+		setting:script:bool:advanced:depends$bridge_type$bridge_overlap$layer_height$nozzle_diameter:label$ Simulate Prusa 'no thick bridge':label_width$0:tooltip$Change the bridge type and the bridge overlap to compute the same extrusions as when the PrusaSlicer 'thick bridge' isn't selected.\nAs long as it's selected, it will modify them.\nUnselect it to deactivate this enforcement.:s_not_thick_bridge
 	end_line
 	setting:external_perimeter_cut_corners
 page:Multiple extruders:funnel
diff --git a/resources/ui_layout/example/print.ui b/resources/ui_layout/example/print.ui
index d3da32540..06cade01b 100644
--- a/resources/ui_layout/example/print.ui
+++ b/resources/ui_layout/example/print.ui
@@ -72,8 +72,8 @@ group:Advanced
 		setting:width$5:gap_fill_last
 	end_line
 	line:Seam
-		setting:tags$Simple$Advanced$Prusa$SuSi:script:enum$corners$Corners$nearest$Nearest$random$Random$aligned$Aligned$rear$Rear$custom$Custom:depends$seam_position$seam_angle_cost$seam_travel_cost:label$Seam position:label_width$12:sidetext_width$0:tooltip$Position of perimeters' starting points.\nCustom can be defeined in Advanced or Expert mode.:s_seam_position
-		setting:tags$Expert:label_width$12:sidetext_width$0:seam_position
+		setting:tags$Simple$Advanced$Expert$Prusa$SuSi:script:enum$corners$Corners$nearest$Nearest$random$Random$aligned$Aligned$rear$Rear$custom$Custom:depends$seam_position$seam_angle_cost$seam_travel_cost:label$Seam position:label_width$12:sidetext_width$0:tooltip$Position of perimeters' starting points.\nCustom can be defined in Advanced or Expert mode. Cost-based settings let you choose the angle and travel cost. A high angle cost will place the seam where it can be hidden by a corner, the travel cost place the seam near the last position (often at the end of the previous infill).:s_seam_position
+#		setting:tags$Expert:label_width$12:sidetext_width$0:seam_position
 		setting:tags$Advanced$Expert$SuSi:width$3:sidetext_width$0:seam_angle_cost
 		setting:tags$Advanced$Expert$SuSi:width$3:sidetext_width$0:seam_travel_cost
 	end_line
@@ -389,7 +389,7 @@ group:sidetext_width$2:Flow
 	end_line
 	line:Bridge type
 		setting:bridge_type
-		setting:script:bool:advanced:depends$bridge_type$bridge_overlap$layer_height$nozzle_diameter:label$ Simulate Prusa "no thick bridge":label_width$0:tooltip$Change the bridge type and the bridge overlap to compute the same extrusions as when the PrusaSlicer "thick bridge" isn't selected.\nAs long as it's selected, it will modify them.\nUnselect it to deactivate this enforcement.:s_not_thick_bridge
+		setting:script:bool:advanced:depends$bridge_type$bridge_overlap$layer_height$nozzle_diameter:label$ Simulate Prusa 'no thick bridge':label_width$0:tooltip$Change the bridge type and the bridge overlap to compute the same extrusions as when the PrusaSlicer 'thick bridge' isn't selected.\nAs long as it's selected, it will modify them.\nUnselect it to deactivate this enforcement.:s_not_thick_bridge
 	end_line
 	setting:external_perimeter_cut_corners
 page:Multiple extruders:funnel
diff --git a/resources/ui_layout/print.ui.legacy b/resources/ui_layout/print.ui.legacy
deleted file mode 100644
index 5094526d5..000000000
--- a/resources/ui_layout/print.ui.legacy
+++ /dev/null
@@ -1,248 +0,0 @@
-#logs
-page:Layers and perimeters:layers
-group:Layer height
-	setting:layer_height
-	setting:first_layer_height
-group:Vertical shells
-	setting:label$perimeters yeah!:width$5:perimeters
-	setting:spiral_vase
-	recommended_thin_wall_thickness_description
-group:Horizontal shells
-	line:Solid layers
-		setting:top_solid_layers
-		setting:label$Bottom:bottom_solid_layers
-	end_line
-	line:Minimum shell thickness
-		setting:top_solid_min_thickness
-		setting:bottom_solid_min_thickness
-	end_line
-	top_bottom_shell_thickness_explanation
-	setting:enforce_full_fill_volume
-group:Quality (slower slicing)
-	setting:full_lablel:extra_perimeters
-	setting:full_lablel:extra_perimeters_odd_layers
-	setting:only_one_perimeter_top
-	setting:ensure_vertical_shell_thickness
-	setting:avoid_crossing_perimeters
-	setting:thin_perimeters
-	line:Thin walls
-		setting:thin_walls
-		setting:thin_walls_min_width
-		setting:thin_walls_overlap
-	end_line
-	line:Overhangs
-		setting:overhangs
-		setting:overhangs_width
-	end_line
-	setting:no_perimeter_unsupported_algo
-group:Advanced
-	line:Gap Fill
-		setting:gap_fill
-		setting:gap_fill_min_area
-	end_line
-	line:Seam
-		setting:seam_position
-		setting:seam_travel
-	end_line
-	line:External Perimeter
-		setting:external_perimeters_first
-		setting:external_perimeters_vase
-	end_line
-	line:Looping perimeter
-		setting:perimeter_loop
-		setting:perimeter_loop_seam
-	end_line
-
-page:Infill:infill
-group:Infill
-	setting:fill_density
-	setting:fill_pattern
-	setting:full_label:top_fill_pattern
-	setting:full_label:bottom_fill_pattern
-	setting:solid_fill_pattern
-	setting:infill_not_connected
-group:Reducing printing time
-	setting:infill_every_layers
-	setting:infill_only_where_needed
-	line:Supporting dense layer
-		setting:infill_dense
-		setting:infill_dense_algo
-	end_line
-group:Advanced
-	setting:solid_infill_every_layers
-	setting:solid_infill_below_area
-	setting:full_label:fill_angle
-	setting:full_label:bridge_angle
-	line:Anchor solid infill by X mm
-		setting:external_infill_margin
-		setting:bridged_infill_margin
-	end_line
-	setting:only_retract_when_crossing_perimeters
-	setting:infill_first
-group:Advanced Infill
-	line:Ironing tuning
-		setting:fill_smooth_width
-		setting:fill_smooth_distribution
-	end_line
-
-page:Skirt and brim:skirt+brim
-group:Skirt
-	setting:skirts
-	setting:skirt_distance
-	setting:skirt_height
-	setting:draft_shield
-	setting:min_skirt_length
-group:Brim
-	setting:brim_width
-	setting:brim_inside_holes
-	setting:brim_width_interior
-	line:Brim ears
-		setting:brim_ears
-		setting:brim_ears_max_angle
-	end_line
-
-page:Support Material:support
-group:Support material
-	setting:support_material
-	setting:support_material_auto
-	setting:support_material_threshold
-	setting:support_material_enforce_layers
-group:Raft
-	setting:support_material_solid_first_layer
-	setting:raft_layers
-group:Options for support material and raft
-	line:Z-offset
-		setting:support_material_contact_distance_type
-		setting:support_material_contact_distance_top
-		setting:support_material_contact_distance_bottom
-	end_line
-	setting:support_material_pattern
-	setting:support_material_with_sheath
-	setting:support_material_spacing
-	setting:support_material_angle
-	setting:support_material_buildplate_only
-	setting:support_material_xy_spacing
-	setting:dont_support_bridges
-	setting:support_material_synchronize_layers
-group:Options for support material interface
-	setting:support_material_interface_pattern
-	setting:support_material_interface_layers
-	setting:support_material_interface_spacing
-	setting:support_material_interface_contact_loops
-
-page:Speed:time
-group:Speed for print moves
-	setting:full_label:perimeter_speed
-	setting:full_label:external_perimeter_speed
-	setting:full_label:small_perimeter_speed
-	setting:full_label:infill_speed
-	setting:full_label:solid_infill_speed
-	setting:full_label:top_solid_infill_speed
-	setting:full_label:support_material_speed
-	setting:full_label:support_material_interface_speed
-	setting:bridge_speed
-	setting:gap_fill_speed
-group:Speed for non-print moves
-	setting:travel_speed
-group:Modifiers
-	setting:full_label:first_layer_speed
-	setting:full_label:first_layer_infill_speed
-group:Acceleration control (advanced)
-	setting:default_acceleration
-	setting:perimeter_acceleration
-	setting:external_perimeter_acceleration
-	setting:infill_acceleration
-	setting:solid_infill_acceleration
-	setting:top_solid_infill_acceleration
-	setting:ironing_acceleration
-	setting:support_material_acceleration
-	setting:support_material_interface_acceleration
-	setting:bridge_acceleration
-	setting:bridge_acceleration_internal
-	setting:overhangs_acceleration
-	setting:gap_fill_acceleration
-	setting:thin_walls_acceleration
-	setting:travel_acceleration
-	setting:travel_deceleration_use_target
-	setting:first_layer_acceleration
-group:Autospeed (advanced)
-	setting:max_print_speed
-	setting:max_volumetric_speed
-
-page:Multiple Extruders:funnel
-group:Extruders
-	setting:perimeter_extruder
-	setting:infill_extruder
-	setting:solid_infill_extruder
-	setting:support_material_extruder
-	setting:support_material_interface_extruder
-group:Ooze prevention
-	setting:ooze_prevention
-	setting:standby_temperature_delta
-group:Wipe tower
-	setting:wipe_tower
-	setting:full_label:wipe_tower_x
-	setting:full_label:wipe_tower_y
-	setting:wipe_tower_width
-	setting:wipe_tower_rotation_angle
-	setting:wipe_tower_bridging
-	setting:wipe_tower_no_sparse_layers
-	setting:single_extruder_multi_material_priming
-group:Advanced
-	setting:interface_shells
-
-	
-page:Advanced:wrench
-group:Extrusion width
-	setting:extrusion_width
-	setting:first_layer_extrusion_width
-	setting:perimeter_extrusion_width
-	setting:external_perimeter_extrusion_width
-	setting:infill_extrusion_width
-	setting:solid_infill_extrusion_width
-	setting:top_infill_extrusion_width
-	setting:support_material_extrusion_width
-group:Overlap
-	setting:infill_overlap
-	setting:bridge_overlap
-group:Flow
-	line:Flow ratio
-		setting:bridge_flow_ratio
-		setting:over_bridge_flow_ratio
-		setting:fill_top_flow_ratio
-	end_line
-group:Filtering
-	setting:resolution
-	setting:model_precision
-	setting:slice_closing_radius
-group:Modifying slices
-	setting:full_label:xy_size_compensation
-	setting:full_label:first_layer_size_compensation
-	setting:full_label:hole_size_compensation
-	setting:hole_to_polyhole
-group:Other
-	setting:clip_multipart_objects
-
-page:Output options:output+page_white
-group:Sequential printing
-	setting:complete_objects
-	line:Extruder clearance (mm)
-		setting:width$6:extruder_clearance_radius
-		setting:width$6:extruder_clearance_height
-	end_line
-group:Output file
-	setting:gcode_comments
-	setting:gcode_label_objects
-	setting:full_width:output_filename_format
-group:Post-processing scripts
-	setting:full_width:height$5:post_process
-
-page:Notes:note
-group:no_title:Notes
-	setting:full_width:height$25:notes
-
-page:Dependencies:wrench
-group:Profile dependencies
-	setting:compatible_printers
-	setting:full_width:color:compatible_printers_condition
-	parent_preset_description
diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp
index e96121540..a78a2e239 100644
--- a/src/libslic3r/PrintConfig.cpp
+++ b/src/libslic3r/PrintConfig.cpp
@@ -2572,7 +2572,7 @@ void PrintConfigDef::init_fff_params()
     def->category = OptionCategory::width;
     def->tooltip = L("This setting allows you to reduce the overlap between the perimeters and the gap fill."
         " 100% means that no gaps are left, and 0% means that the gap fill won't touch the perimeters."
-        "May be useful to reduce if you can see the gapfill on the exterrnal surface.");
+        "\nMay be useful if you can see the gapfill on the exterrnal surface, to reduce that artifact.");
     def->sidetext = L("%");
     def->min = 0;
     def->max = 100;
@@ -4225,7 +4225,7 @@ void PrintConfigDef::init_fff_params()
     def->label = L("Seam position");
     def->category = OptionCategory::perimeter;
     def->tooltip = L("Position of perimeters' starting points."
-                    "\nCost-based option let you choose the angel and travel cost. A high angle cost will place the seam where it can be hidden by a corner"
+                    "\nCost-based option let you choose the angle and travel cost. A high angle cost will place the seam where it can be hidden by a corner"
                     ", the travel cost place the seam near the last position (often at the end of the previous infill).");
     def->enum_keys_map = &ConfigOptionEnum<SeamPosition>::get_enum_values();
     def->enum_values.push_back("cost");
diff --git a/src/slic3r/GUI/FreeCADDialog.cpp b/src/slic3r/GUI/FreeCADDialog.cpp
index 7e1e15cd3..a08a74111 100644
--- a/src/slic3r/GUI/FreeCADDialog.cpp
+++ b/src/slic3r/GUI/FreeCADDialog.cpp
@@ -285,7 +285,7 @@ FreeCADDialog::FreeCADDialog(GUI_App* app, MainFrame* mainframe)
     buttons->Add(bt_quick_save);
     wxString choices_add[] = { "replace", "insert" };
     cmb_add_replace = new wxComboBox(this, wxID_ANY, wxString{ "replace" }, wxDefaultPosition, wxDefaultSize, 2, choices_add);
-    cmb_add_replace->SetToolTip(_(L("What to do with the result? insert it into the existing plater or replacing the current plater by a new one?")));
+    cmb_add_replace->SetToolTip(_(L("What to do with the result? insert it into the existing platter or replacing the current platter by a new one?")));
     cmb_add_replace->SetSelection(0);
     buttons->AddSpacer(15);
     buttons->Add(cmb_add_replace);
diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp
index 4b455b243..292e60f2f 100644
--- a/src/slic3r/GUI/MainFrame.cpp
+++ b/src/slic3r/GUI/MainFrame.cpp
@@ -1852,7 +1852,7 @@ void MainFrame::init_menubar_as_editor()
         editMenu->AppendSeparator();
 #ifdef __APPLE__
         append_menu_item(editMenu, wxID_ANY, _L("Re&load from Disk") + dots + "\tCtrl+Shift+R",
-            _L("Reload the plater from disk"), [this](wxCommandEvent&) { m_plater->reload_all_from_disk(); },
+            _L("Reload the platter from disk"), [this](wxCommandEvent&) { m_plater->reload_all_from_disk(); },
             "", nullptr, [this]() {return !m_plater->model().objects.empty(); }, this);
 #else
         append_menu_item(editMenu, wxID_ANY, _L("Re&load from Disk") + "\t" + "F5",
@@ -1870,7 +1870,7 @@ void MainFrame::init_menubar_as_editor()
     auto windowMenu = new wxMenu();
     {
         if (m_plater) {
-            append_menu_item(windowMenu, wxID_HIGHEST + 1, _L("3D &Plater Tab") + "\tCtrl+1", _L("Show the editor of the input models"),
+            append_menu_item(windowMenu, wxID_HIGHEST + 1, _L("3D &Platter Tab") + "\tCtrl+1", _L("Show the editor of the input models"),
                 [this](wxCommandEvent&) { select_tab(ETabType::Plater3D); }, "editor_menu", nullptr,
                 []() {return true; }, this);
             m_layerpreview_menu_item = append_menu_item(windowMenu, wxID_HIGHEST + 2, _L("Layer previe&w Tab") + "\tCtrl+2", _L("Show the layers from the slicing process"),
@@ -2054,7 +2054,7 @@ void MainFrame::init_menubar_as_gcodeviewer()
             [this]() {return m_plater != nullptr; }, this);
 #ifdef __APPLE__
         append_menu_item(fileMenu, wxID_ANY, _L("Re&load from Disk") + dots + "\tCtrl+Shift+R",
-            _L("Reload the plater from disk"), [this](wxCommandEvent&) { m_plater->reload_gcode_from_disk(); },
+            _L("Reload the platter from disk"), [this](wxCommandEvent&) { m_plater->reload_gcode_from_disk(); },
             "", nullptr, [this]() { return !m_plater->get_last_loaded_gcode().empty(); }, this);
 #else
         append_menu_item(fileMenu, wxID_ANY, _L("Re&load from Disk") + sep + "F5",
diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp
index 236b98756..635ee8973 100644
--- a/src/slic3r/GUI/Plater.cpp
+++ b/src/slic3r/GUI/Plater.cpp
@@ -1720,13 +1720,13 @@ struct Plater::priv
                         if (dialog.IsCheckBoxChecked()) {
                             wxString preferences_item = _L("Ask for unsaved changes in project");
                             wxString msg =
-                                _L("PrusaSlicer will remember your choice.") + "\n\n" +
-                                _L("You will not be asked about it again, when: \n"
-                                    "- Closing PrusaSlicer,\n"
-                                    "- Loading or creating a new project") + "\n\n" +
+                                format_wxstr(_L("%1% will remember your choice."), SLIC3R_APP_NAME) + "\n\n" +
+                                format_wxstr(_L("You will not be asked about it again, when: \n"
+                                    "- Closing %1%,\n"
+                                    "- Loading or creating a new project"), SLIC3R_APP_NAME) + "\n\n" +
                                 format_wxstr(_L("Visit \"Preferences\" and check \"%1%\"\nto changes your choice."), preferences_item);
 
-                            MessageDialog msg_dlg(mainframe, msg, _L("PrusaSlicer: Don't ask me again"), wxOK | wxCANCEL | wxICON_INFORMATION);
+                            MessageDialog msg_dlg(mainframe, msg, format_wxstr(_L("%1%: Don't ask me again"), SLIC3R_APP_NAME), wxOK | wxCANCEL | wxICON_INFORMATION);
                             if (msg_dlg.ShowModal() == wxID_CANCEL)
                                 return wxID_CANCEL;
 
@@ -3375,7 +3375,7 @@ unsigned int Plater::priv::update_background_process(bool force_validation, bool
             // auto_switch_preview == 1 means "force tab change"
         } else if (wxGetApp().app_config->get("auto_switch_preview") == "1") {
             main_frame->select_tab(MainFrame::ETabType::Plater3D, true);
-            // auto_switch_preview == 2 means "force tab change only if already on a plater one"
+            // auto_switch_preview == 2 means "force tab change only if already on a platter one"
         } else if (wxGetApp().app_config->get("auto_switch_preview") == "2" || main_frame->selected_tab() < MainFrame::ETabType::LastPlater) {
             if (this->preview->can_display_gcode())
                 main_frame->select_tab(MainFrame::ETabType::PlaterGcode, true);
@@ -6099,7 +6099,7 @@ void Plater::export_amf()
 bool Plater::export_3mf(const boost::filesystem::path& output_path)
 {
     if (p->model.objects.empty()) {
-        MessageDialog dialog(nullptr, _L("The plater is empty.\nDo you want to save the project?"), _L("Save project"), wxYES_NO);
+        MessageDialog dialog(nullptr, _L("The platter is empty.\nDo you want to save the project?"), _L("Save project"), wxYES_NO);
         if (dialog.ShowModal() != wxID_YES)
             return false;
     }
diff --git a/src/slic3r/GUI/Preferences.cpp b/src/slic3r/GUI/Preferences.cpp
index 71e8ce3d8..91f921c12 100644
--- a/src/slic3r/GUI/Preferences.cpp
+++ b/src/slic3r/GUI/Preferences.cpp
@@ -335,7 +335,7 @@ void PreferencesDialog::build(size_t selected_tab)
 		def.label = L("Ask for unsaved changes in project");
 		def.type = coBool;
 		def.tooltip = L("Always ask for unsaved changes in project, when: \n"
-						"- Closing PrusaSlicer,\n"
+						"- Closing Slic3r,\n"
 						"- Loading or creating a new project");
 		def.set_default_value(new ConfigOptionBool{ app_config->get("default_action_on_dirty_project").empty() });
 		option = Option(def, "default_action_on_dirty_project");
@@ -764,7 +764,7 @@ void PreferencesDialog::build(size_t selected_tab)
 	// PS 237 107 33 ; SuSi 33 114 235
 	def.label = L("Platter icons Color template");
 	def.type = coString;
-	def.tooltip = _u8L("Color template usedd by the icons on the platter.")
+	def.tooltip = _u8L("Color template used by the icons on the platter.")
 		+ " " + _u8L("It may need a lighter color, as it's used to replace white on top of a dark background.")
 		+ "\n" + _u8L("Slic3r(yellow): ccbe29, PrusaSlicer(orange): cc6429, SuperSlicer(blue): 3d83ed");
 	std::string color_str = app_config->get("color_light");
@@ -779,7 +779,7 @@ void PreferencesDialog::build(size_t selected_tab)
 	def.label = L("Main Gui color template");
 	def.type = coString;
 	def.tooltip = _u8L("Main color template.")
-		+ " " + _u8L("If you use a color with igher than 80% saturation and/or value, these will be increased. If lower, they will be decreased.")
+		+ " " + _u8L("If you use a color with higher than 80% saturation and/or value, these will be increased. If lower, they will be decreased.")
 		+ " " + _u8L("Slic3r(yellow): ccbe29, PrusaSlicer(orange): cc6429, SuperSlicer(blue): 296acc");
 	color_str = app_config->get("color");
 	if (color_str[0] != '#') color_str = "#" + color_str;
@@ -889,7 +889,7 @@ void PreferencesDialog::accept(wxEvent&)
 			title += " - " + _L("Changes for the critical options");
 			MessageDialog dialog(nullptr,
 				_L("Changing some options will trigger application restart.\n"
-				   "You will lose the content of the plater.") + "\n\n" +
+				   "You will lose the content of the platter.") + "\n\n" +
 				_L("Do you want to proceed?"),
 				title,
 				wxICON_QUESTION | wxYES | wxNO);