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 dd90511e1..f67dc340d 100644 Binary files a/resources/i18n/zh_cn/BambuStudio.mo and b/resources/i18n/zh_cn/BambuStudio.mo differ 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; }