fix typo & use s_seam_position for all modes

supermerill/SuperSlicer#2491

5 files changed, 17 insertions, 17 deletions

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);