From e9661f3fddc873fcdc5a9cf939c220b4f11fcd55 Mon Sep 17 00:00:00 2001 From: tao wang Date: Wed, 8 Nov 2023 19:42:00 +0800 Subject: [PATCH] ENH:update the description of nozzle detection Change-Id: Id27b25c69dc11fcf66fc82053af705906ae8c370 --- bbl/i18n/BambuStudio.pot | 10 +++++++--- bbl/i18n/cs/BambuStudio_cs.po | 10 +++++++--- bbl/i18n/de/BambuStudio_de.po | 10 +++++++--- bbl/i18n/en/BambuStudio_en.po | 10 +++++++--- bbl/i18n/es/BambuStudio_es.po | 10 +++++++--- bbl/i18n/fr/BambuStudio_fr.po | 10 +++++++--- bbl/i18n/hu/BambuStudio_hu.po | 10 +++++++--- bbl/i18n/it/BambuStudio_it.po | 10 +++++++--- bbl/i18n/ja/BambuStudio_ja.po | 10 +++++++--- bbl/i18n/ko/BambuStudio_ko.po | 10 +++++++--- bbl/i18n/nl/BambuStudio_nl.po | 10 +++++++--- bbl/i18n/ru/BambuStudio_ru.po | 10 +++++++--- bbl/i18n/sv/BambuStudio_sv.po | 10 +++++++--- bbl/i18n/uk/BambuStudio_uk.po | 10 +++++++--- bbl/i18n/zh_cn/BambuStudio_zh_CN.po | 22 ++++++++++++++++++---- resources/i18n/zh_cn/BambuStudio.mo | Bin 286217 -> 286226 bytes src/slic3r/GUI/SelectMachine.cpp | 2 +- src/slic3r/Utils/CalibUtils.cpp | 2 +- 18 files changed, 118 insertions(+), 48 deletions(-) diff --git a/bbl/i18n/BambuStudio.pot b/bbl/i18n/BambuStudio.pot index 785733850..a9d474751 100644 --- a/bbl/i18n/BambuStudio.pot +++ b/bbl/i18n/BambuStudio.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-07 16:44+0800\n" +"POT-Creation-Date: 2023-11-08 19:50+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -5451,8 +5451,8 @@ msgid "nozzle memorized: %.1f %s" msgstr "" msgid "" -"Your nozzle type in preset is not consistent with memorized nozzle.Did you " -"change your nozzle lately ? " +"Your nozzle diameter in preset is not consistent with memorized nozzle " +"diameter. Did you change your nozzle lately?" msgstr "" #, possible-c-format, possible-boost-format @@ -9961,6 +9961,10 @@ msgstr "" msgid "Custom vendor is not input, please input custom vendor." msgstr "" +msgid "" +"\"Bambu\" or \"Generic\" can not be used as a Vendor for custom filaments." +msgstr "" + msgid "Filament type is not selected, please reselect type." msgstr "" diff --git a/bbl/i18n/cs/BambuStudio_cs.po b/bbl/i18n/cs/BambuStudio_cs.po index 91d1c8c46..d0f3f19fb 100644 --- a/bbl/i18n/cs/BambuStudio_cs.po +++ b/bbl/i18n/cs/BambuStudio_cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-07 16:44+0800\n" +"POT-Creation-Date: 2023-11-08 19:50+0800\n" "PO-Revision-Date: 2023-10-18 10:45+0800\n" "Last-Translator: René Mošner \n" "Language-Team: \n" @@ -5766,8 +5766,8 @@ msgid "nozzle memorized: %.1f %s" msgstr "" msgid "" -"Your nozzle type in preset is not consistent with memorized nozzle.Did you " -"change your nozzle lately ? " +"Your nozzle diameter in preset is not consistent with memorized nozzle " +"diameter. Did you change your nozzle lately?" msgstr "" #, c-format, boost-format @@ -10867,6 +10867,10 @@ msgstr "" msgid "Custom vendor is not input, please input custom vendor." msgstr "" +msgid "" +"\"Bambu\" or \"Generic\" can not be used as a Vendor for custom filaments." +msgstr "" + msgid "Filament type is not selected, please reselect type." msgstr "" diff --git a/bbl/i18n/de/BambuStudio_de.po b/bbl/i18n/de/BambuStudio_de.po index e80c3c12c..4c25a3946 100644 --- a/bbl/i18n/de/BambuStudio_de.po +++ b/bbl/i18n/de/BambuStudio_de.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Bambu Studio\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-07 16:44+0800\n" +"POT-Creation-Date: 2023-11-08 19:50+0800\n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -5841,8 +5841,8 @@ msgid "nozzle memorized: %.1f %s" msgstr "" msgid "" -"Your nozzle type in preset is not consistent with memorized nozzle.Did you " -"change your nozzle lately ? " +"Your nozzle diameter in preset is not consistent with memorized nozzle " +"diameter. Did you change your nozzle lately?" msgstr "" #, c-format, boost-format @@ -10960,6 +10960,10 @@ msgstr "" msgid "Custom vendor is not input, please input custom vendor." msgstr "" +msgid "" +"\"Bambu\" or \"Generic\" can not be used as a Vendor for custom filaments." +msgstr "" + msgid "Filament type is not selected, please reselect type." msgstr "" diff --git a/bbl/i18n/en/BambuStudio_en.po b/bbl/i18n/en/BambuStudio_en.po index c327ba741..3911203cc 100644 --- a/bbl/i18n/en/BambuStudio_en.po +++ b/bbl/i18n/en/BambuStudio_en.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Bambu Studio\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-07 16:44+0800\n" +"POT-Creation-Date: 2023-11-08 19:50+0800\n" "Language: en\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -5720,8 +5720,8 @@ msgid "nozzle memorized: %.1f %s" msgstr "" msgid "" -"Your nozzle type in preset is not consistent with memorized nozzle.Did you " -"change your nozzle lately ? " +"Your nozzle diameter in preset is not consistent with memorized nozzle " +"diameter. Did you change your nozzle lately?" msgstr "" #, c-format, boost-format @@ -10715,6 +10715,10 @@ msgstr "" msgid "Custom vendor is not input, please input custom vendor." msgstr "" +msgid "" +"\"Bambu\" or \"Generic\" can not be used as a Vendor for custom filaments." +msgstr "" + msgid "Filament type is not selected, please reselect type." msgstr "" diff --git a/bbl/i18n/es/BambuStudio_es.po b/bbl/i18n/es/BambuStudio_es.po index 7cc98fc4e..4ce4bd5c9 100644 --- a/bbl/i18n/es/BambuStudio_es.po +++ b/bbl/i18n/es/BambuStudio_es.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Bambu Studio\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-07 16:44+0800\n" +"POT-Creation-Date: 2023-11-08 19:50+0800\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: \n" @@ -5805,8 +5805,8 @@ msgid "nozzle memorized: %.1f %s" msgstr "" msgid "" -"Your nozzle type in preset is not consistent with memorized nozzle.Did you " -"change your nozzle lately ? " +"Your nozzle diameter in preset is not consistent with memorized nozzle " +"diameter. Did you change your nozzle lately?" msgstr "" #, c-format, boost-format @@ -10896,6 +10896,10 @@ msgstr "" msgid "Custom vendor is not input, please input custom vendor." msgstr "" +msgid "" +"\"Bambu\" or \"Generic\" can not be used as a Vendor for custom filaments." +msgstr "" + msgid "Filament type is not selected, please reselect type." msgstr "" diff --git a/bbl/i18n/fr/BambuStudio_fr.po b/bbl/i18n/fr/BambuStudio_fr.po index 2d6177f77..cd82b3125 100644 --- a/bbl/i18n/fr/BambuStudio_fr.po +++ b/bbl/i18n/fr/BambuStudio_fr.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Bambu Studio\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-07 16:44+0800\n" +"POT-Creation-Date: 2023-11-08 19:50+0800\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: \n" @@ -5826,8 +5826,8 @@ msgid "nozzle memorized: %.1f %s" msgstr "" msgid "" -"Your nozzle type in preset is not consistent with memorized nozzle.Did you " -"change your nozzle lately ? " +"Your nozzle diameter in preset is not consistent with memorized nozzle " +"diameter. Did you change your nozzle lately?" msgstr "" #, c-format, boost-format @@ -10969,6 +10969,10 @@ msgstr "" msgid "Custom vendor is not input, please input custom vendor." msgstr "" +msgid "" +"\"Bambu\" or \"Generic\" can not be used as a Vendor for custom filaments." +msgstr "" + msgid "Filament type is not selected, please reselect type." msgstr "" diff --git a/bbl/i18n/hu/BambuStudio_hu.po b/bbl/i18n/hu/BambuStudio_hu.po index b52b580b8..3e294523f 100644 --- a/bbl/i18n/hu/BambuStudio_hu.po +++ b/bbl/i18n/hu/BambuStudio_hu.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Bambu Studio\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-07 16:44+0800\n" +"POT-Creation-Date: 2023-11-08 19:50+0800\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: \n" @@ -5770,8 +5770,8 @@ msgid "nozzle memorized: %.1f %s" msgstr "" msgid "" -"Your nozzle type in preset is not consistent with memorized nozzle.Did you " -"change your nozzle lately ? " +"Your nozzle diameter in preset is not consistent with memorized nozzle " +"diameter. Did you change your nozzle lately?" msgstr "" #, c-format, boost-format @@ -10830,6 +10830,10 @@ msgstr "" msgid "Custom vendor is not input, please input custom vendor." msgstr "" +msgid "" +"\"Bambu\" or \"Generic\" can not be used as a Vendor for custom filaments." +msgstr "" + msgid "Filament type is not selected, please reselect type." msgstr "" diff --git a/bbl/i18n/it/BambuStudio_it.po b/bbl/i18n/it/BambuStudio_it.po index 1bdc078fc..6cbc4aa53 100644 --- a/bbl/i18n/it/BambuStudio_it.po +++ b/bbl/i18n/it/BambuStudio_it.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Bambu Studio\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-07 16:44+0800\n" +"POT-Creation-Date: 2023-11-08 19:50+0800\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -5791,8 +5791,8 @@ msgid "nozzle memorized: %.1f %s" msgstr "" msgid "" -"Your nozzle type in preset is not consistent with memorized nozzle.Did you " -"change your nozzle lately ? " +"Your nozzle diameter in preset is not consistent with memorized nozzle " +"diameter. Did you change your nozzle lately?" msgstr "" #, c-format, boost-format @@ -10900,6 +10900,10 @@ msgstr "" msgid "Custom vendor is not input, please input custom vendor." msgstr "" +msgid "" +"\"Bambu\" or \"Generic\" can not be used as a Vendor for custom filaments." +msgstr "" + msgid "Filament type is not selected, please reselect type." msgstr "" diff --git a/bbl/i18n/ja/BambuStudio_ja.po b/bbl/i18n/ja/BambuStudio_ja.po index 04e97e1b6..ff3dc79ff 100644 --- a/bbl/i18n/ja/BambuStudio_ja.po +++ b/bbl/i18n/ja/BambuStudio_ja.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Bambu Studio\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-07 16:44+0800\n" +"POT-Creation-Date: 2023-11-08 19:50+0800\n" "Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -5612,8 +5612,8 @@ msgid "nozzle memorized: %.1f %s" msgstr "" msgid "" -"Your nozzle type in preset is not consistent with memorized nozzle.Did you " -"change your nozzle lately ? " +"Your nozzle diameter in preset is not consistent with memorized nozzle " +"diameter. Did you change your nozzle lately?" msgstr "" #, c-format, boost-format @@ -10423,6 +10423,10 @@ msgstr "" msgid "Custom vendor is not input, please input custom vendor." msgstr "" +msgid "" +"\"Bambu\" or \"Generic\" can not be used as a Vendor for custom filaments." +msgstr "" + msgid "Filament type is not selected, please reselect type." msgstr "" diff --git a/bbl/i18n/ko/BambuStudio_ko.po b/bbl/i18n/ko/BambuStudio_ko.po index c44ce0e4f..9e836ef4c 100644 --- a/bbl/i18n/ko/BambuStudio_ko.po +++ b/bbl/i18n/ko/BambuStudio_ko.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Bambu Studio\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-07 16:44+0800\n" +"POT-Creation-Date: 2023-11-08 19:50+0800\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: \n" @@ -5675,8 +5675,8 @@ msgid "nozzle memorized: %.1f %s" msgstr "" msgid "" -"Your nozzle type in preset is not consistent with memorized nozzle.Did you " -"change your nozzle lately ? " +"Your nozzle diameter in preset is not consistent with memorized nozzle " +"diameter. Did you change your nozzle lately?" msgstr "" #, c-format, boost-format @@ -10560,6 +10560,10 @@ msgstr "" msgid "Custom vendor is not input, please input custom vendor." msgstr "" +msgid "" +"\"Bambu\" or \"Generic\" can not be used as a Vendor for custom filaments." +msgstr "" + msgid "Filament type is not selected, please reselect type." msgstr "" diff --git a/bbl/i18n/nl/BambuStudio_nl.po b/bbl/i18n/nl/BambuStudio_nl.po index 473cc8f83..5cb22e25d 100644 --- a/bbl/i18n/nl/BambuStudio_nl.po +++ b/bbl/i18n/nl/BambuStudio_nl.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Bambu Studio\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-07 16:44+0800\n" +"POT-Creation-Date: 2023-11-08 19:50+0800\n" "Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -5814,8 +5814,8 @@ msgid "nozzle memorized: %.1f %s" msgstr "" msgid "" -"Your nozzle type in preset is not consistent with memorized nozzle.Did you " -"change your nozzle lately ? " +"Your nozzle diameter in preset is not consistent with memorized nozzle " +"diameter. Did you change your nozzle lately?" msgstr "" #, c-format, boost-format @@ -10920,6 +10920,10 @@ msgstr "" msgid "Custom vendor is not input, please input custom vendor." msgstr "" +msgid "" +"\"Bambu\" or \"Generic\" can not be used as a Vendor for custom filaments." +msgstr "" + msgid "Filament type is not selected, please reselect type." msgstr "" diff --git a/bbl/i18n/ru/BambuStudio_ru.po b/bbl/i18n/ru/BambuStudio_ru.po index 13f3b7452..34947dfa3 100644 --- a/bbl/i18n/ru/BambuStudio_ru.po +++ b/bbl/i18n/ru/BambuStudio_ru.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-07 16:44+0800\n" +"POT-Creation-Date: 2023-11-08 19:50+0800\n" "PO-Revision-Date: 2023-08-11 09:11+0800\n" "Last-Translator: \n" "Language-Team: \n" @@ -5777,8 +5777,8 @@ msgid "nozzle memorized: %.1f %s" msgstr "" msgid "" -"Your nozzle type in preset is not consistent with memorized nozzle.Did you " -"change your nozzle lately ? " +"Your nozzle diameter in preset is not consistent with memorized nozzle " +"diameter. Did you change your nozzle lately?" msgstr "" #, c-format, boost-format @@ -10785,6 +10785,10 @@ msgstr "" msgid "Custom vendor is not input, please input custom vendor." msgstr "" +msgid "" +"\"Bambu\" or \"Generic\" can not be used as a Vendor for custom filaments." +msgstr "" + msgid "Filament type is not selected, please reselect type." msgstr "" diff --git a/bbl/i18n/sv/BambuStudio_sv.po b/bbl/i18n/sv/BambuStudio_sv.po index 2e7db1557..8768facca 100644 --- a/bbl/i18n/sv/BambuStudio_sv.po +++ b/bbl/i18n/sv/BambuStudio_sv.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Bambu Studio\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-07 16:44+0800\n" +"POT-Creation-Date: 2023-11-08 19:50+0800\n" "Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -5740,8 +5740,8 @@ msgid "nozzle memorized: %.1f %s" msgstr "" msgid "" -"Your nozzle type in preset is not consistent with memorized nozzle.Did you " -"change your nozzle lately ? " +"Your nozzle diameter in preset is not consistent with memorized nozzle " +"diameter. Did you change your nozzle lately?" msgstr "" #, c-format, boost-format @@ -10739,6 +10739,10 @@ msgstr "" msgid "Custom vendor is not input, please input custom vendor." msgstr "" +msgid "" +"\"Bambu\" or \"Generic\" can not be used as a Vendor for custom filaments." +msgstr "" + msgid "Filament type is not selected, please reselect type." msgstr "" diff --git a/bbl/i18n/uk/BambuStudio_uk.po b/bbl/i18n/uk/BambuStudio_uk.po index 08ab54adb..d579427e8 100644 --- a/bbl/i18n/uk/BambuStudio_uk.po +++ b/bbl/i18n/uk/BambuStudio_uk.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Bambu Studio\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-07 16:44+0800\n" +"POT-Creation-Date: 2023-11-08 19:50+0800\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: BambuLab Україна\n" @@ -5794,8 +5794,8 @@ msgid "nozzle memorized: %.1f %s" msgstr "" msgid "" -"Your nozzle type in preset is not consistent with memorized nozzle.Did you " -"change your nozzle lately ? " +"Your nozzle diameter in preset is not consistent with memorized nozzle " +"diameter. Did you change your nozzle lately?" msgstr "" #, c-format, boost-format @@ -10956,6 +10956,10 @@ msgstr "" msgid "Custom vendor is not input, please input custom vendor." msgstr "" +msgid "" +"\"Bambu\" or \"Generic\" can not be used as a Vendor for custom filaments." +msgstr "" + msgid "Filament type is not selected, please reselect type." msgstr "" diff --git a/bbl/i18n/zh_cn/BambuStudio_zh_CN.po b/bbl/i18n/zh_cn/BambuStudio_zh_CN.po index b0662890c..6f5eb5bb8 100644 --- a/bbl/i18n/zh_cn/BambuStudio_zh_CN.po +++ b/bbl/i18n/zh_cn/BambuStudio_zh_CN.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Slic3rPE\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-07 16:44+0800\n" +"POT-Creation-Date: 2023-11-08 19:50+0800\n" "PO-Revision-Date: 2023-11-03 16:10+0800\n" "Last-Translator: Jiang Yue \n" "Language-Team: \n" @@ -5599,9 +5599,9 @@ msgid "nozzle memorized: %.1f %s" msgstr "记忆中的喷嘴：%.1f %s" msgid "" -"Your nozzle type in preset is not consistent with memorized nozzle.Did you " -"change your nozzle lately ? " -msgstr "预设中的喷嘴类型与记忆中的喷嘴类型不一致。您最近更换了喷嘴吗？" +"Your nozzle diameter in preset is not consistent with memorized nozzle " +"diameter. Did you change your nozzle lately?" +msgstr "预设中的喷嘴直径与记忆的喷嘴直径不一致。您最近更换了喷嘴吗？" #, c-format, boost-format msgid "*Printing %s material with %s may cause nozzle damage" @@ -10392,6 +10392,10 @@ msgstr "未选择供应商，请重新选择供应商。" msgid "Custom vendor is not input, please input custom vendor." msgstr "未输入自定义供应商，请输入自定义供应商。" +msgid "" +"\"Bambu\" or \"Generic\" can not be used as a Vendor for custom filaments." +msgstr "" + msgid "Filament type is not selected, please reselect type." msgstr "未选择材料类型，请重新选择。" @@ -11015,6 +11019,16 @@ msgstr "" "避免翘曲\n" "您知道吗？打印ABS这类易翘曲材料时，适当提高热床温度可以降低翘曲的概率。" +#~ msgid "" +#~ "Your nozzle type in preset is not consistent with memorized nozzle.Did " +#~ "you change your nozzle lately ? " +#~ msgstr "预设中的喷嘴类型与记忆中的喷嘴类型不一致。您最近更换了喷嘴吗？" + +#~ msgid "" +#~ "Your nozzle diameter in preset is not consistent with memorized nozzle." +#~ "Did you change your nozzle lately ? " +#~ msgstr "预设中的喷嘴直径与记忆中的喷嘴直径不一致。您最近更换了喷嘴吗？" + #~ msgid "Improt Presets" #~ msgstr "导入预设" diff --git a/resources/i18n/zh_cn/BambuStudio.mo b/resources/i18n/zh_cn/BambuStudio.mo index dd90511e165749b612d14b9fef644b2ecc7d080d..f67dc340d2719e2cdaaee52681afb3813ddd4243 100644 GIT binary patch delta 25368 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 delta 25364 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 diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp index 577fde434..5ee207ec0 100644 --- a/src/slic3r/GUI/SelectMachine.cpp +++ b/src/slic3r/GUI/SelectMachine.cpp @@ -2510,7 +2510,7 @@ void SelectMachineDialog::on_ok_btn(wxCommandEvent &event) wxString nozzle_in_preset = wxString::Format(_L("nozzle in preset: %s %s"),nozzle_diameter, format_steel_name(nozzle_type)); wxString nozzle_in_printer = wxString::Format(_L("nozzle memorized: %.1f %s"), obj_->nozzle_diameter, format_steel_name(obj_->nozzle_type)); - confirm_text.push_back(_L("Your nozzle type in preset is not consistent with memorized nozzle.Did you change your nozzle lately ? ") + confirm_text.push_back(_L("Your nozzle diameter in preset is not consistent with memorized nozzle diameter. Did you change your nozzle lately?") + "\n " + nozzle_in_preset + "\n " + nozzle_in_printer + "\n"); diff --git a/src/slic3r/Utils/CalibUtils.cpp b/src/slic3r/Utils/CalibUtils.cpp index 0c61b28f6..a7ec6010b 100644 --- a/src/slic3r/Utils/CalibUtils.cpp +++ b/src/slic3r/Utils/CalibUtils.cpp @@ -86,7 +86,7 @@ static bool is_same_nozzle_diameters(const DynamicPrintConfig &full_config, cons wxString nozzle_in_preset = wxString::Format(_L("nozzle in preset: %s %s"), wxString::Format("%.1f", preset_nozzle_diameter).ToStdString(), to_wstring_name(nozzle_type)); wxString nozzle_in_printer = wxString::Format(_L("nozzle memorized: %.1f %s"), obj->nozzle_diameter, to_wstring_name(obj->nozzle_type)); - error_msg = _L("Your nozzle type in preset is not consistent with memorized nozzle.Did you change your nozzle lately ? ") + "\n " + nozzle_in_preset + + error_msg = _L("Your nozzle diameter in preset is not consistent with memorized nozzle diameter. Did you change your nozzle lately?") + "\n " + nozzle_in_preset + "\n " + nozzle_in_printer + "\n"; return false; }