GitHub-Proxy/OrcaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-06 07:25:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into v1.7.2

Browse Source
This commit is contained in:
Lane.Wei 2023-08-15 21:45:42 +08:00 committed by GitHub
commit 42a69e3e20
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 127 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bbl/i18n/BambuStudio.pot
View File

@ -8740,7 +8740,7 @@ msgstr ""
msgid "Connecting to printer..." msgid "Connecting to printer..."
msgstr "" msgstr ""
msgid "The failed test result has been droped." msgid "The failed test result has been dropped."
msgstr "" msgstr ""
msgid "Flow Dynamics Calibration result has been saved to the printer" msgid "Flow Dynamics Calibration result has been saved to the printer"
@ -8867,7 +8867,7 @@ msgstr ""
msgid "" msgid ""
"Part of the calibration failed! You may clean the plate and retry. The " "Part of the calibration failed! You may clean the plate and retry. The "
"failed test result would be droped." "failed test result would be dropped."
msgstr "" msgstr ""
msgid "" msgid ""

4
bbl/i18n/de/BambuStudio_de.po
View File

@ -9775,7 +9775,7 @@ msgstr ""
msgid "Connecting to printer..." msgid "Connecting to printer..."
msgstr "" msgstr ""
msgid "The failed test result has been droped." msgid "The failed test result has been dropped."
msgstr "" msgstr ""
msgid "Flow Dynamics Calibration result has been saved to the printer" msgid "Flow Dynamics Calibration result has been saved to the printer"
@ -9902,7 +9902,7 @@ msgstr ""
msgid "" msgid ""
"Part of the calibration failed! You may clean the plate and retry. The " "Part of the calibration failed! You may clean the plate and retry. The "
"failed test result would be droped." "failed test result would be dropped."
msgstr "" msgstr ""
msgid "" msgid ""

4
bbl/i18n/en/BambuStudio_en.po
View File

@ -9519,7 +9519,7 @@ msgstr ""
msgid "Connecting to printer..." msgid "Connecting to printer..."
msgstr "" msgstr ""
msgid "The failed test result has been droped." msgid "The failed test result has been dropped."
msgstr "" msgstr ""
msgid "Flow Dynamics Calibration result has been saved to the printer" msgid "Flow Dynamics Calibration result has been saved to the printer"
@ -9646,7 +9646,7 @@ msgstr ""
msgid "" msgid ""
"Part of the calibration failed! You may clean the plate and retry. The " "Part of the calibration failed! You may clean the plate and retry. The "
"failed test result would be droped." "failed test result would be dropped."
msgstr "" msgstr ""
msgid "" msgid ""

4
bbl/i18n/es/BambuStudio_es.po
View File

@ -9707,7 +9707,7 @@ msgstr ""
msgid "Connecting to printer..." msgid "Connecting to printer..."
msgstr "" msgstr ""
msgid "The failed test result has been droped." msgid "The failed test result has been dropped."
msgstr "" msgstr ""
msgid "Flow Dynamics Calibration result has been saved to the printer" msgid "Flow Dynamics Calibration result has been saved to the printer"
@ -9834,7 +9834,7 @@ msgstr ""
msgid "" msgid ""
"Part of the calibration failed! You may clean the plate and retry. The " "Part of the calibration failed! You may clean the plate and retry. The "
"failed test result would be droped." "failed test result would be dropped."
msgstr "" msgstr ""
msgid "" msgid ""

4
bbl/i18n/fr/BambuStudio_fr.po
View File

@ -9783,7 +9783,7 @@ msgstr ""
msgid "Connecting to printer..." msgid "Connecting to printer..."
msgstr "" msgstr ""
msgid "The failed test result has been droped." msgid "The failed test result has been dropped."
msgstr "" msgstr ""
msgid "Flow Dynamics Calibration result has been saved to the printer" msgid "Flow Dynamics Calibration result has been saved to the printer"
@ -9910,7 +9910,7 @@ msgstr ""
msgid "" msgid ""
"Part of the calibration failed! You may clean the plate and retry. The " "Part of the calibration failed! You may clean the plate and retry. The "
"failed test result would be droped." "failed test result would be dropped."
msgstr "" msgstr ""
msgid "" msgid ""

4
bbl/i18n/hu/BambuStudio_hu.po
View File

