3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2026-02-21 12:02:17 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

ENH: add some change for translation

Browse source 
jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I58ded926c8525e261bb1c7518562c9276afc1409
(cherry picked from commit 1a240e5d14e173cce2b9cb99a56e4103729cc9d7)
This commit is contained in:
xun.zhang 2025-02-28 11:21:20 +08:00 • committed by Noisyfox
parent e68300ef99
commit 9cb261cbf2
3 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libslic3r/GCode/ToolOrdering.cpp
View file

@ -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);
}

2
src/libslic3r/Print.cpp
View file

@ -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);
}

3
src/slic3r/GUI/StatusPanel.cpp
View file

@ -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();
}