From 6cbdfe76c8ea7fbd66f8fcae73160f06dd4f5857 Mon Sep 17 00:00:00 2001 From: "xin.zhang" Date: Mon, 20 Jan 2025 09:26:56 +0800 Subject: [PATCH] FIX: update some translation jira: [none] Change-Id: I0b6e14b78c26188b20d8303444ed294eee64dff2 (cherry picked from commit 3bef21933f60e3c813881232ef4fea44db56f395) --- src/slic3r/GUI/AMSSetting.cpp | 18 ++++++++---------- src/slic3r/GUI/AmsMappingPopup.cpp | 3 ++- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/slic3r/GUI/AMSSetting.cpp b/src/slic3r/GUI/AMSSetting.cpp index bd8f2a0c54..b137817158 100644 --- a/src/slic3r/GUI/AMSSetting.cpp +++ b/src/slic3r/GUI/AMSSetting.cpp @@ -47,7 +47,7 @@ void AMSSetting::create() m_title_Insert_material_auto_read->Wrap(AMS_SETTING_BODY_WIDTH); m_sizer_Insert_material->Add(m_title_Insert_material_auto_read, 0, wxALL | wxEXPAND, 0); - + wxBoxSizer *m_sizer_Insert_material_tip = new wxBoxSizer(wxHORIZONTAL); m_sizer_Insert_material_tip_inline = new wxBoxSizer(wxVERTICAL); @@ -105,7 +105,7 @@ void AMSSetting::create() m_title_starting_auto_read->Wrap(AMS_SETTING_BODY_WIDTH); m_sizer_starting->Add(m_title_starting_auto_read, 1, wxEXPAND, 0); - + wxBoxSizer *m_sizer_starting_tip = new wxBoxSizer(wxHORIZONTAL); m_sizer_starting_tip->Add(0, 0, 0, wxLEFT, 10); @@ -152,9 +152,7 @@ void AMSSetting::create() // tip line m_sizer_remain_inline = new wxBoxSizer(wxVERTICAL); - m_tip_remain_line1 = new Label(m_panel_body, - _L("The AMS will estimate Bambu filament's remaining capacity after the filament info is updated. During printing, remaining capacity will be updated automatically.") - ); + m_tip_remain_line1 = new Label(m_panel_body, _L("AMS will attempt to estimate the remaining capacity of the Bambu Lab filaments.")); m_tip_remain_line1->SetFont(::Label::Body_13); m_tip_remain_line1->SetForegroundColour(AMS_SETTING_GREY700); m_tip_remain_line1->SetSize(wxSize(AMS_SETTING_BODY_WIDTH, -1)); @@ -238,7 +236,7 @@ void AMSSetting::create() m_panel_img->Layout(); m_sizer_img->Fit(m_panel_img); - m_sizer_remain_block = new wxBoxSizer(wxVERTICAL); + m_sizer_remain_block = new wxBoxSizer(wxVERTICAL); m_sizer_remain_block->Add(m_sizer_remain, 0, wxEXPAND | wxTOP, FromDIP(8)); m_sizer_remain_block->Add(0, 0, 0, wxTOP, 8); m_sizer_remain_block->Add(m_sizer_remain_tip, 0, wxLEFT, 18); @@ -285,7 +283,7 @@ void AMSSetting::create() else { m_sizer_remain_block->Show(false); } - } + } }); } @@ -500,9 +498,9 @@ wxStaticText *AMSSetting::append_text(wxString text) return widget; } -void AMSSetting::on_dpi_changed(const wxRect &suggested_rect) -{ - //m_button_auto_demarcate->SetMinSize(AMS_SETTING_BUTTON_SIZE); +void AMSSetting::on_dpi_changed(const wxRect &suggested_rect) +{ + //m_button_auto_demarcate->SetMinSize(AMS_SETTING_BUTTON_SIZE); } }} // namespace Slic3r::GUI \ No newline at end of file diff --git a/src/slic3r/GUI/AmsMappingPopup.cpp b/src/slic3r/GUI/AmsMappingPopup.cpp index f1806f86b6..5357bf896f 100644 --- a/src/slic3r/GUI/AmsMappingPopup.cpp +++ b/src/slic3r/GUI/AmsMappingPopup.cpp @@ -1970,7 +1970,8 @@ void AmsReplaceMaterialDialog::update_to_nozzle(int nozzle_id) } else { - label_txt->SetLabelText(_L("If there are two identical filaments in AMS, AMS filament backup will be enabled. \n(Currently supporting automatic supply of consumables with the same brand, material type, and color)")); + label_txt->SetLabelText(_L("When the current filament runs out, the printer will use identical filament to continue printing.\n" + "*Identical filament: same brand, type and color.")); } label_txt->Wrap(FromDIP(380));