@ -9636,7 +9636,7 @@ msgstr ""
msgid "Connecting to printer..." msgid "Connecting to printer..."
msgstr "" msgstr ""
msgid "The failed test result has been droped." msgid "The failed test result has been dropped."
msgstr "" msgstr ""
msgid "Flow Dynamics Calibration result has been saved to the printer" msgid "Flow Dynamics Calibration result has been saved to the printer"
@ -9763,7 +9763,7 @@ msgstr ""
msgid "" msgid ""
"Part of the calibration failed! You may clean the plate and retry. The " "Part of the calibration failed! You may clean the plate and retry. The "
"failed test result would be droped." "failed test result would be dropped."
msgstr "" msgstr ""
msgid "" msgid ""

4
bbl/i18n/it/BambuStudio_it.po
View File

@ -9708,7 +9708,7 @@ msgstr ""
msgid "Connecting to printer..." msgid "Connecting to printer..."
msgstr "" msgstr ""
msgid "The failed test result has been droped." msgid "The failed test result has been dropped."
msgstr "" msgstr ""
msgid "Flow Dynamics Calibration result has been saved to the printer" msgid "Flow Dynamics Calibration result has been saved to the printer"
@ -9835,7 +9835,7 @@ msgstr ""
msgid "" msgid ""
"Part of the calibration failed! You may clean the plate and retry. The " "Part of the calibration failed! You may clean the plate and retry. The "
"failed test result would be droped." "failed test result would be dropped."
msgstr "" msgstr ""
msgid "" msgid ""

4
bbl/i18n/ja/BambuStudio_ja.po
View File

@ -9224,7 +9224,7 @@ msgstr ""
msgid "Connecting to printer..." msgid "Connecting to printer..."
msgstr "" msgstr ""
msgid "The failed test result has been droped." msgid "The failed test result has been dropped."
msgstr "" msgstr ""
msgid "Flow Dynamics Calibration result has been saved to the printer" msgid "Flow Dynamics Calibration result has been saved to the printer"
@ -9351,7 +9351,7 @@ msgstr ""
msgid "" msgid ""
"Part of the calibration failed! You may clean the plate and retry. The " "Part of the calibration failed! You may clean the plate and retry. The "
"failed test result would be droped." "failed test result would be dropped."
msgstr "" msgstr ""
msgid "" msgid ""

4
bbl/i18n/ko/BambuStudio_ko.po
View File

@ -9363,7 +9363,7 @@ msgstr ""
msgid "Connecting to printer..." msgid "Connecting to printer..."
msgstr "" msgstr ""
msgid "The failed test result has been droped." msgid "The failed test result has been dropped."
msgstr "" msgstr ""
msgid "Flow Dynamics Calibration result has been saved to the printer" msgid "Flow Dynamics Calibration result has been saved to the printer"
@ -9490,7 +9490,7 @@ msgstr ""
msgid "" msgid ""
"Part of the calibration failed! You may clean the plate and retry. The " "Part of the calibration failed! You may clean the plate and retry. The "
"failed test result would be droped." "failed test result would be dropped."
msgstr "" msgstr ""
msgid "" msgid ""

4
bbl/i18n/nl/BambuStudio_nl.po
View File

@ -9729,7 +9729,7 @@ msgstr ""
msgid "Connecting to printer..." msgid "Connecting to printer..."
msgstr "" msgstr ""
msgid "The failed test result has been droped." msgid "The failed test result has been dropped."
msgstr "" msgstr ""
msgid "Flow Dynamics Calibration result has been saved to the printer" msgid "Flow Dynamics Calibration result has been saved to the printer"
@ -9856,7 +9856,7 @@ msgstr ""
msgid "" msgid ""
"Part of the calibration failed! You may clean the plate and retry. The " "Part of the calibration failed! You may clean the plate and retry. The "
"failed test result would be droped." "failed test result would be dropped."
msgstr "" msgstr ""
msgid "" msgid ""

4
bbl/i18n/sv/BambuStudio_sv.po
View File

@ -9543,7 +9543,7 @@ msgstr ""
msgid "Connecting to printer..." msgid "Connecting to printer..."
msgstr "" msgstr ""
msgid "The failed test result has been droped." msgid "The failed test result has been dropped."
msgstr "" msgstr ""
msgid "Flow Dynamics Calibration result has been saved to the printer" msgid "Flow Dynamics Calibration result has been saved to the printer"
@ -9670,7 +9670,7 @@ msgstr ""
msgid "" msgid ""
"Part of the calibration failed! You may clean the plate and retry. The " "Part of the calibration failed! You may clean the plate and retry. The "
"failed test result would be droped." "failed test result would be dropped."
msgstr "" msgstr ""
msgid "" msgid ""

