ENH: sync with localazy and fix compile error

Change-Id: I7cae72f24c2fde61e0c1e99c89c21801b7d10125
Signed-off-by: Stone Li <stone.li@bambulab.com>

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-01-29 16:37+0800\n"
+"POT-Creation-Date: 2023-02-10 09:51+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"
@@ -379,10 +379,10 @@ msgstr ""
 msgid "Input text"
 msgstr ""
 
-msgid "Add"
+msgid "Modify"
 msgstr ""
 
-msgid "Modify"
+msgid "Add"
 msgstr ""
 
 msgid "Notice"
@@ -1138,6 +1138,9 @@ msgstr ""
 msgid "No printer"
 msgstr ""
 
+msgid "..."
+msgstr ""
+
 msgid "Heat the nozzle"
 msgstr ""
 
@@ -1352,6 +1355,9 @@ msgstr ""
 msgid "Send to Printer failed. Please try again."
 msgstr ""
 
+msgid "No space left on Printer SD card"
+msgstr ""
+
 msgid "Sending gcode file over LAN"
 msgstr ""
 
@@ -1518,13 +1524,13 @@ msgstr ""
 msgid "Max volumetric speed"
 msgstr ""
 
-msgid "℃"
+msgid "\\u2103"
 msgstr ""
 
 msgid "Bed temperature"
 msgstr ""
 
-msgid "mm³"
+msgid "mm\\u00B3"
 msgstr ""
 
 msgid "Start calibration"
@@ -2206,6 +2212,12 @@ msgstr ""
 msgid "Volumetric flow rate (mm³/s)"
 msgstr ""
 
+msgid "Layer Time (s)"
+msgstr ""
+
+msgid "Layer Time (log) (s)"
+msgstr ""
+
 msgid "Used filament"
 msgstr ""
 
@@ -2836,6 +2848,14 @@ msgstr ""
 msgid "&Help"
 msgstr ""
 
+#, possible-c-format, possible-boost-format
+msgid "A file exists with the same name: %s, do you want to override it."
+msgstr ""
+
+#, possible-c-format, possible-boost-format
+msgid "A config exists with the same name: %s, do you want to override it."
+msgstr ""
+
 msgid "Overwrite file"
 msgstr ""
 
@@ -3293,6 +3313,9 @@ msgstr ""
 msgid "Open Folder."
 msgstr ""
 
+msgid "Safely remove hardware."
+msgstr ""
+
 #, possible-c-format, possible-boost-format
 msgid "%1$d Object has custom supports."
 msgid_plural "%1$d Objects have custom supports."
@@ -3838,7 +3861,10 @@ msgid ""
 msgstr ""
 
 #, possible-c-format, possible-boost-format
-msgid "Plate %d: %s does not support filament %s (%s)."
+msgid ""
+"Plate% d: %s is not suggested to be used to print filament %s(%s). If you "
+"still want to do this printing, please set this filament's bed temperature "
+"to non zero."
 msgstr ""
 
 msgid "Switching the language requires application restart.\n"
@@ -4186,6 +4212,9 @@ msgstr ""
 msgid "Offline"
 msgstr ""
 
+msgid "(LAN)"
+msgstr ""
+
 msgid "My Device"
 msgstr ""
 
@@ -4340,6 +4369,9 @@ msgstr ""
 msgid "Cannot send the print task when the upgrade is in progress"
 msgstr ""
 
+msgid "An SD card needs to be inserted before send to printer SD card."
+msgstr ""
+
 msgid "The printer is required to be in the same LAN as Bambu Studio."
 msgstr ""
 
@@ -6154,6 +6186,9 @@ msgstr ""
 msgid "Minimal purge on wipe tower"
 msgstr ""
 
+msgid "mm³"
+msgstr ""
+
 msgid "Filament load time"
 msgstr ""
 
@@ -6823,6 +6858,12 @@ msgstr ""
 msgid "Distance from skirt to brim or object"
 msgstr ""
 
+msgid "Skirt height"
+msgstr ""
+
+msgid "How many layers of skirt. Usually only one layer"
+msgstr ""
+
 msgid "Skirt loops"
 msgstr ""
 
