Merge pull request #1 from bambulab/master

merge latest changes from upstream
SoftFever · Jul 23, 2022 · 06dec4d · 06dec4d
2 parents b806df7 + 5527ebb
commit 06dec4d
Show file tree

Hide file tree

Showing 24 changed files with 389 additions and 111 deletions.
diff --git 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-07-22 18:39+0800\n"
+"POT-Creation-Date: 2022-07-23 18:15+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -3225,7 +3225,9 @@ msgstr ""
 msgid "The printer is busy on other print job"
 msgstr ""
 
-msgid "Printer firmware does not support material = >ams slot mapping."
+msgid ""
+"The filament index exceeds the AMS's slot count and cannot send the print "
+"job."
 msgstr ""
 
 msgid ""
@@ -3238,6 +3240,11 @@ msgid ""
 "sending the print job"
 msgstr ""
 
+msgid ""
+"The printer firmware only supports sequential mapping of filament => AMS "
+"slot."
+msgstr ""
+
 msgid "Preparing print job"
 msgstr ""
 

diff --git 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-07-22 18:39+0800\n"
+"POT-Creation-Date: 2022-07-23 18:15+0800\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -3431,7 +3431,9 @@ msgstr ""
 msgid "The printer is busy on other print job"
 msgstr "The printer is busy with another print job."
 
-msgid "Printer firmware does not support material = >ams slot mapping."
+msgid ""
+"The filament index exceeds the AMS's slot count and cannot send the print "
+"job."
 msgstr ""
 
 msgid ""
@@ -3448,6 +3450,11 @@ msgstr ""
 "Please click each filament above to specify its mapping AMS slot before "
 "sending the print job"
 
+msgid ""
+"The printer firmware only supports sequential mapping of filament => AMS "
+"slot."
+msgstr ""
+
 msgid "Preparing print job"
 msgstr "Preparing print job"
 

diff --git 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-07-22 18:39+0800\n"
+"POT-Creation-Date: 2022-07-23 18:15+0800\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -3371,7 +3371,9 @@ msgstr ""
 msgid "The printer is busy on other print job"
 msgstr "The printer is busy with another print job."
 
-msgid "Printer firmware does not support material = >ams slot mapping."
+msgid ""
+"The filament index exceeds the AMS's slot count and cannot send the print "
+"job."
 msgstr ""
 
 msgid ""
@@ -3388,6 +3390,11 @@ msgstr ""
 "Please click each filament above to specify its mapping AMS slot before "
 "sending the print job"
 
+msgid ""
+"The printer firmware only supports sequential mapping of filament => AMS "
+"slot."
+msgstr ""
+
 msgid "Preparing print job"
 msgstr "Preparing print job"
 

diff --git 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-07-22 18:39+0800\n"
+"POT-Creation-Date: 2022-07-23 18:15+0800\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -3420,7 +3420,9 @@ msgstr ""
 msgid "The printer is busy on other print job"
 msgstr "The printer is busy with another print job."
 
-msgid "Printer firmware does not support material = >ams slot mapping."
+msgid ""
+"The filament index exceeds the AMS's slot count and cannot send the print "
+"job."
 msgstr ""
 
 msgid ""
@@ -3437,6 +3439,11 @@ msgstr ""
 "Please click each filament above to specify its mapping AMS slot before "
 "sending the print job"
 
+msgid ""
+"The printer firmware only supports sequential mapping of filament => AMS "
+"slot."
+msgstr ""
+
 msgid "Preparing print job"
 msgstr "Preparing print job"
 

diff --git 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-07-22 18:39+0800\n"
+"POT-Creation-Date: 2022-07-23 18:15+0800\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -3403,7 +3403,9 @@ msgstr ""
 msgid "The printer is busy on other print job"
 msgstr "The printer is busy with another print job."
 
-msgid "Printer firmware does not support material = >ams slot mapping."
+msgid ""
+"The filament index exceeds the AMS's slot count and cannot send the print "
+"job."
 msgstr ""
 
 msgid ""
@@ -3420,6 +3422,11 @@ msgstr ""
 "Please click each filament above to specify its mapping AMS slot before "
 "sending the print job"
 
+msgid ""
+"The printer firmware only supports sequential mapping of filament => AMS "
+"slot."
+msgstr ""
+
 msgid "Preparing print job"
 msgstr "Preparing print job"
 

diff --git 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-07-22 18:39+0800\n"
+"POT-Creation-Date: 2022-07-23 18:15+0800\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -3438,7 +3438,9 @@ msgstr ""
 msgid "The printer is busy on other print job"
 msgstr "The printer is busy with another print job."
 
-msgid "Printer firmware does not support material = >ams slot mapping."
+msgid ""
+"The filament index exceeds the AMS's slot count and cannot send the print "
+"job."
 msgstr ""
 
 msgid ""
@@ -3455,6 +3457,11 @@ msgstr ""
 "Please click each filament above to specify its mapping AMS slot before "
 "sending the print job"
 
+msgid ""
+"The printer firmware only supports sequential mapping of filament => AMS "
+"slot."
+msgstr ""
+
 msgid "Preparing print job"
 msgstr "Preparing print job"
 