2
bbl/i18n/zh_cn/BambuStudio_zh_CN.po
View File

@ -9076,7 +9076,7 @@ msgstr "请选择要校准的耗材丝。"
msgid "Connecting to printer..." msgid "Connecting to printer..."
msgstr "正在连接打印机..." msgstr "正在连接打印机..."
msgid "The failed test result has been droped." msgid "The failed test result has been dropped."
msgstr "测试失败的结果已被删除。" msgstr "测试失败的结果已被删除。"
msgid "Flow Dynamics Calibration result has been saved to the printer" msgid "Flow Dynamics Calibration result has been saved to the printer"

4
src/slic3r/GUI/CalibrationWizard.cpp
View File

@ -587,7 +587,7 @@ void PressureAdvanceWizard::on_cali_save()
return; return;
} }
if (save_page->is_all_failed()) { if (save_page->is_all_failed()) {
MessageDialog msg_dlg(nullptr, _L("The failed test result has been droped."), wxEmptyString, wxOK); MessageDialog msg_dlg(nullptr, _L("The failed test result has been dropped."), wxEmptyString, wxOK);
msg_dlg.ShowModal(); msg_dlg.ShowModal();
show_step(start_step); show_step(start_step);
return; return;
@ -945,7 +945,7 @@ void FlowRateWizard::on_cali_save()
return; return;
} }
if (save_page->is_all_failed()) { if (save_page->is_all_failed()) {
MessageDialog msg_dlg(nullptr, _L("The failed test result has been droped."), wxEmptyString, wxOK); MessageDialog msg_dlg(nullptr, _L("The failed test result has been dropped."), wxEmptyString, wxOK);
msg_dlg.ShowModal(); msg_dlg.ShowModal();
show_step(start_step); show_step(start_step);
return; return;

4
src/slic3r/GUI/CalibrationWizardSavePage.cpp
View File

@ -148,7 +148,7 @@ void CaliPASaveAutoPanel::create_panel(wxWindow* parent)
wxBoxSizer* part_failed_sizer = new wxBoxSizer(wxVERTICAL); wxBoxSizer* part_failed_sizer = new wxBoxSizer(wxVERTICAL);
m_part_failed_panel->SetSizer(part_failed_sizer); m_part_failed_panel->SetSizer(part_failed_sizer);
part_failed_sizer->AddSpacer(FromDIP(10)); part_failed_sizer->AddSpacer(FromDIP(10));
auto part_failed_text = new Label(m_part_failed_panel, _L("Part of the calibration failed! You may clean the plate and retry. The failed test result would be droped.")); auto part_failed_text = new Label(m_part_failed_panel, _L("Part of the calibration failed! You may clean the plate and retry. The failed test result would be dropped."));
part_failed_text->SetFont(Label::Body_14); part_failed_text->SetFont(Label::Body_14);
part_failed_sizer->Add(part_failed_text, 0, wxLEFT | wxRIGHT, FromDIP(20)); part_failed_sizer->Add(part_failed_text, 0, wxLEFT | wxRIGHT, FromDIP(20));
part_failed_sizer->AddSpacer(FromDIP(10)); part_failed_sizer->AddSpacer(FromDIP(10));
@ -910,7 +910,7 @@ void CalibrationFlowX1SavePage::create_page(wxWindow* parent)
wxBoxSizer* part_failed_sizer = new wxBoxSizer(wxVERTICAL); wxBoxSizer* part_failed_sizer = new wxBoxSizer(wxVERTICAL);
m_part_failed_panel->SetSizer(part_failed_sizer); m_part_failed_panel->SetSizer(part_failed_sizer);
part_failed_sizer->AddSpacer(FromDIP(10)); part_failed_sizer->AddSpacer(FromDIP(10));
auto part_failed_text = new Label(m_part_failed_panel, _L("Part of the calibration failed! You may clean the plate and retry. The failed test result would be droped.")); auto part_failed_text = new Label(m_part_failed_panel, _L("Part of the calibration failed! You may clean the plate and retry. The failed test result would be dropped."));
part_failed_text->SetFont(Label::Body_14); part_failed_text->SetFont(Label::Body_14);
part_failed_sizer->Add(part_failed_text, 0, wxLEFT | wxRIGHT, FromDIP(20)); part_failed_sizer->Add(part_failed_text, 0, wxLEFT | wxRIGHT, FromDIP(20));
part_failed_sizer->AddSpacer(FromDIP(10)); part_failed_sizer->AddSpacer(FromDIP(10));