ENH: sync with localazy and fix compile error

Change-Id: I7cae72f24c2fde61e0c1e99c89c21801b7d10125
Signed-off-by: Stone Li <stone.li@bambulab.com>
This commit is contained in:
Stone Li 2023-02-10 09:35:31 +08:00 committed by Lane.Wei
parent ecd8418640
commit 6122f5010a
24 changed files with 12418 additions and 6080 deletions

View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -379,10 +379,10 @@ msgstr ""
msgid "Input text" msgid "Input text"
msgstr "" msgstr ""
msgid "Add" msgid "Modify"
msgstr "" msgstr ""
msgid "Modify" msgid "Add"
msgstr "" msgstr ""
msgid "Notice" msgid "Notice"
@ -1138,6 +1138,9 @@ msgstr ""
msgid "No printer" msgid "No printer"
msgstr "" msgstr ""
msgid "..."
msgstr ""
msgid "Heat the nozzle" msgid "Heat the nozzle"
msgstr "" msgstr ""
@ -1352,6 +1355,9 @@ msgstr ""
msgid "Send to Printer failed. Please try again." msgid "Send to Printer failed. Please try again."
msgstr "" msgstr ""
msgid "No space left on Printer SD card"
msgstr ""
msgid "Sending gcode file over LAN" msgid "Sending gcode file over LAN"
msgstr "" msgstr ""
@ -1518,13 +1524,13 @@ msgstr ""
msgid "Max volumetric speed" msgid "Max volumetric speed"
msgstr "" msgstr ""
msgid "" msgid "\\u2103"
msgstr "" msgstr ""
msgid "Bed temperature" msgid "Bed temperature"
msgstr "" msgstr ""
msgid "mm³" msgid "mm\\u00B3"
msgstr "" msgstr ""
msgid "Start calibration" msgid "Start calibration"
@ -2206,6 +2212,12 @@ msgstr ""
msgid "Volumetric flow rate (mm³/s)" msgid "Volumetric flow rate (mm³/s)"
msgstr "" msgstr ""
msgid "Layer Time (s)"
msgstr ""
msgid "Layer Time (log) (s)"
msgstr ""
msgid "Used filament" msgid "Used filament"
msgstr "" msgstr ""
@ -2836,6 +2848,14 @@ msgstr ""
msgid "&Help" msgid "&Help"
msgstr "" 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" msgid "Overwrite file"
msgstr "" msgstr ""
@ -3293,6 +3313,9 @@ msgstr ""
msgid "Open Folder." msgid "Open Folder."
msgstr "" msgstr ""
msgid "Safely remove hardware."
msgstr ""
#, possible-c-format, possible-boost-format #, possible-c-format, possible-boost-format
msgid "%1$d Object has custom supports." msgid "%1$d Object has custom supports."
msgid_plural "%1$d Objects have custom supports." msgid_plural "%1$d Objects have custom supports."
@ -3838,7 +3861,10 @@ msgid ""
msgstr "" msgstr ""
#, possible-c-format, possible-boost-format #, 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 "" msgstr ""
msgid "Switching the language requires application restart.\n" msgid "Switching the language requires application restart.\n"
@ -4186,6 +4212,9 @@ msgstr ""
msgid "Offline" msgid "Offline"
msgstr "" msgstr ""
msgid "(LAN)"
msgstr ""
msgid "My Device" msgid "My Device"
msgstr "" msgstr ""
@ -4340,6 +4369,9 @@ msgstr ""
msgid "Cannot send the print task when the upgrade is in progress" msgid "Cannot send the print task when the upgrade is in progress"
msgstr "" 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." msgid "The printer is required to be in the same LAN as Bambu Studio."
msgstr "" msgstr ""
@ -6154,6 +6186,9 @@ msgstr ""
msgid "Minimal purge on wipe tower" msgid "Minimal purge on wipe tower"
msgstr "" msgstr ""
msgid "mm³"
msgstr ""
msgid "Filament load time" msgid "Filament load time"
msgstr "" msgstr ""
@ -6823,6 +6858,12 @@ msgstr ""
msgid "Distance from skirt to brim or object" msgid "Distance from skirt to brim or object"
msgstr "" msgstr ""
msgid "Skirt height"
msgstr ""
msgid "How many layers of skirt. Usually only one layer"
msgstr ""
msgid "Skirt loops" msgid "Skirt loops"
msgstr "" msgstr ""
@ -7483,6 +7524,11 @@ msgstr ""
msgid "Slicing mesh" msgid "Slicing mesh"
msgstr "" 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 #, possible-c-format, possible-boost-format
msgid "Support: generate toolpath at layer %d" msgid "Support: generate toolpath at layer %d"
msgstr "" msgstr ""

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

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

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -323,15 +323,6 @@ std::string MachineObject::get_access_code()
return get_user_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) void MachineObject::set_user_access_code(std::string code)
{ {
this->user_access_code = code; this->user_access_code = code;

View File

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

View File

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