diff --git a/src/libslic3r/GCode/ToolOrdering.cpp b/src/libslic3r/GCode/ToolOrdering.cpp index 6db2194b1d..704a98cccb 100644 --- a/src/libslic3r/GCode/ToolOrdering.cpp +++ b/src/libslic3r/GCode/ToolOrdering.cpp @@ -1183,7 +1183,7 @@ void ToolOrdering::reorder_extruders_for_minimum_flush_volume(bool reorder_first if (nozzle_nums > 1 && !check_tpu_group(used_filaments, filament_maps, print_config)) { int master_extruder_id = print_config->master_extruder_id.value - 1; // to 0 based - std::string nozzle_name = master_extruder_id == 0 ? "left" : "right"; + std::string nozzle_name = master_extruder_id == 0 ? L("left") : L("right"); std::string exception_str = _L("TPU is incompatible with AMS and must be printed seperately in the ") + nozzle_name + _L(" nozzle.\nPlease adjust the filament group accordingly."); throw Slic3r::RuntimeError(exception_str); } diff --git a/src/libslic3r/Print.cpp b/src/libslic3r/Print.cpp index da77a42765..f873c480a6 100644 --- a/src/libslic3r/Print.cpp +++ b/src/libslic3r/Print.cpp @@ -2186,7 +2186,7 @@ void Print::process(long long *time_cost_with_cache, bool use_cache) std::transform(filament_maps.begin(), filament_maps.end(), filament_maps.begin(), [](int value) {return value - 1; }); if (!ToolOrdering::check_tpu_group(used_filaments, filament_maps, &m_config)) { int master_extruder_id = m_config.master_extruder_id.value - 1; // to 0 based - std::string nozzle_name = master_extruder_id == 0 ? "left" : "right"; + std::string nozzle_name = master_extruder_id == 0 ? L("left") : L("right"); std::string exception_str = L("TPU is incompatible with AMS and must be printed seperately in the ") + nozzle_name + L(" nozzle.\nPlease adjust the filament group accordingly."); throw Slic3r::RuntimeError(exception_str); } diff --git a/src/slic3r/GUI/StatusPanel.cpp b/src/slic3r/GUI/StatusPanel.cpp index 1fe490dfd4..34f5a3f285 100644 --- a/src/slic3r/GUI/StatusPanel.cpp +++ b/src/slic3r/GUI/StatusPanel.cpp @@ -2507,7 +2507,8 @@ void StatusPanel::on_subtask_abort(wxCommandEvent &event) }); } abort_dlg->update_text(_L("Are you sure you want to stop this print?")); - abort_dlg->m_button_ok->SetLabel(_L("Stop")); + abort_dlg->m_button_cancel->SetLabel(_L("No")); + abort_dlg->m_button_ok->SetLabel(_L("Yes")); abort_dlg->on_show(); }