diff --git a/bbl/i18n/BambuStudio.pot b/bbl/i18n/BambuStudio.pot index 4b6405db2..7dd34b50f 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: 2024-04-23 10:24+0800\n" +"POT-Creation-Date: 2024-04-23 15:35+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1196,6 +1196,9 @@ msgstr "" msgid "Restore to meter" msgstr "" +msgid "Combinate" +msgstr "" + msgid "Assemble the selected objects to an object with multiple parts" msgstr "" diff --git a/bbl/i18n/cs/BambuStudio_cs.po b/bbl/i18n/cs/BambuStudio_cs.po index c275824b4..62b714f0c 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: 2024-04-23 10:24+0800\n" +"POT-Creation-Date: 2024-04-23 15:35+0800\n" "PO-Revision-Date: 2023-10-18 10:45+0800\n" "Last-Translator: René Mošner \n" "Language-Team: \n" @@ -1212,6 +1212,9 @@ msgstr "Převést z mm" msgid "Restore to meter" msgstr "Obnovit do mm" +msgid "Combinate" +msgstr "" + msgid "Assemble the selected objects to an object with multiple parts" msgstr "Sestavte vybrané objekty do objektu s více částmi" diff --git a/bbl/i18n/de/BambuStudio_de.po b/bbl/i18n/de/BambuStudio_de.po index 4ad79ad66..093114796 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: 2024-04-23 10:24+0800\n" +"POT-Creation-Date: 2024-04-23 15:35+0800\n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1217,6 +1217,9 @@ msgstr "Von Metern umrechnen" msgid "Restore to meter" msgstr "Auf Meter zurücksetzen" +msgid "Combinate" +msgstr "" + msgid "Assemble the selected objects to an object with multiple parts" msgstr "" "Die ausgewählten Objekte zu einem Objekt mit mehreren Teilen zusammenfügen" diff --git a/bbl/i18n/en/BambuStudio_en.po b/bbl/i18n/en/BambuStudio_en.po index ee4da3c99..60881732a 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: 2024-04-23 10:24+0800\n" +"POT-Creation-Date: 2024-04-23 15:35+0800\n" "Language: en\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1208,6 +1208,9 @@ msgstr "Convert from meter" msgid "Restore to meter" msgstr "Restore to meter" +msgid "Combinate" +msgstr "" + msgid "Assemble the selected objects to an object with multiple parts" msgstr "Assemble the selected objects into an object with multiple parts" diff --git a/bbl/i18n/es/BambuStudio_es.po b/bbl/i18n/es/BambuStudio_es.po index 03269aa7f..b7a7e4ebe 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: 2024-04-23 10:24+0800\n" +"POT-Creation-Date: 2024-04-23 15:35+0800\n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1220,6 +1220,9 @@ msgstr "Convertir desde metros" msgid "Restore to meter" msgstr "Restaurar a metros" +msgid "Combinate" +msgstr "" + msgid "Assemble the selected objects to an object with multiple parts" msgstr "Ensamblar los objetos seleccionados en un objeto con múltiples partes" diff --git a/bbl/i18n/fr/BambuStudio_fr.po b/bbl/i18n/fr/BambuStudio_fr.po index cc6145f5a..df906d28f 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: 2024-04-23 10:24+0800\n" +"POT-Creation-Date: 2024-04-23 15:35+0800\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: \n" @@ -1225,6 +1225,9 @@ msgstr "Convertir en mètre" msgid "Restore to meter" msgstr "Restaurer au compteur" +msgid "Combinate" +msgstr "" + msgid "Assemble the selected objects to an object with multiple parts" msgstr "Assembler les objets sélectionnés à un objet en plusieurs parties" diff --git a/bbl/i18n/hu/BambuStudio_hu.po b/bbl/i18n/hu/BambuStudio_hu.po index e1eb1dfb6..fa89a277c 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: 2024-04-23 10:24+0800\n" +"POT-Creation-Date: 2024-04-23 15:35+0800\n" "Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1216,6 +1216,9 @@ msgstr "Átváltás méterről" msgid "Restore to meter" msgstr "Visszaállítás méterre" +msgid "Combinate" +msgstr "" + msgid "Assemble the selected objects to an object with multiple parts" msgstr "Összeállítja a kijelölt objektumot egy több részből álló objektummá" diff --git a/bbl/i18n/it/BambuStudio_it.po b/bbl/i18n/it/BambuStudio_it.po index 6b8d6eb86..4d7d54e27 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: 2024-04-23 10:24+0800\n" +"POT-Creation-Date: 2024-04-23 15:35+0800\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1214,6 +1214,9 @@ msgstr "Converti da metri" msgid "Restore to meter" msgstr "Ripristina in metri" +msgid "Combinate" +msgstr "" + msgid "Assemble the selected objects to an object with multiple parts" msgstr "Assembla gli oggetti selezionati in un oggetto con più parti" diff --git a/bbl/i18n/ja/BambuStudio_ja.po b/bbl/i18n/ja/BambuStudio_ja.po index c77103705..8c64c5ac6 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: 2024-04-23 10:24+0800\n" +"POT-Creation-Date: 2024-04-23 15:35+0800\n" "Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1203,6 +1203,9 @@ msgstr "メートルから変換" msgid "Restore to meter" msgstr "メータル単位に復元" +msgid "Combinate" +msgstr "" + msgid "Assemble the selected objects to an object with multiple parts" msgstr "選択したオブジェクトを一つオブジェクトに組み立てます(複数パーツ)" diff --git a/bbl/i18n/ko/BambuStudio_ko.po b/bbl/i18n/ko/BambuStudio_ko.po index 987eb2037..8c7d38fe3 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: 2024-04-23 10:24+0800\n" +"POT-Creation-Date: 2024-04-23 15:35+0800\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: \n" @@ -1219,6 +1219,9 @@ msgstr "미터 단위 모델링 변환 (1000배)" msgid "Restore to meter" msgstr "미터 단위로 복원" +msgid "Combinate" +msgstr "" + msgid "Assemble the selected objects to an object with multiple parts" msgstr "선택한 객체들을 여러부품으로 이루어진 하나의 객채로 통합" diff --git a/bbl/i18n/nl/BambuStudio_nl.po b/bbl/i18n/nl/BambuStudio_nl.po index bc3c097dd..f97021ca6 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: 2024-04-23 10:24+0800\n" +"POT-Creation-Date: 2024-04-23 15:35+0800\n" "Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1213,6 +1213,9 @@ msgstr "Converteren vanuit meter" msgid "Restore to meter" msgstr "Terugzetten naar meter" +msgid "Combinate" +msgstr "" + msgid "Assemble the selected objects to an object with multiple parts" msgstr "" "Monteer de geselecteerde objecten tot een object bestaande uit meerdere delen" diff --git a/bbl/i18n/pt-BR/BambuStudio_pt-BR.po b/bbl/i18n/pt-BR/BambuStudio_pt-BR.po index 7375c3262..01175469b 100644 --- a/bbl/i18n/pt-BR/BambuStudio_pt-BR.po +++ b/bbl/i18n/pt-BR/BambuStudio_pt-BR.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Bambu Studio\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-23 10:24+0800\n" +"POT-Creation-Date: 2024-04-23 15:35+0800\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: \n" @@ -1227,6 +1227,9 @@ msgstr "Converter a partir do medidor" msgid "Restore to meter" msgstr "Restaurar para o medidor" +msgid "Combinate" +msgstr "" + msgid "Assemble the selected objects to an object with multiple parts" msgstr "Montar os objetos selecionados em um objeto com várias peças" diff --git a/bbl/i18n/ru/BambuStudio_ru.po b/bbl/i18n/ru/BambuStudio_ru.po index 50d8df3a9..0c1fc6e3f 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.9.0.70 Public Beta 3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-23 10:24+0800\n" +"POT-Creation-Date: 2024-04-23 15:35+0800\n" "PO-Revision-Date: 2024-04-18 20:55+0700\n" "Last-Translator: Andylg \n" "Language-Team: \n" @@ -1245,6 +1245,9 @@ msgstr "Преобразовать размеры из метров" msgid "Restore to meter" msgstr "Восстановить размеры в метры" +msgid "Combinate" +msgstr "" + msgid "Assemble the selected objects to an object with multiple parts" msgstr "" "Объединение выбранных объектов в модель, состоящую из несколько частей." diff --git a/bbl/i18n/sv/BambuStudio_sv.po b/bbl/i18n/sv/BambuStudio_sv.po index c9930b66e..d26cb12f3 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: 2024-04-23 10:24+0800\n" +"POT-Creation-Date: 2024-04-23 15:35+0800\n" "Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1210,6 +1210,9 @@ msgstr "Konvertera ifrån meter" msgid "Restore to meter" msgstr "Återställ till meter" +msgid "Combinate" +msgstr "" + msgid "Assemble the selected objects to an object with multiple parts" msgstr "Montera de valda objekten till ett objekt med multipla delar" diff --git a/bbl/i18n/tr/BambuStudio_tr.po b/bbl/i18n/tr/BambuStudio_tr.po index ea7ca8b43..502646d10 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: 2024-04-23 10:24+0800\n" +"POT-Creation-Date: 2024-04-23 15:35+0800\n" "PO-Revision-Date: 2024-04-16 18:18+0300\n" "Last-Translator: Fatih AYDIN \n" "Language-Team: \n" @@ -1229,6 +1229,9 @@ msgstr "Metreden dönüştür" msgid "Restore to meter" msgstr "Metreye geri çevir" +msgid "Combinate" +msgstr "" + msgid "Assemble the selected objects to an object with multiple parts" msgstr "Seçilen nesneleri birden çok parçalı bir nesneyle birleştirin" diff --git a/bbl/i18n/uk/BambuStudio_uk.po b/bbl/i18n/uk/BambuStudio_uk.po index edbbffb8c..b4650f2d3 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: 2024-04-23 10:24+0800\n" +"POT-Creation-Date: 2024-04-23 15:35+0800\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: BambuLab Україна\n" @@ -1224,6 +1224,9 @@ msgstr "Перетворити з метричної" msgid "Restore to meter" msgstr "Відновити в метричну" +msgid "Combinate" +msgstr "" + msgid "Assemble the selected objects to an object with multiple parts" msgstr "Зберіть вибрані об'єкти в об'єкт з кількома частинами" diff --git a/bbl/i18n/zh_cn/BambuStudio_zh_CN.po b/bbl/i18n/zh_cn/BambuStudio_zh_CN.po index a7cd26c9e..ffb371a17 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: 2024-04-23 10:24+0800\n" +"POT-Creation-Date: 2024-04-23 15:35+0800\n" "PO-Revision-Date: 2024-02-23 20:10+0800\n" "Last-Translator: Jiang Yue \n" "Language-Team: \n" @@ -1211,6 +1211,9 @@ msgstr "从米转换" msgid "Restore to meter" msgstr "恢复到米" +msgid "Combinate" +msgstr "组合" + msgid "Assemble the selected objects to an object with multiple parts" msgstr "组合所选对象为一个多零件对象" diff --git a/resources/i18n/zh_cn/BambuStudio.mo b/resources/i18n/zh_cn/BambuStudio.mo index 298075085..4f56cce6b 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/GUI_Factories.cpp b/src/slic3r/GUI/GUI_Factories.cpp index d4777b16c..41ae5a377 100644 --- a/src/slic3r/GUI/GUI_Factories.cpp +++ b/src/slic3r/GUI/GUI_Factories.cpp @@ -948,7 +948,7 @@ void MenuFactory::append_menu_items_convert_unit(wxMenu* menu) void MenuFactory::append_menu_item_merge_to_multipart_object(wxMenu* menu) { - append_menu_item(menu, wxID_ANY, _L("Assemble"), _L("Assemble the selected objects to an object with multiple parts"), + append_menu_item(menu, wxID_ANY, _L("Combinate"), _L("Assemble the selected objects to an object with multiple parts"), [](wxCommandEvent&) { obj_list()->merge(true); }, "", menu, []() { return obj_list()->can_merge_to_multipart_object(); }, m_parent); } @@ -956,7 +956,7 @@ void MenuFactory::append_menu_item_merge_to_multipart_object(wxMenu* menu) void MenuFactory::append_menu_item_merge_to_single_object(wxMenu* menu) { menu->AppendSeparator(); - append_menu_item(menu, wxID_ANY, _L("Assemble"), _L("Assemble the selected objects to an object with single part"), + append_menu_item(menu, wxID_ANY, _L("Combinate"), _L("Assemble the selected objects to an object with single part"), [](wxCommandEvent&) { obj_list()->merge(false); }, "", menu, []() { return obj_list()->can_merge_to_single_object(); }, m_parent); }