diff --git a/bbl/i18n/BambuStudio.pot b/bbl/i18n/BambuStudio.pot index 44385f663..c690687f1 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: 2025-02-14 12:33+0800\n" +"POT-Creation-Date: 2025-02-14 15:27+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -8121,13 +8121,13 @@ msgid "" "list." msgstr "" -msgid "Advanced settings >" +msgid "Advanced settings" msgstr "" msgid "Unused AMS filaments should also be added to the filament list." msgstr "" -msgid "Automatically merge the same colors in the model after mapping." +msgid "Merge all identical filaments." msgstr "" msgid "After being synced, this action cannot be undone." diff --git a/bbl/i18n/cs/BambuStudio_cs.po b/bbl/i18n/cs/BambuStudio_cs.po index 44881cb4c..ee2f9a624 100644 --- a/bbl/i18n/cs/BambuStudio_cs.po +++ b/bbl/i18n/cs/BambuStudio_cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-02-14 12:33+0800\n" +"POT-Creation-Date: 2025-02-14 15:27+0800\n" "PO-Revision-Date: 2023-10-18 10:45+0800\n" "Last-Translator: René Mošner \n" "Language-Team: \n" @@ -8425,13 +8425,13 @@ msgid "" "list." msgstr "" -msgid "Advanced settings >" +msgid "Advanced settings" msgstr "" msgid "Unused AMS filaments should also be added to the filament list." msgstr "" -msgid "Automatically merge the same colors in the model after mapping." +msgid "Merge all identical filaments." msgstr "" msgid "After being synced, this action cannot be undone." diff --git a/bbl/i18n/de/BambuStudio_de.po b/bbl/i18n/de/BambuStudio_de.po index 810ca55e3..02556f828 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: 2025-02-14 12:33+0800\n" +"POT-Creation-Date: 2025-02-14 15:27+0800\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: \n" @@ -8733,13 +8733,13 @@ msgid "" "list." msgstr "" -msgid "Advanced settings >" +msgid "Advanced settings" msgstr "" msgid "Unused AMS filaments should also be added to the filament list." msgstr "" -msgid "Automatically merge the same colors in the model after mapping." +msgid "Merge all identical filaments." msgstr "" msgid "After being synced, this action cannot be undone." diff --git a/bbl/i18n/en/BambuStudio_en.po b/bbl/i18n/en/BambuStudio_en.po index 55ecae291..f1aa286ef 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: 2025-02-14 12:33+0800\n" +"POT-Creation-Date: 2025-02-14 15:27+0800\n" "Language: en\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -8558,13 +8558,13 @@ msgid "" "list." msgstr "" -msgid "Advanced settings >" +msgid "Advanced settings" msgstr "" msgid "Unused AMS filaments should also be added to the filament list." msgstr "" -msgid "Automatically merge the same colors in the model after mapping." +msgid "Merge all identical filaments." msgstr "" msgid "After being synced, this action cannot be undone." diff --git a/bbl/i18n/es/BambuStudio_es.po b/bbl/i18n/es/BambuStudio_es.po index 02aab4b7f..4c4528fad 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: 2025-02-14 12:33+0800\n" +"POT-Creation-Date: 2025-02-14 15:27+0800\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: \n" @@ -8700,13 +8700,13 @@ msgid "" "list." msgstr "" -msgid "Advanced settings >" +msgid "Advanced settings" msgstr "" msgid "Unused AMS filaments should also be added to the filament list." msgstr "" -msgid "Automatically merge the same colors in the model after mapping." +msgid "Merge all identical filaments." msgstr "" msgid "After being synced, this action cannot be undone." diff --git a/bbl/i18n/fr/BambuStudio_fr.po b/bbl/i18n/fr/BambuStudio_fr.po index dfbd28023..6af9104fb 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: 2025-02-14 12:33+0800\n" +"POT-Creation-Date: 2025-02-14 15:27+0800\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: \n" @@ -8729,13 +8729,13 @@ msgid "" "list." msgstr "" -msgid "Advanced settings >" +msgid "Advanced settings" msgstr "" msgid "Unused AMS filaments should also be added to the filament list." msgstr "" -msgid "Automatically merge the same colors in the model after mapping." +msgid "Merge all identical filaments." msgstr "" msgid "After being synced, this action cannot be undone." diff --git a/bbl/i18n/hu/BambuStudio_hu.po b/bbl/i18n/hu/BambuStudio_hu.po index 9fa04dba5..946c43df1 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: 2025-02-14 12:33+0800\n" +"POT-Creation-Date: 2025-02-14 15:27+0800\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: \n" @@ -8640,13 +8640,13 @@ msgid "" "list." msgstr "" -msgid "Advanced settings >" +msgid "Advanced settings" msgstr "" msgid "Unused AMS filaments should also be added to the filament list." msgstr "" -msgid "Automatically merge the same colors in the model after mapping." +msgid "Merge all identical filaments." msgstr "" msgid "After being synced, this action cannot be undone." diff --git a/bbl/i18n/it/BambuStudio_it.po b/bbl/i18n/it/BambuStudio_it.po index f84439b3b..cc2e615d3 100644 --- a/bbl/i18n/it/BambuStudio_it.po +++ b/bbl/i18n/it/BambuStudio_it.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Bambu Studio\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-02-14 12:33+0800\n" +"POT-Creation-Date: 2025-02-14 15:27+0800\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: \n" @@ -8656,13 +8656,13 @@ msgid "" "list." msgstr "" -msgid "Advanced settings >" +msgid "Advanced settings" msgstr "" msgid "Unused AMS filaments should also be added to the filament list." msgstr "" -msgid "Automatically merge the same colors in the model after mapping." +msgid "Merge all identical filaments." msgstr "" msgid "After being synced, this action cannot be undone." diff --git a/bbl/i18n/ja/BambuStudio_ja.po b/bbl/i18n/ja/BambuStudio_ja.po index 1bd0e6a1c..7fc4137d0 100644 --- a/bbl/i18n/ja/BambuStudio_ja.po +++ b/bbl/i18n/ja/BambuStudio_ja.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Bambu Studio\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-02-14 12:33+0800\n" +"POT-Creation-Date: 2025-02-14 15:27+0800\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: \n" @@ -8470,13 +8470,13 @@ msgid "" "list." msgstr "" -msgid "Advanced settings >" +msgid "Advanced settings" msgstr "" msgid "Unused AMS filaments should also be added to the filament list." msgstr "" -msgid "Automatically merge the same colors in the model after mapping." +msgid "Merge all identical filaments." msgstr "" msgid "After being synced, this action cannot be undone." diff --git a/bbl/i18n/ko/BambuStudio_ko.po b/bbl/i18n/ko/BambuStudio_ko.po index 513547475..7871f44ab 100644 --- a/bbl/i18n/ko/BambuStudio_ko.po +++ b/bbl/i18n/ko/BambuStudio_ko.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Bambu Studio\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-02-14 12:33+0800\n" +"POT-Creation-Date: 2025-02-14 15:27+0800\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: \n" @@ -8485,13 +8485,13 @@ msgid "" "list." msgstr "" -msgid "Advanced settings >" +msgid "Advanced settings" msgstr "" msgid "Unused AMS filaments should also be added to the filament list." msgstr "" -msgid "Automatically merge the same colors in the model after mapping." +msgid "Merge all identical filaments." msgstr "" msgid "After being synced, this action cannot be undone." diff --git a/bbl/i18n/nl/BambuStudio_nl.po b/bbl/i18n/nl/BambuStudio_nl.po index ed872adc2..68f5dc493 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: 2025-02-14 12:33+0800\n" +"POT-Creation-Date: 2025-02-14 15:27+0800\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: \n" @@ -8701,13 +8701,13 @@ msgid "" "list." msgstr "" -msgid "Advanced settings >" +msgid "Advanced settings" msgstr "" msgid "Unused AMS filaments should also be added to the filament list." msgstr "" -msgid "Automatically merge the same colors in the model after mapping." +msgid "Merge all identical filaments." msgstr "" msgid "After being synced, this action cannot be undone." diff --git a/bbl/i18n/pl/BambuStudio_pl.po b/bbl/i18n/pl/BambuStudio_pl.po index 09a530ef4..1cee9543e 100644 --- a/bbl/i18n/pl/BambuStudio_pl.po +++ b/bbl/i18n/pl/BambuStudio_pl.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Bambu Studio\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-02-14 12:33+0800\n" +"POT-Creation-Date: 2025-02-14 15:27+0800\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: \n" @@ -8668,13 +8668,13 @@ msgid "" "list." msgstr "" -msgid "Advanced settings >" +msgid "Advanced settings" msgstr "" msgid "Unused AMS filaments should also be added to the filament list." msgstr "" -msgid "Automatically merge the same colors in the model after mapping." +msgid "Merge all identical filaments." msgstr "" msgid "After being synced, this action cannot be undone." diff --git a/bbl/i18n/pt-BR/BambuStudio_pt-BR.po b/bbl/i18n/pt-BR/BambuStudio_pt-BR.po index 072ee3798..a63b24ba3 100644 --- a/bbl/i18n/pt-BR/BambuStudio_pt-BR.po +++ b/bbl/i18n/pt-BR/BambuStudio_pt-BR.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Bambu Studio\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-02-14 12:33+0800\n" +"POT-Creation-Date: 2025-02-14 15:27+0800\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: \n" @@ -8647,13 +8647,13 @@ msgid "" "list." msgstr "" -msgid "Advanced settings >" +msgid "Advanced settings" msgstr "" msgid "Unused AMS filaments should also be added to the filament list." msgstr "" -msgid "Automatically merge the same colors in the model after mapping." +msgid "Merge all identical filaments." msgstr "" msgid "After being synced, this action cannot be undone." diff --git a/bbl/i18n/ru/BambuStudio_ru.po b/bbl/i18n/ru/BambuStudio_ru.po index ce79e40f2..8c6990780 100644 --- a/bbl/i18n/ru/BambuStudio_ru.po +++ b/bbl/i18n/ru/BambuStudio_ru.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Bambu Studio 1.10.1 Public Release\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-02-14 12:33+0800\n" +"POT-Creation-Date: 2025-02-14 15:27+0800\n" "PO-Revision-Date: 2024-09-27 23:58+0700\n" "Last-Translator: \n" "Language-Team: Andylg \n" @@ -8887,13 +8887,13 @@ msgid "" "list." msgstr "" -msgid "Advanced settings >" +msgid "Advanced settings" msgstr "" msgid "Unused AMS filaments should also be added to the filament list." msgstr "" -msgid "Automatically merge the same colors in the model after mapping." +msgid "Merge all identical filaments." msgstr "" msgid "After being synced, this action cannot be undone." diff --git a/bbl/i18n/sv/BambuStudio_sv.po b/bbl/i18n/sv/BambuStudio_sv.po index 7a3493129..170f3aa4e 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: 2025-02-14 12:33+0800\n" +"POT-Creation-Date: 2025-02-14 15:27+0800\n" "Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -8598,13 +8598,13 @@ msgid "" "list." msgstr "" -msgid "Advanced settings >" +msgid "Advanced settings" msgstr "" msgid "Unused AMS filaments should also be added to the filament list." msgstr "" -msgid "Automatically merge the same colors in the model after mapping." +msgid "Merge all identical filaments." msgstr "" msgid "After being synced, this action cannot be undone." diff --git a/bbl/i18n/tr/BambuStudio_tr.po b/bbl/i18n/tr/BambuStudio_tr.po index c3ab04843..ebe1d4211 100644 --- a/bbl/i18n/tr/BambuStudio_tr.po +++ b/bbl/i18n/tr/BambuStudio_tr.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-02-14 12:33+0800\n" +"POT-Creation-Date: 2025-02-14 15:27+0800\n" "PO-Revision-Date: 2025-01-12 21:04+0300\n" "Last-Translator: Fatih AYDIN \n" "Language-Team: \n" @@ -8706,13 +8706,13 @@ msgid "" "list." msgstr "" -msgid "Advanced settings >" +msgid "Advanced settings" msgstr "" msgid "Unused AMS filaments should also be added to the filament list." msgstr "" -msgid "Automatically merge the same colors in the model after mapping." +msgid "Merge all identical filaments." msgstr "" msgid "After being synced, this action cannot be undone." diff --git a/bbl/i18n/uk/BambuStudio_uk.po b/bbl/i18n/uk/BambuStudio_uk.po index 431ae98fc..b2328cb75 100644 --- a/bbl/i18n/uk/BambuStudio_uk.po +++ b/bbl/i18n/uk/BambuStudio_uk.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Bambu Studio\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-02-14 12:33+0800\n" +"POT-Creation-Date: 2025-02-14 15:27+0800\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: BambuLab Україна\n" @@ -8712,13 +8712,13 @@ msgid "" "list." msgstr "" -msgid "Advanced settings >" +msgid "Advanced settings" msgstr "" msgid "Unused AMS filaments should also be added to the filament list." msgstr "" -msgid "Automatically merge the same colors in the model after mapping." +msgid "Merge all identical filaments." msgstr "" msgid "After being synced, this action cannot be undone." diff --git a/bbl/i18n/zh_cn/BambuStudio_zh_CN.po b/bbl/i18n/zh_cn/BambuStudio_zh_CN.po index d75130d0d..7c8886712 100644 --- 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: 2025-02-14 12:33+0800\n" +"POT-Creation-Date: 2025-02-14 15:27+0800\n" "PO-Revision-Date: 2025-01-08 20:27+0800\n" "Last-Translator: Jiang Yue \n" "Language-Team: \n" @@ -8412,14 +8412,14 @@ msgstr "" "使用打印机内的耗材,依次替换项目耗材列表。未使用的打印机耗材将自动添加至列表" "末尾。" -msgid "Advanced settings >" -msgstr "高级设置 >" +msgid "Advanced settings" +msgstr "" msgid "Unused AMS filaments should also be added to the filament list." msgstr "未使用的AMS耗材也添加到耗材列表。" -msgid "Automatically merge the same colors in the model after mapping." -msgstr "匹配后自动合并模型中的相同颜色。" +msgid "Merge all identical filaments." +msgstr "合并完全相同的耗材" msgid "After being synced, this action cannot be undone." msgstr "同步后,此操作不可撤销。" @@ -10654,8 +10654,7 @@ msgstr "填充移动步长" msgid "" "This parameter adds a slight displacement to each layer of infill to create " "a cross texture." -msgstr "" -"这个参数给每层填充添加轻微平移以塑造交错花纹。" +msgstr "这个参数给每层填充添加轻微平移以塑造交错花纹。" msgid "Infill rotate step" msgstr "填充旋转步长" @@ -10663,8 +10662,7 @@ msgstr "填充旋转步长" msgid "" "This parameter adds a slight rotation to each layer of infill to create a " "cross texture." -msgstr "" -"这个参数给每层填充添加轻微旋转以塑造交错花纹。" +msgstr "这个参数给每层填充添加轻微旋转以塑造交错花纹。" msgid "Length of sparse infill anchor" msgstr "稀疏填充铆线长度" @@ -14641,6 +14639,12 @@ msgstr "" "避免翘曲\n" "您知道吗?打印ABS这类易翘曲材料时,适当提高热床温度可以降低翘曲的概率。" +#~ msgid "Advanced settings >" +#~ msgstr "高级设置 >" + +#~ msgid "Automatically merge the same colors in the model after mapping." +#~ msgstr "匹配后自动合并模型中的相同颜色。" + #~ msgid "Smoothing wall speed in z direction(experimental)" #~ msgstr "平滑z方向外墙速度(实验)" diff --git a/resources/i18n/zh_cn/BambuStudio.mo b/resources/i18n/zh_cn/BambuStudio.mo index 9e20904f8..7dd0ae188 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/SyncAmsInfoDialog.cpp b/src/slic3r/GUI/SyncAmsInfoDialog.cpp index b8ab2ff92..026d9fb2b 100644 --- a/src/slic3r/GUI/SyncAmsInfoDialog.cpp +++ b/src/slic3r/GUI/SyncAmsInfoDialog.cpp @@ -1297,7 +1297,7 @@ SyncAmsInfoDialog::SyncAmsInfoDialog(wxWindow *parent, SyncInfo &info) : m_merge_color_checkbox->Hide(); m_merge_color_sizer->Add(m_merge_color_checkbox, 0, wxALIGN_LEFT | wxTOP, FromDIP(2)); - m_merge_color_text = new wxStaticText(this, wxID_ANY, _L("Automatically merge the same colors in the model after mapping.")); + m_merge_color_text = new wxStaticText(this, wxID_ANY, _L("Merge all identical filaments.")); m_merge_color_text->Hide(); m_merge_color_sizer->AddSpacer(FromDIP(gap_between_checebox_and_text)); m_merge_color_sizer->Add(m_merge_color_text, 0, wxALIGN_LEFT | wxTOP, FromDIP(2));