diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp index 02bb7564f..0a6d1bda6 100644 --- a/src/slic3r/GUI/MainFrame.cpp +++ b/src/slic3r/GUI/MainFrame.cpp @@ -60,9 +60,9 @@ public: wxMenu *CreatePopupMenu() override { wxMenu *menu = new wxMenu; if(wxGetApp().app_config->get("single_instance") == "0") { - // Only allow opening a new PrusaSlicer instance on OSX if "single_instance" is disabled, + // Only allow opening a new Slic3r instance on OSX if "single_instance" is disabled, // as starting new instances would interfere with the locking mechanism of "single_instance" support. - append_menu_item(menu, wxID_ANY, _L("Open new instance"), _L("Open a new PrusaSlicer instance"), + append_menu_item(menu, wxID_ANY, _L("Open new instance"), _L("Open a new Slic3r instance"), [this](wxCommandEvent&) { start_new_slicer(); }, "", nullptr); } append_menu_item(menu, wxID_ANY, _L("G-code preview") + dots, _L("Open G-code viewer"), @@ -76,7 +76,7 @@ public: GCodeViewerTaskBarIcon(wxTaskBarIconType iconType = wxTBI_DEFAULT_TYPE) : wxTaskBarIcon(iconType) {} wxMenu *CreatePopupMenu() override { wxMenu *menu = new wxMenu; - append_menu_item(menu, wxID_ANY, _L("Open PrusaSlicer"), _L("Open a new PrusaSlicer instance"), + append_menu_item(menu, wxID_ANY, _L("Open Slic3r"), _L("Open a new Slic3r instance"), [this](wxCommandEvent&) { start_new_slicer(nullptr, true); }, "", nullptr); append_menu_item(menu, wxID_ANY, _L("G-code preview") + dots, _L("Open new G-code viewer"), [this](wxCommandEvent&) { start_new_gcodeviewer_open_file(); }, "", nullptr); @@ -582,9 +582,7 @@ void MainFrame::update_title() } } - title += wxString(SLIC3R_APP_NAME) + "_" + wxString(SLIC3R_VERSION) ; - if (wxGetApp().is_editor() && !has_name) - title += (" " + _L("based on PrusaSlicer & Slic3r")); + title += wxString(SLIC3R_APP_NAME) + " " + wxString(SLIC3R_VERSION) ; SetTitle(title); } diff --git a/src/slic3r/GUI/Preferences.cpp b/src/slic3r/GUI/Preferences.cpp index 15bcc3f25..780d858c2 100644 --- a/src/slic3r/GUI/Preferences.cpp +++ b/src/slic3r/GUI/Preferences.cpp @@ -166,13 +166,13 @@ void PreferencesDialog::build() #if __APPLE__ - def.label = L("Allow just a single PrusaSlicer instance"); + def.label = L("Allow just a single Slic3r instance"); def.type = coBool; def.tooltip = L("On OSX there is always only one instance of app running by default. However it is allowed to run multiple instances of same app from the command line. In such case this settings will allow only one instance."); #else - def.label = L("Allow just a single PrusaSlicer instance"); + def.label = L("Allow just a single Slic3r instance"); def.type = coBool; - def.tooltip = L("If this is enabled, when starting PrusaSlicer and another instance of the same PrusaSlicer is already running, that instance will be reactivated instead."); + def.tooltip = L("If this is enabled, when starting Slic3r and another instance of the same Slic3r is already running, that instance will be reactivated instead."); #endif def.set_default_value(new ConfigOptionBool{ app_config->has("single_instance") ? app_config->get("single_instance") == "1" : false }); option = Option(def, "single_instance"); @@ -209,9 +209,9 @@ void PreferencesDialog::build() #if ENABLE_CUSTOMIZABLE_FILES_ASSOCIATION_ON_WIN #ifdef _WIN32 else { - def.label = L("Associate .gcode files to PrusaSlicer G-code Viewer"); + def.label = L("Associate .gcode files to Slic3r G-code Viewer"); def.type = coBool; - def.tooltip = L("If enabled, sets PrusaSlicer G-code Viewer as default application to open .gcode files."); + def.tooltip = L("If enabled, sets Slic3r G-code Viewer as default application to open .gcode files."); def.set_default_value(new ConfigOptionBool(app_config->get("associate_gcode") == "1")); option = Option(def, "associate_gcode"); m_optgroup_general->append_single_option_line(option);