@@ -7483,6 +7524,11 @@ msgstr ""
 msgid "Slicing mesh"
 msgstr ""
 
+msgid ""
+"No layers were detected. You might want to repair your STL file(s) or check "
+"their size or thickness and retry.\n"
+msgstr ""
+
 #, possible-c-format, possible-boost-format
 msgid "Support: generate toolpath at layer %d"
 msgstr ""

bbl/i18n/zh_cn/BambuStudio_zh_CN.po

@@ -1,12 +1,12 @@
 # Copyright (C) 2019 THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST Translator Jiang Yue <maze1024@gmail.com>, 2019.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: Slic3rPE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-01-29 16:37+0800\n"
+"POT-Creation-Date: 2023-02-10 09:51+0800\n"
 "PO-Revision-Date: 2023-01-12 14:46+0800\n"
 "Last-Translator: Jiang Yue <maze1024@gmail.com>\n"
 "Language-Team: \n"
@@ -379,12 +379,12 @@ msgstr "厚度"
 msgid "Input text"
 msgstr "输入文本"
 
-msgid "Add"
-msgstr "添加"
-
 msgid "Modify"
 msgstr "修改"
 
+msgid "Add"
+msgstr "添加"
+
 msgid "Notice"
 msgstr "通知"
 
@@ -1138,6 +1138,9 @@ msgstr ""
 msgid "No printer"
 msgstr "无打印机"
 
+msgid "..."
+msgstr ""
+
 msgid "Heat the nozzle"
 msgstr "加热喷嘴"
 
@@ -1360,6 +1363,9 @@ msgstr "无法发送打印任务，请重试。"
 msgid "Send to Printer failed. Please try again."
 msgstr "发送到打印机失败。请重试。"
 
+msgid "No space left on Printer SD card"
+msgstr ""
+
 msgid "Sending gcode file over LAN"
 msgstr "通过局域网发送gcode文件"
 
@@ -1534,14 +1540,14 @@ msgstr "热床类型"
 msgid "Max volumetric speed"
 msgstr "最大体积速度"
 
-msgid "℃"
+msgid "\\u2103"
 msgstr ""
 
 msgid "Bed temperature"
 msgstr "床温"
 
-msgid "mm³"
+msgid "mm\\u00B3"
-msgstr "mm³"
+msgstr ""
 
 msgid "Start calibration"
 msgstr "开始"
@@ -2284,6 +2290,12 @@ msgstr "温度（℃）"
 msgid "Volumetric flow rate (mm³/s)"
 msgstr "体积流量速度（mm³/s）"
 
+msgid "Layer Time (s)"
+msgstr ""
+
+msgid "Layer Time (log) (s)"
+msgstr ""
+
 msgid "Used filament"
 msgstr "使用的耗材丝"
 
@@ -2921,6 +2933,14 @@ msgstr ""
 msgid "&Help"
 msgstr ""
 
+#, c-format, boost-format
+msgid "A file exists with the same name: %s, do you want to override it."
+msgstr ""
+
+#, c-format, boost-format
+msgid "A config exists with the same name: %s, do you want to override it."
+msgstr ""
+
 msgid "Overwrite file"
 msgstr "覆盖文件"
 
@@ -3388,6 +3408,9 @@ msgstr "前往下载网站。"
 msgid "Open Folder."
 msgstr "打开目录。"
 
+msgid "Safely remove hardware."
+msgstr ""
+
 #, c-format, boost-format
 msgid "%1$d Object has custom supports."
 msgid_plural "%1$d Objects have custom supports."
@@ -3945,8 +3968,11 @@ msgstr ""
 "模型。"
 
 #, c-format, boost-format
-msgid "Plate %d: %s does not support filament %s (%s)."
+msgid ""
-msgstr "盘%d：%s不支持耗材丝%s（%s）。"
+"Plate% d: %s is not suggested to be used to print filament %s(%s). If you "
+"still want to do this printing, please set this filament's bed temperature "
+"to non zero."
+msgstr ""
 
 msgid "Switching the language requires application restart.\n"
 msgstr "切换语言要求重启应用程序。\n"
@@ -4293,6 +4319,9 @@ msgstr "在线"
 msgid "Offline"
 msgstr "离线"
 