diff --git 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-07-22 18:39+0800\n"
+"POT-Creation-Date: 2022-07-23 18:15+0800\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -3369,7 +3369,9 @@ msgstr ""
 msgid "The printer is busy on other print job"
 msgstr "The printer is busy with another print job."
 
-msgid "Printer firmware does not support material = >ams slot mapping."
+msgid ""
+"The filament index exceeds the AMS's slot count and cannot send the print "
+"job."
 msgstr ""
 
 msgid ""
@@ -3386,6 +3388,11 @@ msgstr ""
 "Please click each filament above to specify its mapping AMS slot before "
 "sending the print job"
 
+msgid ""
+"The printer firmware only supports sequential mapping of filament => AMS "
+"slot."
+msgstr ""
+
 msgid "Preparing print job"
 msgstr "Preparing print job"
 
@@ -5890,8 +5897,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
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Slic3rPE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-07-22 18:39+0800\n"
+"POT-Creation-Date: 2022-07-23 18:15+0800\n"
 "PO-Revision-Date: 2022-07-22 13:28+0800\n"
 "Last-Translator: Jiang Yue <maze1024@gmail.com>\n"
 "Language-Team: \n"
@@ -1228,8 +1228,8 @@ msgid ""
 "Bambu Studio is based on PrusaSlicer by PrusaResearch and SuperSlicer by "
 "Merill(supermerill)."
 msgstr ""
-"Bambu Studio是以PrusaResearch的PrusaSlicer和Merill的SuperSlicer"
-"（supermerill）为基础的。"
+"Bambu Studio是以PrusaResearch的PrusaSlicer和Merill（supermerill）的"
+"SuperSlicer为基础的。"
 
 msgid "PrusaSlicer is originally based on Slic3r by Alessandro Ranellucci."
 msgstr "MerillPrusasicle最初是以Alessandro Ranellucci为基础的Slic3r。"
@@ -3309,8 +3309,12 @@ msgstr "打印机正在执行指令，请在其结束后重新发起打印"
 msgid "The printer is busy on other print job"
 msgstr "打印机正在执行其他打印任务"
 
-msgid "Printer firmware does not support material = >ams slot mapping."
-msgstr "打印机固件不支持材料=>AMS槽位映射"
+msgid ""
+"The filament index exceeds the AMS's slot count and cannot send the print "
+"job."
+msgstr ""
+"打印机固件仅支持材料=>AMS槽位的顺序映射。材料编号超过AMS的槽位数量，无法发送"
+"打印任务。"
 
 msgid ""
 "Filaments to AMS slots mappings have been established. You can click a "
@@ -3324,6 +3328,11 @@ msgid ""
 "sending the print job"
 msgstr "请在发送打印前点击上方各个耗材丝，指定其所对应的AMS槽位"
 
+msgid ""
+"The printer firmware only supports sequential mapping of filament => AMS "
+"slot."
+msgstr "打印机固件版本仅支持材料=>AMS槽位的顺序映射。"
+
 msgid "Preparing print job"
 msgstr "正在准备打印任务"
 
@@ -6048,6 +6057,9 @@ msgstr "支撑：正在修补层%d的空洞"
 msgid "Support: propagate branches at layer %d"
 msgstr "支撑：正在生长层%d的树枝"
 
+#~ msgid "Printer firmware does not support material = >ams slot mapping."
+#~ msgstr "打印机固件不支持材料=>AMS槽位映射"
+
 #~ msgid "Creating"
 #~ msgstr "正在创建"
 

diff --git a/resources/i18n/de/BambuStudio.mo b/resources/i18n/de/BambuStudio.mo
diff --git a/resources/i18n/en/BambuStudio.mo b/resources/i18n/en/BambuStudio.mo
diff --git a/resources/i18n/es/BambuStudio.mo b/resources/i18n/es/BambuStudio.mo
diff --git a/resources/i18n/fr/BambuStudio.mo b/resources/i18n/fr/BambuStudio.mo
diff --git a/resources/i18n/nl/BambuStudio.mo b/resources/i18n/nl/BambuStudio.mo
diff --git a/resources/i18n/sv/BambuStudio.mo b/resources/i18n/sv/BambuStudio.mo
diff --git a/resources/i18n/zh_cn/BambuStudio.mo b/resources/i18n/zh_cn/BambuStudio.mo
diff --git a/src/libslic3r/AppConfig.cpp b/src/libslic3r/AppConfig.cpp
@@ -993,6 +993,9 @@ void AppConfig::update_last_backup_dir(const std::string& dir)
 
 std::string AppConfig::get_region()
 {
+#if BBL_RELEASE_TO_PUBLIC
+    return this->get("region");
+#else
     std::string sel = get("iot_environment");
     std::string region;
     if (sel == ENV_DEV_HOST)
@@ -1004,12 +1007,15 @@ std::string AppConfig::get_region()
     if (region.empty())
         return this->get("region");
     return region;
+#endif
 }
 
 std::string AppConfig::get_country_code()
 {
     std::string region = get_region();
+#if !BBL_RELEASE_TO_PUBLIC
     if (is_engineering_region()) { return region; }
+#endif
     if (region == "CHN" || region == "China")
         return "CN";
     else if (region == "USA")