From 7b6b4b0871783657f6d4620b0a92c90e316ddda6 Mon Sep 17 00:00:00 2001 From: supermerill Date: Mon, 20 Dec 2021 20:18:31 +0100 Subject: [PATCH] typo: A platter is a tray (a plate). A plater is someone who plate metals. I won't fix mainline/prusa typo in the source code, only the text. --- src/libslic3r/PrintConfig.cpp | 8 ++++---- src/slic3r/GUI/GUI_App.cpp | 2 +- src/slic3r/GUI/KBShortcutsDialog.cpp | 16 ++++++++-------- src/slic3r/GUI/MainFrame.cpp | 4 ++-- src/slic3r/GUI/Preferences.cpp | 4 ++-- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index bf15e6c6a..3d6649e3c 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -610,7 +610,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Allow only one skirt loop"); def->category = OptionCategory::output; def->tooltip = L("When using 'Complete individual objects', the default behavior is to draw the skirt around each object." - " if you prefer to have only one skirt for the whole plater, use this option."); + " if you prefer to have only one skirt for the whole platter, use this option."); def->mode = comAdvanced; def->set_default_value(new ConfigOptionBool(false)); @@ -726,7 +726,7 @@ void PrintConfigDef::init_fff_params() def = this->add("duplicate_distance", coFloat); def->label = L("Default distance between objects"); def->category = OptionCategory::output; - def->tooltip = L("Default distance used for the auto-arrange feature of the plater.\nSet to 0 to use the last value instead."); + def->tooltip = L("Default distance used for the auto-arrange feature of the platter.\nSet to 0 to use the last value instead."); def->sidetext = L("mm"); def->aliases = { "multiply_distance" }; def->min = 0; @@ -1171,7 +1171,7 @@ void PrintConfigDef::init_fff_params() def->tooltip = L("Set this to the clearance radius around your extruder. " "If the extruder is not centered, choose the largest value for safety. " "This setting is used to check for collisions and to display the graphical preview " - "in the plater." + "in the platter." "\nSet zero to disable clearance checking."); def->sidetext = L("mm"); def->min = 0; @@ -4822,7 +4822,7 @@ void PrintConfigDef::init_fff_params() def = this->add("z_step", coFloat); def->label = L("Z full step"); def->tooltip = L("Set this to the height moved when your Z motor (or equivalent) turns one step." - "If your motor needs 200 steps to move your head/plater by 1mm, this field should be 1/200 = 0.005." + "If your motor needs 200 steps to move your head/platter by 1mm, this field should be 1/200 = 0.005." "\nNote that the gcode will write the z values with 6 digits after the dot if z_step is set (it's 3 digits if it's disabled)." "\nSet zero to disable."); def->cli = "z-step=f"; diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index a6a72e3c9..4bc3360e5 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -1908,7 +1908,7 @@ void GUI_App::add_config_menu(wxMenuBar *menu) title += " - " + _L("Language selection"); wxMessageDialog dialog(nullptr, _L("Switching the language will trigger application restart.\n" - "You will lose content of the plater.") + "\n\n" + + "You will lose content of the platter.") + "\n\n" + _L("Do you want to proceed?"), title, wxICON_QUESTION | wxOK | wxCANCEL); diff --git a/src/slic3r/GUI/KBShortcutsDialog.cpp b/src/slic3r/GUI/KBShortcutsDialog.cpp index 42a92b8f1..6603bb782 100644 --- a/src/slic3r/GUI/KBShortcutsDialog.cpp +++ b/src/slic3r/GUI/KBShortcutsDialog.cpp @@ -66,13 +66,13 @@ void KBShortcutsDialog::fill_shortcuts() if (wxGetApp().is_editor()) { Shortcuts commands_shortcuts = { // File - { ctrl + "N", L("New project, clear plater") }, - { ctrl + "O", L("Open project STL/OBJ/AMF/3MF with config, clear plater") }, + { ctrl + "N", L("New project, clear platter") }, + { ctrl + "O", L("Open project STL/OBJ/AMF/3MF with config, clear platter") }, { ctrl + "S", L("Save project (3mf)") }, { ctrl + alt + "S", L("Save project as (3mf)") }, { ctrl + "R", L("(Re)slice") }, // File>Import - { ctrl + "I", L("Import STL/OBJ/AMF/3MF without config, keep plater") }, + { ctrl + "I", L("Import STL/OBJ/AMF/3MF without config, keep platter") }, { ctrl + "L", L("Import Config from ini/amf/3mf/gcode") }, { ctrl + alt + "L", L("Load Config from ini/amf/3mf/gcode and merge") }, // File>Export @@ -91,9 +91,9 @@ void KBShortcutsDialog::fill_shortcuts() { ctrl + "C", L("Copy to clipboard") }, { ctrl + "V", L("Paste from clipboard") }, #ifdef __APPLE__ - { ctrl + "Shift+" + "R", L("Reload plater from disk") }, + { ctrl + "Shift+" + "R", L("Reload platter from disk") }, #else - { "F5", L("Reload plater from disk") }, + { "F5", L("Reload platter from disk") }, #endif // __APPLE__ { ctrl + "F", L("Search") }, // Window @@ -169,7 +169,7 @@ void KBShortcutsDialog::fill_shortcuts() #endif // ENABLE_RENDER_PICKING_PASS }; - m_full_shortcuts.push_back({ { _L("Plater"), "" }, plater_shortcuts }); + m_full_shortcuts.push_back({ { _L("Platter"), "" }, plater_shortcuts }); Shortcuts gizmos_shortcuts = { { ctrl, L("All gizmos: Rotate - left mouse button; Pan - right mouse button") }, @@ -187,9 +187,9 @@ void KBShortcutsDialog::fill_shortcuts() Shortcuts commands_shortcuts = { { ctrl + "O", L("Open a G-code file") }, #ifdef __APPLE__ - { ctrl + "Shift+" + "R", L("Reload the plater from disk") }, + { ctrl + "Shift+" + "R", L("Reload the platter from disk") }, #else - { "F5", L("Reload plater from disk") }, + { "F5", L("Reload platter from disk") }, #endif // __APPLE__ }; diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp index 1804cb13d..c3721a4b9 100644 --- a/src/slic3r/GUI/MainFrame.cpp +++ b/src/slic3r/GUI/MainFrame.cpp @@ -428,7 +428,7 @@ void MainFrame::update_layout() { //layout m_plater->Reparent(m_tabpanel); - m_tabpanel->InsertPage(0, m_plater, _L("Plater")); + m_tabpanel->InsertPage(0, m_plater, _L("Platter")); m_main_sizer->Add(m_tabpanel, 1, wxEXPAND); update_icon(); // show @@ -467,7 +467,7 @@ void MainFrame::update_layout() m_tabpanel->Hide(); m_main_sizer->Add(m_tabpanel, 1, wxEXPAND); m_plater_page = new wxPanel(m_tabpanel); - m_tabpanel->InsertPage(0, m_plater_page, _L("Plater")); // empty panel just for Plater tab */ + m_tabpanel->InsertPage(0, m_plater_page, _L("Platter")); // empty panel just for Plater tab */ update_icon(); m_plater->Show(); break; diff --git a/src/slic3r/GUI/Preferences.cpp b/src/slic3r/GUI/Preferences.cpp index 68987b44b..dcbd277f7 100644 --- a/src/slic3r/GUI/Preferences.cpp +++ b/src/slic3r/GUI/Preferences.cpp @@ -138,7 +138,7 @@ void PreferencesDialog::build() def_combobox_auto_switch_preview.gui_flags = "show_value"; def_combobox_auto_switch_preview.enum_values.push_back(_u8L("Don't switch")); def_combobox_auto_switch_preview.enum_values.push_back(_u8L("Switch when possible")); - def_combobox_auto_switch_preview.enum_values.push_back(_u8L("Only if on plater")); + def_combobox_auto_switch_preview.enum_values.push_back(_u8L("Only if on platter")); def_combobox_auto_switch_preview.enum_values.push_back(_u8L("Only when GCode is ready")); if (app_config->get("auto_switch_preview") == "0") def_combobox_auto_switch_preview.set_default_value(new ConfigOptionStrings{ def_combobox_auto_switch_preview.enum_values[0] }); @@ -803,7 +803,7 @@ void PreferencesDialog::create_settings_mode_widget(wxNotebook* tabs) #ifndef WIN32 + " " + unstable_warning #endif - + "\n* " + _L("Old layout: all windows are in the application, settings are on the top tab bar and the plater choice in on the bottom of the plater view.") + + "\n* " + _L("Old layout: all windows are in the application, settings are on the top tab bar and the platter choice in on the bottom of the platter view.") + "\n* " + _L("Settings button: all windows are in the application, no tabs: you have to clic on settings gears to switch to settings tabs.") + "\n* " + _L("Settings window: settings are displayed in their own window. You have to clic on settings gears to show the settings window.") );