+msgid "(LAN)"
+msgstr ""
+
 msgid "My Device"
 msgstr "我的设备"
 
@@ -4458,6 +4487,9 @@ msgstr "发送到打印机的SD卡"
 msgid "Cannot send the print task when the upgrade is in progress"
 msgstr "设备升级中，无法发送打印任务"
 
+msgid "An SD card needs to be inserted before send to printer SD card."
+msgstr ""
+
 msgid "The printer is required to be in the same LAN as Bambu Studio."
 msgstr "打印机需要与Bambu Studio在同一个局域网内。"
 
@@ -6345,6 +6377,9 @@ msgstr "mm³/s"
 msgid "Minimal purge on wipe tower"
 msgstr "擦拭塔上的最小清理量"
 
+msgid "mm³"
+msgstr "mm³"
+
 msgid "Filament load time"
 msgstr "加载耗材丝的时间"
 
@@ -7033,6 +7068,12 @@ msgstr "Skirt距离"
 msgid "Distance from skirt to brim or object"
 msgstr "从skirt到模型或者brim的距离"
 
+msgid "Skirt height"
+msgstr "Skirt高度"
+
+msgid "How many layers of skirt. Usually only one layer"
+msgstr "skirt有多少层。通常只有一层"
+
 msgid "Skirt loops"
 msgstr "Skirt圈数"
 
@@ -7757,6 +7798,11 @@ msgstr "模型有太多空层。"
 msgid "Slicing mesh"
 msgstr "正在切片网格"
 
+msgid ""
+"No layers were detected. You might want to repair your STL file(s) or check "
+"their size or thickness and retry.\n"
+msgstr ""
+
 #, c-format, boost-format
 msgid "Support: generate toolpath at layer %d"
 msgstr "支撑：正在生成层%d的走线路径"
@@ -8033,6 +8079,9 @@ msgstr ""
 "提高强度\n"
 "你知道吗？你可以使用更多的墙层数和更高的疏散填充密度来提高模型的强度。"
 
+#~ msgid "Plate %d: %s does not support filament %s (%s)."
+#~ msgstr "盘%d：%s不支持耗材丝%s（%s）。"
+
 #~ msgid "NO AMS"
 #~ msgstr "无AMS"
 
@@ -10864,12 +10913,6 @@ msgstr ""
 #~ msgid "Extra length on restart"
 #~ msgstr "启动时额外长度"
 
-#~ msgid "Skirt height"
-#~ msgstr "Skirt高度"
-
-#~ msgid "How many layers of skirt. Usually only one layer"
-#~ msgstr "skirt有多少层。通常只有一层"
-
 #~ msgid "Disabled"
 #~ msgstr "关闭"
 

src/slic3r/GUI/DeviceManager.cpp

@@ -323,15 +323,6 @@ std::string MachineObject::get_access_code()
     return get_user_access_code();
 }
 
-void MachineObject::set_access_code(std::string code)
-{
-    this->access_code = code;
-    AppConfig* config = GUI::wxGetApp().app_config;
-    if (config && !code.empty()) {
-        GUI::wxGetApp().app_config->set_str("access_code", dev_id, code);
-    }
-}
-
 void MachineObject::set_user_access_code(std::string code)
 {
     this->user_access_code = code;

src/slic3r/GUI/DeviceManager.hpp

@@ -409,7 +409,6 @@ public:
     void set_access_code(std::string code);
     std::string get_access_code();
 
-    void set_access_code(std::string code);
     void set_user_access_code(std::string code);
 
     std::string get_user_access_code();

src/slic3r/GUI/Jobs/PrintJob.cpp

@@ -106,6 +106,8 @@ void PrintJob::process()
     /* display info */
     wxString msg;
     int curr_percent = 10;
+    NetworkAgent* m_agent = wxGetApp().getAgent();
+    AppConfig* config = wxGetApp().app_config;
 
     if (this->connection_type == "lan") {
         msg = _L("Sending print job over LAN");
@@ -291,9 +293,6 @@ void PrintJob::process()
             return was_canceled();
         };
 
-
-    NetworkAgent* m_agent = wxGetApp().getAgent();
-
     if (params.connection_type != "lan") {
         if (params.dev_ip.empty())
             params.comments = "no_ip";