From 453c00542327173940285a0f0213b21af7fec3cf Mon Sep 17 00:00:00 2001 From: tao wang Date: Fri, 21 Oct 2022 14:35:18 +0800 Subject: [PATCH] FIX:update chinese translation Change-Id: I254c0617a9ee5e43aa1388b06788f332f0094a40 --- bbl/i18n/BambuStudio.pot | 32 +++++++++++--- bbl/i18n/de/BambuStudio_de.po | 32 +++++++++++--- bbl/i18n/en/BambuStudio_en.po | 32 +++++++++++--- bbl/i18n/es/BambuStudio_es.po | 32 +++++++++++--- bbl/i18n/fr/BambuStudio_fr.po | 32 +++++++++++--- bbl/i18n/hu/BambuStudio_hu.po | 32 +++++++++++--- bbl/i18n/list.txt | 1 + bbl/i18n/nl/BambuStudio_nl.po | 32 +++++++++++--- bbl/i18n/sv/BambuStudio_sv.po | 32 +++++++++++--- bbl/i18n/zh_cn/BambuStudio_zh_CN.po | 67 +++++++++++++++++++---------- src/slic3r/GUI/Jobs/SendJob.cpp | 2 +- src/slic3r/GUI/UpgradePanel.cpp | 16 +++---- 12 files changed, 270 insertions(+), 72 deletions(-) diff --git a/bbl/i18n/BambuStudio.pot b/bbl/i18n/BambuStudio.pot index 89314b327f..ab9ccabe20 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-11-05 12:18+0800\n" +"POT-Creation-Date: 2022-10-21 14:33+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1283,6 +1283,22 @@ msgstr "" msgid "An SD card needs to be inserted before printing via LAN." msgstr "" +msgid "Sending gcode file over LAN" +msgstr "" + +msgid "Sending gcode file through cloud service" +msgstr "" + +msgid "Sending gcode file to sdcard" +msgstr "" + +#, possible-c-format, possible-boost-format +msgid "Successfully sent. Close current page in %s s" +msgstr "" + +msgid "An SD card needs to be inserted before sending to printer." +msgstr "" + msgid "Downloading" msgstr "" @@ -4529,7 +4545,7 @@ msgstr "" msgid "Version:" msgstr "" -msgid "Upgrade firmware" +msgid "Update firmware" msgstr "" msgid "Printing" @@ -4541,13 +4557,13 @@ msgstr "" msgid "Latest version" msgstr "" -msgid "Upgrading" +msgid "Updating" msgstr "" -msgid "Upgrading failed" +msgid "Updating failed" msgstr "" -msgid "Upgrading successful" +msgid "Updating successful" msgstr "" msgid "" @@ -4926,6 +4942,12 @@ msgid "" "polygon by points in following format: \"XxY, XxY, ...\"" msgstr "" +msgid "Bed custom texture" +msgstr "" + +msgid "Bed custom model" +msgstr "" + msgid "Elephant foot compensation" msgstr "" diff --git a/bbl/i18n/de/BambuStudio_de.po b/bbl/i18n/de/BambuStudio_de.po index cda86a0ea0..073ae72e50 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-11-05 12:18+0800\n" +"POT-Creation-Date: 2022-10-21 14:33+0800\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: \n" @@ -1348,6 +1348,22 @@ msgstr "" msgid "An SD card needs to be inserted before printing via LAN." msgstr "" +msgid "Sending gcode file over LAN" +msgstr "" + +msgid "Sending gcode file through cloud service" +msgstr "" + +msgid "Sending gcode file to sdcard" +msgstr "" + +#, c-format, boost-format +msgid "Successfully sent. Close current page in %s s" +msgstr "" + +msgid "An SD card needs to be inserted before sending to printer." +msgstr "" + msgid "Downloading" msgstr "" @@ -4802,7 +4818,7 @@ msgstr "" msgid "Version:" msgstr "" -msgid "Upgrade firmware" +msgid "Update firmware" msgstr "" msgid "Printing" @@ -4814,13 +4830,13 @@ msgstr "" msgid "Latest version" msgstr "" -msgid "Upgrading" +msgid "Updating" msgstr "" -msgid "Upgrading failed" +msgid "Updating failed" msgstr "" -msgid "Upgrading successful" +msgid "Updating successful" msgstr "" msgid "" @@ -5235,6 +5251,12 @@ msgid "" "polygon by points in following format: \"XxY, XxY, ...\"" msgstr "" +msgid "Bed custom texture" +msgstr "" + +msgid "Bed custom model" +msgstr "" + msgid "Elephant foot compensation" msgstr "Elefantenfußkompensation" diff --git a/bbl/i18n/en/BambuStudio_en.po b/bbl/i18n/en/BambuStudio_en.po index 92851f2ea0..782878db9f 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-11-05 12:18+0800\n" +"POT-Creation-Date: 2022-10-21 14:33+0800\n" "Language: en\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1316,6 +1316,22 @@ msgstr "" msgid "An SD card needs to be inserted before printing via LAN." msgstr "" +msgid "Sending gcode file over LAN" +msgstr "" + +msgid "Sending gcode file through cloud service" +msgstr "" + +msgid "Sending gcode file to sdcard" +msgstr "" + +#, c-format, boost-format +msgid "Successfully sent. Close current page in %s s" +msgstr "" + +msgid "An SD card needs to be inserted before sending to printer." +msgstr "" + msgid "Downloading" msgstr "" @@ -4713,7 +4729,7 @@ msgstr "" msgid "Version:" msgstr "" -msgid "Upgrade firmware" +msgid "Update firmware" msgstr "" msgid "Printing" @@ -4725,13 +4741,13 @@ msgstr "" msgid "Latest version" msgstr "" -msgid "Upgrading" +msgid "Updating" msgstr "" -msgid "Upgrading failed" +msgid "Updating failed" msgstr "" -msgid "Upgrading successful" +msgid "Updating successful" msgstr "" msgid "" @@ -5132,6 +5148,12 @@ msgid "" "polygon by points in following format: \"XxY, XxY, ...\"" msgstr "" +msgid "Bed custom texture" +msgstr "" + +msgid "Bed custom model" +msgstr "" + msgid "Elephant foot compensation" msgstr "Elephant foot compensation" diff --git a/bbl/i18n/es/BambuStudio_es.po b/bbl/i18n/es/BambuStudio_es.po index 4c3c66ca0f..def0683274 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-11-05 12:18+0800\n" +"POT-Creation-Date: 2022-10-21 14:33+0800\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: \n" @@ -1345,6 +1345,22 @@ msgstr "" msgid "An SD card needs to be inserted before printing via LAN." msgstr "" +msgid "Sending gcode file over LAN" +msgstr "" + +msgid "Sending gcode file through cloud service" +msgstr "" + +msgid "Sending gcode file to sdcard" +msgstr "" + +#, c-format, boost-format +msgid "Successfully sent. Close current page in %s s" +msgstr "" + +msgid "An SD card needs to be inserted before sending to printer." +msgstr "" + msgid "Downloading" msgstr "" @@ -4792,7 +4808,7 @@ msgstr "" msgid "Version:" msgstr "" -msgid "Upgrade firmware" +msgid "Update firmware" msgstr "" msgid "Printing" @@ -4804,13 +4820,13 @@ msgstr "" msgid "Latest version" msgstr "" -msgid "Upgrading" +msgid "Updating" msgstr "" -msgid "Upgrading failed" +msgid "Updating failed" msgstr "" -msgid "Upgrading successful" +msgid "Updating successful" msgstr "" msgid "" @@ -5224,6 +5240,12 @@ msgid "" "polygon by points in following format: \"XxY, XxY, ...\"" msgstr "" +msgid "Bed custom texture" +msgstr "" + +msgid "Bed custom model" +msgstr "" + msgid "Elephant foot compensation" msgstr "Compensación del pie de elefante" diff --git a/bbl/i18n/fr/BambuStudio_fr.po b/bbl/i18n/fr/BambuStudio_fr.po index 4987c8704c..287beb2ec5 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-11-05 12:18+0800\n" +"POT-Creation-Date: 2022-10-21 14:33+0800\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: \n" @@ -1339,6 +1339,22 @@ msgstr "" msgid "An SD card needs to be inserted before printing via LAN." msgstr "" +msgid "Sending gcode file over LAN" +msgstr "" + +msgid "Sending gcode file through cloud service" +msgstr "" + +msgid "Sending gcode file to sdcard" +msgstr "" + +#, c-format, boost-format +msgid "Successfully sent. Close current page in %s s" +msgstr "" + +msgid "An SD card needs to be inserted before sending to printer." +msgstr "" + msgid "Downloading" msgstr "Downloading" @@ -4771,7 +4787,7 @@ msgstr "" msgid "Version:" msgstr "" -msgid "Upgrade firmware" +msgid "Update firmware" msgstr "" msgid "Printing" @@ -4783,13 +4799,13 @@ msgstr "" msgid "Latest version" msgstr "" -msgid "Upgrading" +msgid "Updating" msgstr "" -msgid "Upgrading failed" +msgid "Updating failed" msgstr "" -msgid "Upgrading successful" +msgid "Updating successful" msgstr "" msgid "" @@ -5205,6 +5221,12 @@ msgid "" "polygon by points in following format: \"XxY, XxY, ...\"" msgstr "" +msgid "Bed custom texture" +msgstr "" + +msgid "Bed custom model" +msgstr "" + msgid "Elephant foot compensation" msgstr "Compensation de pied d'éléphant" diff --git a/bbl/i18n/hu/BambuStudio_hu.po b/bbl/i18n/hu/BambuStudio_hu.po index d74cee127b..97eb906bf2 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: 2022-11-05 12:18+0800\n" +"POT-Creation-Date: 2022-10-21 14:33+0800\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: \n" @@ -1341,6 +1341,22 @@ msgstr "" msgid "An SD card needs to be inserted before printing via LAN." msgstr "A LAN-on keresztüli nyomtatáshoz helyezz be egy SD kártyát." +msgid "Sending gcode file over LAN" +msgstr "" + +msgid "Sending gcode file through cloud service" +msgstr "" + +msgid "Sending gcode file to sdcard" +msgstr "" + +#, c-format, boost-format +msgid "Successfully sent. Close current page in %s s" +msgstr "" + +msgid "An SD card needs to be inserted before sending to printer." +msgstr "" + msgid "Downloading" msgstr "Letöltés" @@ -4770,7 +4786,7 @@ msgstr "" msgid "Version:" msgstr "" -msgid "Upgrade firmware" +msgid "Update firmware" msgstr "" msgid "Printing" @@ -4782,13 +4798,13 @@ msgstr "" msgid "Latest version" msgstr "" -msgid "Upgrading" +msgid "Updating" msgstr "" -msgid "Upgrading failed" +msgid "Updating failed" msgstr "" -msgid "Upgrading successful" +msgid "Updating successful" msgstr "" msgid "" @@ -5196,6 +5212,12 @@ msgid "" "polygon by points in following format: \"XxY, XxY, ...\"" msgstr "" +msgid "Bed custom texture" +msgstr "" + +msgid "Bed custom model" +msgstr "" + msgid "Elephant foot compensation" msgstr "Elefántláb kompenzáció" diff --git a/bbl/i18n/list.txt b/bbl/i18n/list.txt index 36aebc444a..e4ab44b6a6 100644 --- a/bbl/i18n/list.txt +++ b/bbl/i18n/list.txt @@ -38,6 +38,7 @@ src/slic3r/GUI/Jobs/PlaterJob.cpp src/slic3r/GUI/Jobs/RotoptimizeJob.cpp src/slic3r/GUI/Jobs/BindJob.cpp src/slic3r/GUI/Jobs/PrintJob.cpp +src/slic3r/GUI/Jobs/SendJob.cpp src/slic3r/GUI/Jobs/UpgradeNetworkJob.cpp src/slic3r/GUI/AboutDialog.cpp src/slic3r/GUI/AMSMaterialsSetting.cpp diff --git a/bbl/i18n/nl/BambuStudio_nl.po b/bbl/i18n/nl/BambuStudio_nl.po index 6d6c0f7f05..dc42e01c86 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-11-05 12:18+0800\n" +"POT-Creation-Date: 2022-10-21 14:33+0800\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: \n" @@ -1346,6 +1346,22 @@ msgstr "" msgid "An SD card needs to be inserted before printing via LAN." msgstr "" +msgid "Sending gcode file over LAN" +msgstr "" + +msgid "Sending gcode file through cloud service" +msgstr "" + +msgid "Sending gcode file to sdcard" +msgstr "" + +#, c-format, boost-format +msgid "Successfully sent. Close current page in %s s" +msgstr "" + +msgid "An SD card needs to be inserted before sending to printer." +msgstr "" + msgid "Downloading" msgstr "Downloaden" @@ -4799,7 +4815,7 @@ msgstr "" msgid "Version:" msgstr "" -msgid "Upgrade firmware" +msgid "Update firmware" msgstr "" msgid "Printing" @@ -4811,13 +4827,13 @@ msgstr "" msgid "Latest version" msgstr "" -msgid "Upgrading" +msgid "Updating" msgstr "" -msgid "Upgrading failed" +msgid "Updating failed" msgstr "" -msgid "Upgrading successful" +msgid "Updating successful" msgstr "" msgid "" @@ -5230,6 +5246,12 @@ msgid "" "polygon by points in following format: \"XxY, XxY, ...\"" msgstr "" +msgid "Bed custom texture" +msgstr "" + +msgid "Bed custom model" +msgstr "" + msgid "Elephant foot compensation" msgstr "\"Elephant foot\" compensatie" diff --git a/bbl/i18n/sv/BambuStudio_sv.po b/bbl/i18n/sv/BambuStudio_sv.po index e5bc351984..27a4c78041 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-11-05 12:18+0800\n" +"POT-Creation-Date: 2022-10-21 14:33+0800\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: \n" @@ -1328,6 +1328,22 @@ msgstr "" msgid "An SD card needs to be inserted before printing via LAN." msgstr "" +msgid "Sending gcode file over LAN" +msgstr "" + +msgid "Sending gcode file through cloud service" +msgstr "" + +msgid "Sending gcode file to sdcard" +msgstr "" + +#, c-format, boost-format +msgid "Successfully sent. Close current page in %s s" +msgstr "" + +msgid "An SD card needs to be inserted before sending to printer." +msgstr "" + msgid "Downloading" msgstr "Laddar ner" @@ -4721,7 +4737,7 @@ msgstr "" msgid "Version:" msgstr "" -msgid "Upgrade firmware" +msgid "Update firmware" msgstr "" msgid "Printing" @@ -4733,13 +4749,13 @@ msgstr "" msgid "Latest version" msgstr "" -msgid "Upgrading" +msgid "Updating" msgstr "" -msgid "Upgrading failed" +msgid "Updating failed" msgstr "" -msgid "Upgrading successful" +msgid "Updating successful" msgstr "" msgid "" @@ -5137,6 +5153,12 @@ msgid "" "polygon by points in following format: \"XxY, XxY, ...\"" msgstr "" +msgid "Bed custom texture" +msgstr "" + +msgid "Bed custom model" +msgstr "" + msgid "Elephant foot compensation" msgstr "Elefant fots kompensation" diff --git a/bbl/i18n/zh_cn/BambuStudio_zh_CN.po b/bbl/i18n/zh_cn/BambuStudio_zh_CN.po index 64a564cc88..96bd1bcaee 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-11-05 12:18+0800\n" -"PO-Revision-Date: 2022-11-05 12:10+0800\n" +"POT-Creation-Date: 2022-10-21 14:33+0800\n" +"PO-Revision-Date: 2022-10-17 22:14+0800\n" "Last-Translator: Jiang Yue \n" "Language-Team: \n" "Language: zh_CN\n" @@ -1291,6 +1291,22 @@ msgstr "已发送完成，即将自动跳转到设备页面（%s秒）" msgid "An SD card needs to be inserted before printing via LAN." msgstr "需要插入SD卡后方可发送局域网打印" +msgid "Sending gcode file over LAN" +msgstr "通过局域网发送gcode文件" + +msgid "Sending gcode file through cloud service" +msgstr "通过云服务发送gcode文件" + +msgid "Sending gcode file to sdcard" +msgstr "发送gcode文件到sd卡" + +#, c-format, boost-format +msgid "Successfully sent. Close current page in %s s" +msgstr "成功发送。即将关闭当前页面（%s秒）" + +msgid "An SD card needs to be inserted before sending to printer." +msgstr "需要插入SD卡后方可发送到打印机。" + msgid "Downloading" msgstr "下载中" @@ -4640,8 +4656,8 @@ msgstr "序列号：" msgid "Version:" msgstr "版本：" -msgid "Upgrade firmware" -msgstr "升级固件" +msgid "Update firmware" +msgstr "" msgid "Printing" msgstr "打印中" @@ -4652,14 +4668,14 @@ msgstr "空闲" msgid "Latest version" msgstr "最新版本" -msgid "Upgrading" -msgstr "升级中" +msgid "Updating" +msgstr "更新中" -msgid "Upgrading failed" -msgstr "升级失败" +msgid "Updating failed" +msgstr "更新失败" -msgid "Upgrading successful" -msgstr "升级成功" +msgid "Updating successful" +msgstr "更新成功" msgid "" "Are you sure you want to update? This will take about 10 minutes. Do not " @@ -5046,6 +5062,12 @@ msgstr "" "XY平面上的不可打印区域。例如，X1系列打印机在换料过程中，会使用左前角区域来切" "断耗材丝。这个多边形区域由以下格式的点表示：“XxY，XxY，…”" +msgid "Bed custom texture" +msgstr "" + +msgid "Bed custom model" +msgstr "" + msgid "Elephant foot compensation" msgstr "象脚补偿" @@ -7088,25 +7110,24 @@ msgstr "" "为多个对象设置参数\n" "您知道可以同时为所有选定对象设置切片参数吗？" -#~ msgid "Print By Object" -#~ msgstr "逐件打印" - -#~ msgid "Suggest to use auto-arrange to avoid collisions when printing." -#~ msgstr "建议您使用自动摆盘避免打印时发生碰撞。" - -#~ msgid "" -#~ "Print By Object\n" -#~ "Suggest to use auto-arrange to avoid collisions when printing." -#~ msgstr "" -#~ "逐件打印：\n" -#~ "建议使用自动摆盘避免打印时发生碰撞。" - #~ msgid "Send and Print" #~ msgstr "发送并打印" #~ msgid "Can't connect to the printer" #~ msgstr "无法连接打印机" +#~ msgid "Upgrade firmware" +#~ msgstr "升级固件" + +#~ msgid "Upgrading" +#~ msgstr "升级中" + +#~ msgid "Upgrading failed" +#~ msgstr "升级失败" + +#~ msgid "Upgrading successful" +#~ msgstr "升级成功" + #~ msgid "Show &Wireframe" #~ msgstr "显示线框" diff --git a/src/slic3r/GUI/Jobs/SendJob.cpp b/src/slic3r/GUI/Jobs/SendJob.cpp index 5d4cbc040b..40c5fe9a3b 100644 --- a/src/slic3r/GUI/Jobs/SendJob.cpp +++ b/src/slic3r/GUI/Jobs/SendJob.cpp @@ -253,7 +253,7 @@ void SendJob::process() this->update_status(curr_percent, _L("Sending gcode file over LAN")); result = m_agent->start_send_gcode_to_sdcard(params, update_fn, cancel_fn); } else { - this->update_status(curr_percent, _L("An SD card needs to be inserted before printing via LAN.")); + this->update_status(curr_percent, _L("An SD card needs to be inserted before sending to printer.")); return; } } diff --git a/src/slic3r/GUI/UpgradePanel.cpp b/src/slic3r/GUI/UpgradePanel.cpp index b226edd174..618651c533 100644 --- a/src/slic3r/GUI/UpgradePanel.cpp +++ b/src/slic3r/GUI/UpgradePanel.cpp @@ -142,7 +142,7 @@ MachineInfoPanel::MachineInfoPanel(wxWindow* parent, wxWindowID id, const wxPoin m_main_right_sizer->Add(0, FromDIP(50), 0, wxEXPAND, FromDIP(5)); - m_button_upgrade_firmware = new Button(this, _L("Upgrade firmware")); + m_button_upgrade_firmware = new Button(this, _L("Update firmware")); StateColor btn_bg(std::pair(wxColour(255, 255, 255), StateColor::Disabled), std::pair(wxColour(27, 136, 68), StateColor::Pressed), std::pair(wxColour(61, 203, 115), StateColor::Hovered), std::pair(wxColour(0, 174, 66), StateColor::Enabled), std::pair(wxColour(0, 174, 66), StateColor::Normal)); @@ -603,13 +603,13 @@ void MachineInfoPanel::show_status(int status, std::string upgrade_status_str) for (size_t i = 0; i < m_upgrading_sizer->GetItemCount(); i++) { m_upgrading_sizer->Show(true); } m_upgrade_retry_img->Hide(); m_staticText_upgrading_info->Show(); - m_staticText_upgrading_info->SetLabel(_L("Upgrading")); + m_staticText_upgrading_info->SetLabel(_L("Updating")); m_staticText_upgrading_info->SetForegroundColour(TEXT_NORMAL_CLR); m_staticText_upgrading_percent->SetForegroundColour(TEXT_NORMAL_CLR); m_staticText_upgrading_percent->Show(); } else if (status == (int) MachineObject::UpgradingDisplayState::UpgradingFinished) { if (upgrade_status_str == "UPGRADE_FAIL") { - m_staticText_upgrading_info->SetLabel(_L("Upgrading failed")); + m_staticText_upgrading_info->SetLabel(_L("Updating failed")); m_staticText_upgrading_info->SetForegroundColour(TEXT_FAILED_CLR); for (size_t i = 0; i < m_upgrading_sizer->GetItemCount(); i++) { m_upgrading_sizer->Show(true); } m_button_upgrade_firmware->Disable(); @@ -617,7 +617,7 @@ void MachineInfoPanel::show_status(int status, std::string upgrade_status_str) m_staticText_upgrading_percent->Show(); m_upgrade_retry_img->Show(); } else { - m_staticText_upgrading_info->SetLabel(_L("Upgrading successful")); + m_staticText_upgrading_info->SetLabel(_L("Updating successful")); m_staticText_upgrading_info->Show(); for (size_t i = 0; i < m_upgrading_sizer->GetItemCount(); i++) { m_upgrading_sizer->Show(true); } m_button_upgrade_firmware->Disable(); @@ -659,7 +659,7 @@ void MachineInfoPanel::upgrade_firmware_internal() { void MachineInfoPanel::on_upgrade_firmware(wxCommandEvent &event) { - SecondaryCheckDialog* confirm_dlg = new SecondaryCheckDialog(this->GetParent(), wxID_ANY, _L("Upgrade firmware")); + SecondaryCheckDialog* confirm_dlg = new SecondaryCheckDialog(this->GetParent(), wxID_ANY, _L("Update firmware")); confirm_dlg->update_text(_L("Are you sure you want to update? This will take about 10 minutes. Do not turn off the power while the printer is updating.")); confirm_dlg->Bind(EVT_SECONDARY_CHECK_CONFIRM, [this](wxCommandEvent &e) { if (m_obj) { @@ -673,7 +673,7 @@ void MachineInfoPanel::on_upgrade_firmware(wxCommandEvent &event) void MachineInfoPanel::on_consisitency_upgrade_firmware(wxCommandEvent &event) { - SecondaryCheckDialog* confirm_dlg = new SecondaryCheckDialog(this->GetParent(), wxID_ANY, _L("Upgrade firmware")); + SecondaryCheckDialog* confirm_dlg = new SecondaryCheckDialog(this->GetParent(), wxID_ANY, _L("Update firmware")); confirm_dlg->update_text(_L("Are you sure you want to update? This will take about 10 minutes. Do not turn off the power while the printer is updating.")); confirm_dlg->Bind(EVT_SECONDARY_CHECK_CONFIRM, [this](wxCommandEvent &e) { if (m_obj) { @@ -797,7 +797,7 @@ void UpgradePanel::update(MachineObject *obj) if (m_obj && m_show_forced_hint) { if (m_obj->upgrade_force_upgrade) { m_show_forced_hint = false; //lock hint - SecondaryCheckDialog* force_dlg = new SecondaryCheckDialog(m_scrolledWindow, wxID_ANY, _L("Upgrade firmware")); + SecondaryCheckDialog* force_dlg = new SecondaryCheckDialog(m_scrolledWindow, wxID_ANY, _L("Update firmware")); force_dlg->update_text(_L( "An important update was detected and needs to be run before printing can continue. Do you want to update now? You can also update later from 'Upgrade firmware'." )); @@ -816,7 +816,7 @@ void UpgradePanel::update(MachineObject *obj) if (m_obj && m_show_consistency_hint) { if (m_obj->upgrade_consistency_request) { m_show_consistency_hint = false; - SecondaryCheckDialog* consistency_dlg = new SecondaryCheckDialog(m_scrolledWindow, wxID_ANY, _L("Upgrade firmware")); + SecondaryCheckDialog* consistency_dlg = new SecondaryCheckDialog(m_scrolledWindow, wxID_ANY, _L("Update firmware")); consistency_dlg->update_text(_L( "The firmware version is abnormal. Repairing and updating are required before printing. Do you want to update now? You can also update later on printer or update next time starting the studio." ));