From 1a240e5d14e173cce2b9cb99a56e4103729cc9d7 Mon Sep 17 00:00:00 2001 From: "xun.zhang" Date: Fri, 28 Feb 2025 11:21:20 +0800 Subject: [PATCH] ENH: add some change for translation jira:NONE Signed-off-by: xun.zhang Change-Id: I58ded926c8525e261bb1c7518562c9276afc1409 --- src/libslic3r/GCode/ToolOrdering.cpp | 2 +- src/libslic3r/Print.cpp | 2 +- src/slic3r/GUI/Plater.cpp | 2 +- src/slic3r/GUI/StatusPanel.cpp | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/libslic3r/GCode/ToolOrdering.cpp b/src/libslic3r/GCode/ToolOrdering.cpp index c0f58ab60..08b0df649 100644 --- a/src/libslic3r/GCode/ToolOrdering.cpp +++ b/src/libslic3r/GCode/ToolOrdering.cpp @@ -1156,7 +1156,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 15512cece..d286d2e70 100644 --- a/src/libslic3r/Print.cpp +++ b/src/libslic3r/Print.cpp @@ -1952,7 +1952,7 @@ void Print::process(std::unordered_map* slice_time, bool 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/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 39233cd2c..aa23c3fe8 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -16599,7 +16599,7 @@ void Plater::show_object_info() #ifndef __WINDOWS__ if (non_manifold_edges > 0) { - info_manifold += into_u8("\n" + _L("Tips:") + "\n" +_L("\"Fix Model\" feature is currently only on Windows. Please use a third-party tool to repair the model before importing it into Bambu Studio, such as ")); + info_manifold += into_u8("\n" + _L("Tips:") + "\n" +_L("To repair the model, please use a third-party tool before importing it into Bambu Studio, such as ")); } if (warning) { std::string repair_url = "https://www.formware.co/onlinestlrepair"; diff --git a/src/slic3r/GUI/StatusPanel.cpp b/src/slic3r/GUI/StatusPanel.cpp index c4ac405ca..d7d77f617 100644 --- a/src/slic3r/GUI/StatusPanel.cpp +++ b/src/slic3r/GUI/StatusPanel.cpp @@ -2475,11 +2475,12 @@ void StatusPanel::on_subtask_abort(wxCommandEvent &event) abort_dlg->m_button_cancel->SetBackgroundColor(abort_dlg->btn_bg_green); abort_dlg->m_button_cancel->SetBorderColor(*wxWHITE); abort_dlg->m_button_cancel->SetTextColor(wxColor("#FFFFFE")); + abort_dlg->m_button_cancel->SetLabel(_L("No")); abort_dlg->m_button_ok->SetBackgroundColor(abort_dlg->btn_bg_white); abort_dlg->m_button_ok->SetBorderColor(wxColor(38, 46, 48)); abort_dlg->m_button_ok->SetTextColor(*wxBLACK); - abort_dlg->m_button_ok->SetLabel(_L("Stop")); + abort_dlg->m_button_ok->SetLabel(_L("Yes")); abort_dlg->on_show(); }