mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-07 23:17:35 -06:00
updates for PR #6638 - typos and grammar
Including resolved merge conflicts.
This commit is contained in:
parent
415bedef94
commit
e750727743
25 changed files with 1409 additions and 1427 deletions
|
@ -4117,7 +4117,7 @@ if (is_marlin_flavor)
|
|||
if (from_initial_build) {
|
||||
// create a page, but pretend it's an extruder page, so we can add it to m_pages ourselves
|
||||
auto page = add_options_page(L("Multimaterial"), "custom-gcode_multi_material", true); // ORCA: icon only visible on placeholders
|
||||
auto optgroup = page->new_optgroup(L("Single extruder multimaterial setup"), "param_multi_material");
|
||||
auto optgroup = page->new_optgroup(L("Single extruder multi-material setup"), "param_multi_material");
|
||||
optgroup->append_single_option_line("single_extruder_multi_material", "semm");
|
||||
ConfigOptionDef def;
|
||||
def.type = coInt, def.set_default_value(new ConfigOptionInt((int) m_extruders_count));
|
||||
|
@ -4206,7 +4206,7 @@ if (is_marlin_flavor)
|
|||
optgroup->append_single_option_line("enable_filament_ramming", "semm");
|
||||
|
||||
|
||||
optgroup = page->new_optgroup(L("Single extruder multimaterial parameters"), "param_settings");
|
||||
optgroup = page->new_optgroup(L("Single extruder multi-material parameters"), "param_settings");
|
||||
optgroup->append_single_option_line("cooling_tube_retraction", "semm");
|
||||
optgroup->append_single_option_line("cooling_tube_length", "semm");
|
||||
optgroup->append_single_option_line("parking_pos_retraction", "semm");
|
||||
|
@ -4254,7 +4254,7 @@ if (is_marlin_flavor)
|
|||
// if value was changed
|
||||
if (fabs(nozzle_diameters[extruder_idx == 0 ? 1 : 0] - new_nd) > EPSILON)
|
||||
{
|
||||
const wxString msg_text = _(L("This is a single extruder multimaterial printer, diameters of all extruders "
|
||||
const wxString msg_text = _(L("This is a single extruder multi-material printer, diameters of all extruders "
|
||||
"will be set to the new value. Do you want to proceed?"));
|
||||
//wxMessageDialog dialog(parent(), msg_text, _(L("Nozzle diameter")), wxICON_WARNING | wxYES_NO);
|
||||
MessageDialog dialog(parent(), msg_text, _(L("Nozzle diameter")), wxICON_WARNING | wxYES_NO);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue