diff --git a/src/libslic3r/Config.cpp b/src/libslic3r/Config.cpp index fafd38fdd7..102236f8b8 100644 --- a/src/libslic3r/Config.cpp +++ b/src/libslic3r/Config.cpp @@ -376,6 +376,9 @@ std::ostream& ConfigDef::print_cli_help(std::ostream& out, bool show_defaults, s return wrapped.str(); }; + // List of opt_keys that should be hidden from the CLI help. + const std::vector silent_options = { "webdev", "single_instance_on_url" }; + // get the unique categories std::set categories; for (const auto& opt : this->options) { @@ -395,6 +398,9 @@ std::ostream& ConfigDef::print_cli_help(std::ostream& out, bool show_defaults, s const ConfigOptionDef& def = opt.second; if (def.category != category || def.cli == ConfigOptionDef::nocli || !filter(def)) continue; + + if (std::find(silent_options.begin(), silent_options.end(), opt.second.opt_key) != silent_options.end()) + continue; // get all possible variations: --foo, --foobar, -f... std::vector cli_args = def.cli_args(opt.first); diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index 9a0bd956e6..6c16e919bf 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -5665,8 +5665,8 @@ CLIMiscConfigDef::CLIMiscConfigDef() "Overrides the \"single_instance\" configuration value from application preferences."); def = this->add("single_instance_on_url", coBool); - def->label = L("Single instance mode for prusaslicer url"); - def->tooltip = L("Works as single_instance but only if prusaslicer url is present."); + def->label = "Single instance mode for prusaslicer url"; // Not translated on purpose - for internal use only. + def->tooltip = "Works as single_instance but only if prusaslicer url is present."; def = this->add("datadir", coString); def->label = L("Data directory"); @@ -5684,8 +5684,8 @@ CLIMiscConfigDef::CLIMiscConfigDef() def->min = 0; def = this->add("webdev", coBool); - def->label = L("Enable webdev tools"); - def->tooltip = L("Enable webdev tools"); + def->label = "Enable webdev tools"; // Not translated on purpose - for internal use only. + def->tooltip = "Enable webdev tools"; #if (defined(_MSC_VER) || defined(__MINGW32__)) && defined(SLIC3R_GUI) def = this->add("sw_renderer", coBool); diff --git a/src/slic3r/GUI/DoubleSliderForLayers.cpp b/src/slic3r/GUI/DoubleSliderForLayers.cpp index 163d8477ac..66851b29e3 100644 --- a/src/slic3r/GUI/DoubleSliderForLayers.cpp +++ b/src/slic3r/GUI/DoubleSliderForLayers.cpp @@ -1256,7 +1256,7 @@ std::string DSForLayers::get_tooltip(int tick/*=-1*/) tooltip += _u8L("There is an extruder change set to the same extruder.\n" "This code won't be processed during G-code generation."); else if (conflict == ctNotPossibleToolChange) - tooltip += _u8L("There is an extruder change set to the not existing extruder.\n" + tooltip += _u8L("There is an extruder change set to a non-existing extruder.\n" "This code won't be processed during G-code generation."); else if (conflict == ctRedundant) tooltip += _u8L("There is a color change for extruder that has not been used before.\n" diff --git a/src/slic3r/GUI/PhysicalPrinterDialog.cpp b/src/slic3r/GUI/PhysicalPrinterDialog.cpp index 10b05d62c2..fed90e99b8 100644 --- a/src/slic3r/GUI/PhysicalPrinterDialog.cpp +++ b/src/slic3r/GUI/PhysicalPrinterDialog.cpp @@ -897,7 +897,10 @@ void PhysicalPrinterDialog::OnOK(wxEvent& event) if (opt->value == htPrusaConnect) { auto& sc = Utils::ServiceConfig::instance(); if (printhost_win && printhost_win->GetValue() != GUI::from_u8(sc.connect_url())){ - InfoDialog msg(this, _L("Warning"), GUI::format(_L("URL of Prusa Connect is different from %1%. Do you want to continue?"), sc.connect_url()), true, wxYES_NO); + InfoDialog msg(this, _L("Warning"), + // TRN: The placeholder expands to https://connect.prusa3d.com. The warning shows when someone select PrusaConnect physical printer, but enters different URL. + GUI::format(_L("URL of Prusa Connect is different from %1%. Do you want to continue?"), + sc.connect_url()), true, wxYES_NO); if(msg.ShowModal() != wxID_YES){ printhost_win->SetValue(GUI::from_u8(Utils::ServiceConfig::instance().connect_url())); return; diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index 23bf15da15..2e06e3a295 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -2660,10 +2660,10 @@ void TabPrinter::build_fff() for (size_t i = 1; i < nozzle_diameters.size(); ++i) { // if value is differs from first nozzle diameter value if (fabs(nozzle_diameters[i] - nozzle_diameters[0]) > EPSILON || high_flow_nozzles[i] != high_flow_nozzles[0]) { - const wxString msg_text = _(L("Single Extruder Multi Material is selected, \n" - "and all extruders must have the same diameter and 'High flow' state.\n" + const wxString msg_text = _(L("This is a single extruder multimaterial printer, \n" + "all extruders must have the same nozzle diameter and 'High flow' state.\n" "Do you want to change these values for all extruders to first extruder values?")); - MessageDialog dialog(parent(), msg_text, _(L("Nozzle settings mismatch")), wxICON_WARNING | wxYES_NO); + MessageDialog dialog(parent(), msg_text, _(L("Extruder settings do not match")), wxICON_WARNING | wxYES_NO); DynamicPrintConfig new_conf = *m_config; if (dialog.ShowModal() == wxID_YES) { @@ -3198,7 +3198,7 @@ void TabPrinter::build_extruder_pages(size_t n_before_extruders) { const wxString msg_text = _L("This is a single extruder multimaterial printer, 'high_flow' state of all extruders " "will be set to the new value. Do you want to proceed?"); - MessageDialog dialog(parent(), msg_text, _L("High flow"), wxICON_WARNING | wxYES_NO); + MessageDialog dialog(parent(), msg_text, _L("Extruder settings do not match"), wxICON_WARNING | wxYES_NO); DynamicPrintConfig new_conf = *m_config; if (dialog.ShowModal() == wxID_YES) {