diff --git a/bbl/i18n/BambuStudio.pot b/bbl/i18n/BambuStudio.pot index fac3d8a3c..e819724fb 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: 2022-08-03 16:53+0800\n" +"POT-Creation-Date: 2022-08-04 11:33+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1260,6 +1260,13 @@ msgstr "" msgid "Confirm" msgstr "" +msgid "AMS Slots" +msgstr "" + +msgid "" +"Note: Only the AMS slots loaded with the same material type can be selected." +msgstr "" + msgid "Insertion update" msgstr "" @@ -3255,13 +3262,13 @@ msgstr "" #, possible-c-format, possible-boost-format msgid "" -"Filament index %s exceeds the number of AMS slots. Please update the printer " +"Filament %s exceeds the number of AMS slots. Please update the printer " "firmware to support AMS slot assignment." msgstr "" msgid "" -"Filament index exceeds the number of AMS slots. Please update the printer " -"firmware to support AMS slot assignment." +"Filament exceeds the number of AMS slots. Please update the printer firmware " +"to support AMS slot assignment." msgstr "" msgid "" @@ -3276,13 +3283,13 @@ msgstr "" #, possible-c-format, possible-boost-format msgid "" -"Filament index %s does not match the filament in AMS slot %s. Please update " -"the printer firmware to support AMS slot assignment." +"Filament %s does not match the filament in AMS slot %s. Please update the " +"printer firmware to support AMS slot assignment." msgstr "" msgid "" -"Filament index does not match the filament in AMS slot. Please update the " -"printer firmware to support AMS slot assignment." +"Filament does not match the filament in AMS slot. Please update the printer " +"firmware to support AMS slot assignment." msgstr "" msgid "" diff --git a/bbl/i18n/de/BambuStudio_de.po b/bbl/i18n/de/BambuStudio_de.po index 9ffdc0f8a..6dc2001df 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: 2022-08-03 16:53+0800\n" +"POT-Creation-Date: 2022-08-04 11:33+0800\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: \n" @@ -1326,6 +1326,13 @@ msgstr "SN" msgid "Confirm" msgstr "Bestätigen" +msgid "AMS Slots" +msgstr "" + +msgid "" +"Note: Only the AMS slots loaded with the same material type can be selected." +msgstr "" + msgid "Insertion update" msgstr "Insertion update" @@ -3461,13 +3468,13 @@ msgstr "The printer is busy with another print job." #, c-format, boost-format msgid "" -"Filament index %s exceeds the number of AMS slots. Please update the printer " +"Filament %s exceeds the number of AMS slots. Please update the printer " "firmware to support AMS slot assignment." msgstr "" msgid "" -"Filament index exceeds the number of AMS slots. Please update the printer " -"firmware to support AMS slot assignment." +"Filament exceeds the number of AMS slots. Please update the printer firmware " +"to support AMS slot assignment." msgstr "" msgid "" @@ -3486,13 +3493,13 @@ msgstr "" #, c-format, boost-format msgid "" -"Filament index %s does not match the filament in AMS slot %s. Please update " -"the printer firmware to support AMS slot assignment." +"Filament %s does not match the filament in AMS slot %s. Please update the " +"printer firmware to support AMS slot assignment." msgstr "" msgid "" -"Filament index does not match the filament in AMS slot. Please update the " -"printer firmware to support AMS slot assignment." +"Filament does not match the filament in AMS slot. Please update the printer " +"firmware to support AMS slot assignment." msgstr "" msgid "" diff --git a/bbl/i18n/en/BambuStudio_en.po b/bbl/i18n/en/BambuStudio_en.po index 2cc96f32c..78ac2555b 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: 2022-08-03 16:53+0800\n" +"POT-Creation-Date: 2022-08-04 11:33+0800\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: \n" @@ -1300,6 +1300,13 @@ msgstr "SN" msgid "Confirm" msgstr "Confirm" +msgid "AMS Slots" +msgstr "" + +msgid "" +"Note: Only the AMS slots loaded with the same material type can be selected." +msgstr "" + msgid "Insertion update" msgstr "Insertion update" @@ -3401,13 +3408,13 @@ msgstr "The printer is busy with another print job." #, c-format, boost-format msgid "" -"Filament index %s exceeds the number of AMS slots. Please update the printer " +"Filament %s exceeds the number of AMS slots. Please update the printer " "firmware to support AMS slot assignment." msgstr "" msgid "" -"Filament index exceeds the number of AMS slots. Please update the printer " -"firmware to support AMS slot assignment." +"Filament exceeds the number of AMS slots. Please update the printer firmware " +"to support AMS slot assignment." msgstr "" msgid "" @@ -3426,13 +3433,13 @@ msgstr "" #, c-format, boost-format msgid "" -"Filament index %s does not match the filament in AMS slot %s. Please update " -"the printer firmware to support AMS slot assignment." +"Filament %s does not match the filament in AMS slot %s. Please update the " +"printer firmware to support AMS slot assignment." msgstr "" msgid "" -"Filament index does not match the filament in AMS slot. Please update the " -"printer firmware to support AMS slot assignment." +"Filament does not match the filament in AMS slot. Please update the printer " +"firmware to support AMS slot assignment." msgstr "" msgid "" @@ -3985,18 +3992,18 @@ msgid "" "objects, it just orientates the selected ones.Otherwise, it will orientates " "all objects in the project." msgstr "" -"Auto orientates selected objects or all objects." -"If there are selected objects, it just orientates the selected ones." -"Otherwise, it will orientates all objects in the project." +"Auto orientates selected objects or all objects.If there are selected " +"objects, it just orientates the selected ones.Otherwise, it will orientates " +"all objects in the project." msgid "" "Auto orientates selected objects or all objects.If there are selected " "objects, it just orientates the selected ones.Otherwise, it will orientates " "all objects in the current disk." msgstr "" -"Auto orientates selected objects or all objects." -"If there are selected objects, it just orientates the selected ones." -"Otherwise, it will orientates all objects in the current disk." +"Auto orientates selected objects or all objects.If there are selected " +"objects, it just orientates the selected ones.Otherwise, it will orientates " +"all objects in the current disk." msgid "Collapse/Expand the sidebar" msgstr "Collapse/Expand the sidebar" diff --git a/bbl/i18n/es/BambuStudio_es.po b/bbl/i18n/es/BambuStudio_es.po index 934b2681b..8fb1ee868 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: 2022-08-03 16:53+0800\n" +"POT-Creation-Date: 2022-08-04 11:33+0800\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: \n" @@ -1321,6 +1321,13 @@ msgstr "SN" msgid "Confirm" msgstr "Confirmar" +msgid "AMS Slots" +msgstr "" + +msgid "" +"Note: Only the AMS slots loaded with the same material type can be selected." +msgstr "" + msgid "Insertion update" msgstr "Insertion update" @@ -3450,13 +3457,13 @@ msgstr "The printer is busy with another print job." #, c-format, boost-format msgid "" -"Filament index %s exceeds the number of AMS slots. Please update the printer " +"Filament %s exceeds the number of AMS slots. Please update the printer " "firmware to support AMS slot assignment." msgstr "" msgid "" -"Filament index exceeds the number of AMS slots. Please update the printer " -"firmware to support AMS slot assignment." +"Filament exceeds the number of AMS slots. Please update the printer firmware " +"to support AMS slot assignment." msgstr "" msgid "" @@ -3475,13 +3482,13 @@ msgstr "" #, c-format, boost-format msgid "" -"Filament index %s does not match the filament in AMS slot %s. Please update " -"the printer firmware to support AMS slot assignment." +"Filament %s does not match the filament in AMS slot %s. Please update the " +"printer firmware to support AMS slot assignment." msgstr "" msgid "" -"Filament index does not match the filament in AMS slot. Please update the " -"printer firmware to support AMS slot assignment." +"Filament does not match the filament in AMS slot. Please update the printer " +"firmware to support AMS slot assignment." msgstr "" msgid "" diff --git a/bbl/i18n/fr/BambuStudio_fr.po b/bbl/i18n/fr/BambuStudio_fr.po index 1fc5d3d35..f98ad0ed7 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: 2022-08-03 16:53+0800\n" +"POT-Creation-Date: 2022-08-04 11:33+0800\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: \n" @@ -1321,6 +1321,13 @@ msgstr "SN" msgid "Confirm" msgstr "Confirmer" +msgid "AMS Slots" +msgstr "" + +msgid "" +"Note: Only the AMS slots loaded with the same material type can be selected." +msgstr "" + msgid "Insertion update" msgstr "Insertion update" @@ -3433,13 +3440,13 @@ msgstr "The printer is busy with another print job." #, c-format, boost-format msgid "" -"Filament index %s exceeds the number of AMS slots. Please update the printer " +"Filament %s exceeds the number of AMS slots. Please update the printer " "firmware to support AMS slot assignment." msgstr "" msgid "" -"Filament index exceeds the number of AMS slots. Please update the printer " -"firmware to support AMS slot assignment." +"Filament exceeds the number of AMS slots. Please update the printer firmware " +"to support AMS slot assignment." msgstr "" msgid "" @@ -3458,13 +3465,13 @@ msgstr "" #, c-format, boost-format msgid "" -"Filament index %s does not match the filament in AMS slot %s. Please update " -"the printer firmware to support AMS slot assignment." +"Filament %s does not match the filament in AMS slot %s. Please update the " +"printer firmware to support AMS slot assignment." msgstr "" msgid "" -"Filament index does not match the filament in AMS slot. Please update the " -"printer firmware to support AMS slot assignment." +"Filament does not match the filament in AMS slot. Please update the printer " +"firmware to support AMS slot assignment." msgstr "" msgid "" diff --git a/bbl/i18n/hu/BambuStudio_hu.po b/bbl/i18n/hu/BambuStudio_hu.po index ffa30cfdf..fc3653caa 100644 --- a/bbl/i18n/hu/BambuStudio_hu.po +++ b/bbl/i18n/hu/BambuStudio_hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-08-03 16:53+0800\n" +"POT-Creation-Date: 2022-08-04 11:33+0800\n" "PO-Revision-Date: 2022-07-27 22:05+0100\n" "Last-Translator: \n" "Language-Team: \n" @@ -1340,6 +1340,13 @@ msgstr "SN" msgid "Confirm" msgstr "Megerősítés" +msgid "AMS Slots" +msgstr "" + +msgid "" +"Note: Only the AMS slots loaded with the same material type can be selected." +msgstr "" + msgid "Insertion update" msgstr "" @@ -3423,13 +3430,13 @@ msgstr "" #, c-format, boost-format msgid "" -"Filament index %s exceeds the number of AMS slots. Please update the printer " +"Filament %s exceeds the number of AMS slots. Please update the printer " "firmware to support AMS slot assignment." msgstr "" msgid "" -"Filament index exceeds the number of AMS slots. Please update the printer " -"firmware to support AMS slot assignment." +"Filament exceeds the number of AMS slots. Please update the printer firmware " +"to support AMS slot assignment." msgstr "" msgid "" @@ -3444,13 +3451,13 @@ msgstr "" #, c-format, boost-format msgid "" -"Filament index %s does not match the filament in AMS slot %s. Please update " -"the printer firmware to support AMS slot assignment." +"Filament %s does not match the filament in AMS slot %s. Please update the " +"printer firmware to support AMS slot assignment." msgstr "" msgid "" -"Filament index does not match the filament in AMS slot. Please update the " -"printer firmware to support AMS slot assignment." +"Filament does not match the filament in AMS slot. Please update the printer " +"firmware to support AMS slot assignment." msgstr "" msgid "" diff --git a/bbl/i18n/list.txt b/bbl/i18n/list.txt index a446c29d6..f82656dd8 100644 --- a/bbl/i18n/list.txt +++ b/bbl/i18n/list.txt @@ -35,6 +35,7 @@ src/slic3r/GUI/Jobs/PrintJob.cpp src/slic3r/GUI/Jobs/UpgradeNetworkJob.cpp src/slic3r/GUI/AboutDialog.cpp src/slic3r/GUI/AMSMaterialsSetting.cpp +src/slic3r/GUI/AMSMappingPopup.cpp src/slic3r/GUI/AMSSetting.cpp src/slic3r/GUI/BBLTopbar.cpp src/slic3r/GUI/DownloadProgressDialog.cpp diff --git a/bbl/i18n/nl/BambuStudio_nl.po b/bbl/i18n/nl/BambuStudio_nl.po index 21fe5d878..d8e6baf4c 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: 2022-08-03 16:53+0800\n" +"POT-Creation-Date: 2022-08-04 11:33+0800\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: \n" @@ -1328,6 +1328,13 @@ msgstr "SN" msgid "Confirm" msgstr "Bevestigen" +msgid "AMS Slots" +msgstr "" + +msgid "" +"Note: Only the AMS slots loaded with the same material type can be selected." +msgstr "" + msgid "Insertion update" msgstr "Insertion update" @@ -3468,13 +3475,13 @@ msgstr "The printer is busy with another print job." #, c-format, boost-format msgid "" -"Filament index %s exceeds the number of AMS slots. Please update the printer " +"Filament %s exceeds the number of AMS slots. Please update the printer " "firmware to support AMS slot assignment." msgstr "" msgid "" -"Filament index exceeds the number of AMS slots. Please update the printer " -"firmware to support AMS slot assignment." +"Filament exceeds the number of AMS slots. Please update the printer firmware " +"to support AMS slot assignment." msgstr "" msgid "" @@ -3493,13 +3500,13 @@ msgstr "" #, c-format, boost-format msgid "" -"Filament index %s does not match the filament in AMS slot %s. Please update " -"the printer firmware to support AMS slot assignment." +"Filament %s does not match the filament in AMS slot %s. Please update the " +"printer firmware to support AMS slot assignment." msgstr "" msgid "" -"Filament index does not match the filament in AMS slot. Please update the " -"printer firmware to support AMS slot assignment." +"Filament does not match the filament in AMS slot. Please update the printer " +"firmware to support AMS slot assignment." msgstr "" msgid "" diff --git a/bbl/i18n/sv/BambuStudio_sv.po b/bbl/i18n/sv/BambuStudio_sv.po index bdf537376..b9a3134d1 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: 2022-08-03 16:53+0800\n" +"POT-Creation-Date: 2022-08-04 11:33+0800\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: \n" @@ -1307,6 +1307,13 @@ msgstr "SN" msgid "Confirm" msgstr "Acceptera" +msgid "AMS Slots" +msgstr "" + +msgid "" +"Note: Only the AMS slots loaded with the same material type can be selected." +msgstr "" + msgid "Insertion update" msgstr "Insertion update" @@ -3399,13 +3406,13 @@ msgstr "The printer is busy with another print job." #, c-format, boost-format msgid "" -"Filament index %s exceeds the number of AMS slots. Please update the printer " +"Filament %s exceeds the number of AMS slots. Please update the printer " "firmware to support AMS slot assignment." msgstr "" msgid "" -"Filament index exceeds the number of AMS slots. Please update the printer " -"firmware to support AMS slot assignment." +"Filament exceeds the number of AMS slots. Please update the printer firmware " +"to support AMS slot assignment." msgstr "" msgid "" @@ -3424,13 +3431,13 @@ msgstr "" #, c-format, boost-format msgid "" -"Filament index %s does not match the filament in AMS slot %s. Please update " -"the printer firmware to support AMS slot assignment." +"Filament %s does not match the filament in AMS slot %s. Please update the " +"printer firmware to support AMS slot assignment." msgstr "" msgid "" -"Filament index does not match the filament in AMS slot. Please update the " -"printer firmware to support AMS slot assignment." +"Filament does not match the filament in AMS slot. Please update the printer " +"firmware to support AMS slot assignment." msgstr "" msgid "" @@ -5949,8 +5956,8 @@ msgid "" "interface is Concentric" msgstr "" "Linje mönster för support gränssnittsytan .Standardmönstret för olösligt " -"(material) support gränssnittet är Räta medan standardmönstret för " -"lösligt(material) stödgränssnittet är koncentriskt" +"(material) support gränssnittet är Räta medan standardmönstret för lösligt" +"(material) stödgränssnittet är koncentriskt" msgid "Base pattern spacing" msgstr "Basens mönster mellanrum" diff --git a/bbl/i18n/zh_cn/BambuStudio_zh_CN.po b/bbl/i18n/zh_cn/BambuStudio_zh_CN.po index 6f9786669..9df03b5da 100644 --- a/bbl/i18n/zh_cn/BambuStudio_zh_CN.po +++ b/bbl/i18n/zh_cn/BambuStudio_zh_CN.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Slic3rPE\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-08-03 16:53+0800\n" -"PO-Revision-Date: 2022-08-02 16:24+0800\n" +"POT-Creation-Date: 2022-08-04 11:33+0800\n" +"PO-Revision-Date: 2022-08-04 11:34+0800\n" "Last-Translator: Jiang Yue \n" "Language-Team: \n" "Language: zh_CN\n" @@ -1274,6 +1274,13 @@ msgstr "" msgid "Confirm" msgstr "确定" +msgid "AMS Slots" +msgstr "AMS舱内材料" + +msgid "" +"Note: Only the AMS slots loaded with the same material type can be selected." +msgstr "仅允许选择放入同种材质耗材丝的AMS槽位" + msgid "Insertion update" msgstr "插入料时更新" @@ -3337,14 +3344,14 @@ msgstr "打印机正在执行其他打印任务" #, c-format, boost-format msgid "" -"Filament index %s exceeds the number of AMS slots. Please update the printer " +"Filament %s exceeds the number of AMS slots. Please update the printer " "firmware to support AMS slot assignment." -msgstr "" +msgstr "材料编号%s超出AMS槽位数量,请更新打印机固件以支持AMS槽位映射功能" msgid "" -"Filament index exceeds the number of AMS slots. Please update the printer " -"firmware to support AMS slot assignment." -msgstr "" +"Filament exceeds the number of AMS slots. Please update the printer firmware " +"to support AMS slot assignment." +msgstr "材料编号超出AMS槽位数量,请更新打印机固件以支持AMS槽位映射功能" msgid "" "Filaments to AMS slots mappings have been established. You can click a " @@ -3360,14 +3367,17 @@ msgstr "请在发送打印前点击上方各个耗材丝,指定其所对应的 #, c-format, boost-format msgid "" -"Filament index %s does not match the filament in AMS slot %s. Please update " -"the printer firmware to support AMS slot assignment." -msgstr "" - -msgid "" -"Filament index does not match the filament in AMS slot. Please update the " +"Filament %s does not match the filament in AMS slot %s. Please update the " "printer firmware to support AMS slot assignment." msgstr "" +"材料编号%s和AMS槽位%s中的耗材丝材质不匹配,请更新打印机固件以支持AMS槽位映射" +"功能" + +msgid "" +"Filament does not match the filament in AMS slot. Please update the printer " +"firmware to support AMS slot assignment." +msgstr "" +"材料编号和AMS槽位中的耗材丝材质不匹配,请更新打印机固件以支持AMS槽位映射功能" msgid "" "The printer firmware only supports sequential mapping of filament => AMS " diff --git a/resources/i18n/de/BambuStudio.mo b/resources/i18n/de/BambuStudio.mo index 734876ba9..c0f8e1274 100644 Binary files a/resources/i18n/de/BambuStudio.mo and b/resources/i18n/de/BambuStudio.mo differ diff --git a/resources/i18n/en/BambuStudio.mo b/resources/i18n/en/BambuStudio.mo index 6958bea95..e818a8906 100644 Binary files a/resources/i18n/en/BambuStudio.mo and b/resources/i18n/en/BambuStudio.mo differ diff --git a/resources/i18n/es/BambuStudio.mo b/resources/i18n/es/BambuStudio.mo index 5187f793a..fed0897c9 100644 Binary files a/resources/i18n/es/BambuStudio.mo and b/resources/i18n/es/BambuStudio.mo differ diff --git a/resources/i18n/fr/BambuStudio.mo b/resources/i18n/fr/BambuStudio.mo index 6f703dfdf..3e70fa4ff 100644 Binary files a/resources/i18n/fr/BambuStudio.mo and b/resources/i18n/fr/BambuStudio.mo differ diff --git a/resources/i18n/hu/BambuStudio.mo b/resources/i18n/hu/BambuStudio.mo index 838f3ed64..88014a947 100644 Binary files a/resources/i18n/hu/BambuStudio.mo and b/resources/i18n/hu/BambuStudio.mo differ diff --git a/resources/i18n/nl/BambuStudio.mo b/resources/i18n/nl/BambuStudio.mo index 11a5d85e1..2ed42936f 100644 Binary files a/resources/i18n/nl/BambuStudio.mo and b/resources/i18n/nl/BambuStudio.mo differ diff --git a/resources/i18n/sv/BambuStudio.mo b/resources/i18n/sv/BambuStudio.mo index 01c6840bb..e8a909008 100644 Binary files a/resources/i18n/sv/BambuStudio.mo and b/resources/i18n/sv/BambuStudio.mo differ diff --git a/resources/i18n/zh_cn/BambuStudio.mo b/resources/i18n/zh_cn/BambuStudio.mo index a3d6c7f36..bfcb4d593 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 9bf736a4b..22f0a81ff 100644 --- a/src/slic3r/GUI/SelectMachine.cpp +++ b/src/slic3r/GUI/SelectMachine.cpp @@ -1333,9 +1333,9 @@ void SelectMachineDialog::show_status(PrintDialogStatus status, std::vector 0) - msg_text = wxString::Format(_L("Filament index %s exceeds the number of AMS slots. Please update the printer firmware to support AMS slot assignment."), params[0]); + msg_text = wxString::Format(_L("Filament %s exceeds the number of AMS slots. Please update the printer firmware to support AMS slot assignment."), params[0]); else - msg_text = _L("Filament index exceeds the number of AMS slots. Please update the printer firmware to support AMS slot assignment."); + msg_text = _L("Filament exceeds the number of AMS slots. Please update the printer firmware to support AMS slot assignment."); update_print_status_msg(msg_text, true, false); Enable_Send_Button(false); Enable_Refresh_Button(true); @@ -1352,9 +1352,9 @@ void SelectMachineDialog::show_status(PrintDialogStatus status, std::vector 1) - msg_text = wxString::Format(_L("Filament index %s does not match the filament in AMS slot %s. Please update the printer firmware to support AMS slot assignment."), params[0], params[1]); + msg_text = wxString::Format(_L("Filament %s does not match the filament in AMS slot %s. Please update the printer firmware to support AMS slot assignment."), params[0], params[1]); else - msg_text = _L("Filament index does not match the filament in AMS slot. Please update the printer firmware to support AMS slot assignment."); + msg_text = _L("Filament does not match the filament in AMS slot. Please update the printer firmware to support AMS slot assignment."); update_print_status_msg(msg_text, true, false); Enable_Send_Button(false); Enable_Refresh_Button(true);