diff --git a/bbl/i18n/BambuStudio.pot b/bbl/i18n/BambuStudio.pot index 619594638..4b6405db2 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-22 16:06+0800\n" +"POT-Creation-Date: 2024-04-23 10:24+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -628,11 +628,42 @@ msgstr "" msgid "Selection" msgstr "" +msgid " (Moving)" +msgstr "" + +msgid "" +"Select 2 faces on objects and \n" +" make objects assemble together." +msgstr "" + +msgid "" +"Select 2 points or circles on objects and \n" +" specify distance between them." +msgstr "" + +msgid "Face" +msgstr "" + +msgid " (Fixed)" +msgstr "" + +msgid "Point" +msgstr "" + msgid "" "Feature 1 has been reset, \n" "feature 2 has been feature 1" msgstr "" +msgid "Warning:please select Plane's feature." +msgstr "" + +msgid "Warning:please select Point's or Circle's feature." +msgstr "" + +msgid "Warning:please select two different mesh." +msgstr "" + msgid "Copy to clipboard" msgstr "" @@ -669,7 +700,22 @@ msgstr "" msgid "Parallel_distance:" msgstr "" -msgid "Featue 2" +msgid "Flip by Face 2" +msgstr "" + +msgid "Assemble" +msgstr "" + +msgid "Please confirm explosion ratio = 1 and select at least two volumes." +msgstr "" + +msgid "Please select at least two volumes." +msgstr "" + +msgid "(Moving)" +msgstr "" + +msgid "Point and point assembly" msgstr "" msgid "" @@ -678,6 +724,9 @@ msgid "" " It is recommended to assemble them together." msgstr "" +msgid "Face and face assembly" +msgstr "" + msgid "Brush size" msgstr "" @@ -1147,9 +1196,6 @@ msgstr "" msgid "Restore to meter" msgstr "" -msgid "Assemble" -msgstr "" - msgid "Assemble the selected objects to an object with multiple parts" msgstr "" @@ -6559,6 +6605,56 @@ msgstr "" msgid "The configuration is up to date." msgstr "" +msgid "Obj file Import color" +msgstr "" + +msgid "Specify number of colors:" +msgstr "" + +#, possible-c-format, possible-boost-format +msgid "The color count should be in range [%d, %d]." +msgstr "" + +msgid "Recommended " +msgstr "" + +msgid "Current filament colors:" +msgstr "" + +msgid "Quick set:" +msgstr "" + +msgid "Color match" +msgstr "" + +msgid "Approximate color matching." +msgstr "" + +msgid "Append" +msgstr "" + +msgid "Add consumable extruder after existing extruders." +msgstr "" + +msgid "Reset mapped extruders." +msgstr "" + +msgid "Cluster colors" +msgstr "" + +msgid "Map Filament" +msgstr "" + +msgid "" +"Note:The color has been selected, you can choose OK \n" +" to continue or manually adjust it." +msgstr "" + +msgid "" +"Waring:The count of newly added and \n" +" current extruders exceeds 16." +msgstr "" + msgid "Auto-Calc" msgstr "" diff --git a/bbl/i18n/cs/BambuStudio_cs.po b/bbl/i18n/cs/BambuStudio_cs.po index 83a95dab5..c275824b4 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-22 16:06+0800\n" +"POT-Creation-Date: 2024-04-23 10:24+0800\n" "PO-Revision-Date: 2023-10-18 10:45+0800\n" "Last-Translator: René Mošner \n" "Language-Team: \n" @@ -634,11 +634,42 @@ msgstr "Vzdálenost" msgid "Selection" msgstr "" +msgid " (Moving)" +msgstr "" + +msgid "" +"Select 2 faces on objects and \n" +" make objects assemble together." +msgstr "" + +msgid "" +"Select 2 points or circles on objects and \n" +" specify distance between them." +msgstr "" + +msgid "Face" +msgstr "" + +msgid " (Fixed)" +msgstr "" + +msgid "Point" +msgstr "" + msgid "" "Feature 1 has been reset, \n" "feature 2 has been feature 1" msgstr "" +msgid "Warning:please select Plane's feature." +msgstr "" + +msgid "Warning:please select Point's or Circle's feature." +msgstr "" + +msgid "Warning:please select two different mesh." +msgstr "" + msgid "Copy to clipboard" msgstr "Kopírovat do schránky" @@ -675,7 +706,22 @@ msgstr "" msgid "Parallel_distance:" msgstr "" -msgid "Featue 2" +msgid "Flip by Face 2" +msgstr "" + +msgid "Assemble" +msgstr "Sestavit" + +msgid "Please confirm explosion ratio = 1 and select at least two volumes." +msgstr "" + +msgid "Please select at least two volumes." +msgstr "" + +msgid "(Moving)" +msgstr "" + +msgid "Point and point assembly" msgstr "" msgid "" @@ -684,6 +730,9 @@ msgid "" " It is recommended to assemble them together." msgstr "" +msgid "Face and face assembly" +msgstr "" + msgid "Brush size" msgstr "Velikost štětce" @@ -1163,9 +1212,6 @@ msgstr "Převést z mm" msgid "Restore to meter" msgstr "Obnovit do mm" -msgid "Assemble" -msgstr "Sestavit" - msgid "Assemble the selected objects to an object with multiple parts" msgstr "Sestavte vybrané objekty do objektu s více částmi" @@ -6890,6 +6936,56 @@ msgstr "Žádné aktualizace nejsou dostupné." msgid "The configuration is up to date." msgstr "Konfigurace je aktuální." +msgid "Obj file Import color" +msgstr "" + +msgid "Specify number of colors:" +msgstr "" + +#, c-format, boost-format +msgid "The color count should be in range [%d, %d]." +msgstr "" + +msgid "Recommended " +msgstr "" + +msgid "Current filament colors:" +msgstr "" + +msgid "Quick set:" +msgstr "" + +msgid "Color match" +msgstr "" + +msgid "Approximate color matching." +msgstr "" + +msgid "Append" +msgstr "" + +msgid "Add consumable extruder after existing extruders." +msgstr "" + +msgid "Reset mapped extruders." +msgstr "" + +msgid "Cluster colors" +msgstr "" + +msgid "Map Filament" +msgstr "" + +msgid "" +"Note:The color has been selected, you can choose OK \n" +" to continue or manually adjust it." +msgstr "" + +msgid "" +"Waring:The count of newly added and \n" +" current extruders exceeds 16." +msgstr "" + msgid "Auto-Calc" msgstr "Automatický výpočet" diff --git a/bbl/i18n/de/BambuStudio_de.po b/bbl/i18n/de/BambuStudio_de.po index 5eeabc0ac..4ad79ad66 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-22 16:06+0800\n" +"POT-Creation-Date: 2024-04-23 10:24+0800\n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -630,11 +630,42 @@ msgstr "Länge" msgid "Selection" msgstr "" +msgid " (Moving)" +msgstr "" + +msgid "" +"Select 2 faces on objects and \n" +" make objects assemble together." +msgstr "" + +msgid "" +"Select 2 points or circles on objects and \n" +" specify distance between them." +msgstr "" + +msgid "Face" +msgstr "" + +msgid " (Fixed)" +msgstr "" + +msgid "Point" +msgstr "" + msgid "" "Feature 1 has been reset, \n" "feature 2 has been feature 1" msgstr "" +msgid "Warning:please select Plane's feature." +msgstr "" + +msgid "Warning:please select Point's or Circle's feature." +msgstr "" + +msgid "Warning:please select two different mesh." +msgstr "" + msgid "Copy to clipboard" msgstr "In Zwischenablage kopieren" @@ -671,7 +702,22 @@ msgstr "" msgid "Parallel_distance:" msgstr "" -msgid "Featue 2" +msgid "Flip by Face 2" +msgstr "" + +msgid "Assemble" +msgstr "Zusammenbauen" + +msgid "Please confirm explosion ratio = 1 and select at least two volumes." +msgstr "" + +msgid "Please select at least two volumes." +msgstr "" + +msgid "(Moving)" +msgstr "" + +msgid "Point and point assembly" msgstr "" msgid "" @@ -680,6 +726,9 @@ msgid "" " It is recommended to assemble them together." msgstr "" +msgid "Face and face assembly" +msgstr "" + msgid "Brush size" msgstr "Pinselgröße" @@ -1168,9 +1217,6 @@ msgstr "Von Metern umrechnen" msgid "Restore to meter" msgstr "Auf Meter zurücksetzen" -msgid "Assemble" -msgstr "Zusammenbauen" - msgid "Assemble the selected objects to an object with multiple parts" msgstr "" "Die ausgewählten Objekte zu einem Objekt mit mehreren Teilen zusammenfügen" @@ -7061,6 +7107,56 @@ msgstr "Keine Updates verfügbar." msgid "The configuration is up to date." msgstr "Die Konfiguration ist auf dem neuesten Stand." +msgid "Obj file Import color" +msgstr "" + +msgid "Specify number of colors:" +msgstr "" + +#, c-format, boost-format +msgid "The color count should be in range [%d, %d]." +msgstr "" + +msgid "Recommended " +msgstr "" + +msgid "Current filament colors:" +msgstr "" + +msgid "Quick set:" +msgstr "" + +msgid "Color match" +msgstr "" + +msgid "Approximate color matching." +msgstr "" + +msgid "Append" +msgstr "" + +msgid "Add consumable extruder after existing extruders." +msgstr "" + +msgid "Reset mapped extruders." +msgstr "" + +msgid "Cluster colors" +msgstr "" + +msgid "Map Filament" +msgstr "" + +msgid "" +"Note:The color has been selected, you can choose OK \n" +" to continue or manually adjust it." +msgstr "" + +msgid "" +"Waring:The count of newly added and \n" +" current extruders exceeds 16." +msgstr "" + msgid "Auto-Calc" msgstr "Automatisch berechnen" diff --git a/bbl/i18n/en/BambuStudio_en.po b/bbl/i18n/en/BambuStudio_en.po index f43d999cc..ee4da3c99 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-22 16:06+0800\n" +"POT-Creation-Date: 2024-04-23 10:24+0800\n" "Language: en\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -627,11 +627,42 @@ msgstr "Length" msgid "Selection" msgstr "" +msgid " (Moving)" +msgstr "" + +msgid "" +"Select 2 faces on objects and \n" +" make objects assemble together." +msgstr "" + +msgid "" +"Select 2 points or circles on objects and \n" +" specify distance between them." +msgstr "" + +msgid "Face" +msgstr "" + +msgid " (Fixed)" +msgstr "" + +msgid "Point" +msgstr "" + msgid "" "Feature 1 has been reset, \n" "feature 2 has been feature 1" msgstr "" +msgid "Warning:please select Plane's feature." +msgstr "" + +msgid "Warning:please select Point's or Circle's feature." +msgstr "" + +msgid "Warning:please select two different mesh." +msgstr "" + msgid "Copy to clipboard" msgstr "Copy to clipboard" @@ -668,7 +699,22 @@ msgstr "" msgid "Parallel_distance:" msgstr "" -msgid "Featue 2" +msgid "Flip by Face 2" +msgstr "" + +msgid "Assemble" +msgstr "Assemble" + +msgid "Please confirm explosion ratio = 1 and select at least two volumes." +msgstr "" + +msgid "Please select at least two volumes." +msgstr "" + +msgid "(Moving)" +msgstr "" + +msgid "Point and point assembly" msgstr "" msgid "" @@ -677,6 +723,9 @@ msgid "" " It is recommended to assemble them together." msgstr "" +msgid "Face and face assembly" +msgstr "" + msgid "Brush size" msgstr "Brush size" @@ -1159,9 +1208,6 @@ msgstr "Convert from meter" msgid "Restore to meter" msgstr "Restore to meter" -msgid "Assemble" -msgstr "Assemble" - msgid "Assemble the selected objects to an object with multiple parts" msgstr "Assemble the selected objects into an object with multiple parts" @@ -6913,6 +6959,56 @@ msgstr "No updates available." msgid "The configuration is up to date." msgstr "The configuration is up to date." +msgid "Obj file Import color" +msgstr "" + +msgid "Specify number of colors:" +msgstr "" + +#, c-format, boost-format +msgid "The color count should be in range [%d, %d]." +msgstr "" + +msgid "Recommended " +msgstr "" + +msgid "Current filament colors:" +msgstr "" + +msgid "Quick set:" +msgstr "" + +msgid "Color match" +msgstr "" + +msgid "Approximate color matching." +msgstr "" + +msgid "Append" +msgstr "" + +msgid "Add consumable extruder after existing extruders." +msgstr "" + +msgid "Reset mapped extruders." +msgstr "" + +msgid "Cluster colors" +msgstr "" + +msgid "Map Filament" +msgstr "" + +msgid "" +"Note:The color has been selected, you can choose OK \n" +" to continue or manually adjust it." +msgstr "" + +msgid "" +"Waring:The count of newly added and \n" +" current extruders exceeds 16." +msgstr "" + msgid "Auto-Calc" msgstr "Auto-Calc" diff --git a/bbl/i18n/es/BambuStudio_es.po b/bbl/i18n/es/BambuStudio_es.po index 9a5ec537e..03269aa7f 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-22 16:06+0800\n" +"POT-Creation-Date: 2024-04-23 10:24+0800\n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -630,11 +630,42 @@ msgstr "Largo" msgid "Selection" msgstr "" +msgid " (Moving)" +msgstr "" + +msgid "" +"Select 2 faces on objects and \n" +" make objects assemble together." +msgstr "" + +msgid "" +"Select 2 points or circles on objects and \n" +" specify distance between them." +msgstr "" + +msgid "Face" +msgstr "" + +msgid " (Fixed)" +msgstr "" + +msgid "Point" +msgstr "" + msgid "" "Feature 1 has been reset, \n" "feature 2 has been feature 1" msgstr "" +msgid "Warning:please select Plane's feature." +msgstr "" + +msgid "Warning:please select Point's or Circle's feature." +msgstr "" + +msgid "Warning:please select two different mesh." +msgstr "" + msgid "Copy to clipboard" msgstr "Copiar al portapapeles" @@ -671,7 +702,22 @@ msgstr "" msgid "Parallel_distance:" msgstr "" -msgid "Featue 2" +msgid "Flip by Face 2" +msgstr "" + +msgid "Assemble" +msgstr "Montar" + +msgid "Please confirm explosion ratio = 1 and select at least two volumes." +msgstr "" + +msgid "Please select at least two volumes." +msgstr "" + +msgid "(Moving)" +msgstr "" + +msgid "Point and point assembly" msgstr "" msgid "" @@ -680,6 +726,9 @@ msgid "" " It is recommended to assemble them together." msgstr "" +msgid "Face and face assembly" +msgstr "" + msgid "Brush size" msgstr "Grosor de trazo" @@ -1171,9 +1220,6 @@ msgstr "Convertir desde metros" msgid "Restore to meter" msgstr "Restaurar a metros" -msgid "Assemble" -msgstr "Montar" - msgid "Assemble the selected objects to an object with multiple parts" msgstr "Ensamblar los objetos seleccionados en un objeto con múltiples partes" @@ -7035,6 +7081,56 @@ msgstr "No hay actualizaciones disponibles." msgid "The configuration is up to date." msgstr "La configuración está actualizada." +msgid "Obj file Import color" +msgstr "" + +msgid "Specify number of colors:" +msgstr "" + +#, c-format, boost-format +msgid "The color count should be in range [%d, %d]." +msgstr "" + +msgid "Recommended " +msgstr "" + +msgid "Current filament colors:" +msgstr "" + +msgid "Quick set:" +msgstr "" + +msgid "Color match" +msgstr "" + +msgid "Approximate color matching." +msgstr "" + +msgid "Append" +msgstr "" + +msgid "Add consumable extruder after existing extruders." +msgstr "" + +msgid "Reset mapped extruders." +msgstr "" + +msgid "Cluster colors" +msgstr "" + +msgid "Map Filament" +msgstr "" + +msgid "" +"Note:The color has been selected, you can choose OK \n" +" to continue or manually adjust it." +msgstr "" + +msgid "" +"Waring:The count of newly added and \n" +" current extruders exceeds 16." +msgstr "" + msgid "Auto-Calc" msgstr "Auto-Calc" diff --git a/bbl/i18n/fr/BambuStudio_fr.po b/bbl/i18n/fr/BambuStudio_fr.po index 51817f4cb..cc6145f5a 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-22 16:06+0800\n" +"POT-Creation-Date: 2024-04-23 10:24+0800\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: \n" @@ -633,11 +633,42 @@ msgstr "Longueur" msgid "Selection" msgstr "" +msgid " (Moving)" +msgstr "" + +msgid "" +"Select 2 faces on objects and \n" +" make objects assemble together." +msgstr "" + +msgid "" +"Select 2 points or circles on objects and \n" +" specify distance between them." +msgstr "" + +msgid "Face" +msgstr "" + +msgid " (Fixed)" +msgstr "" + +msgid "Point" +msgstr "" + msgid "" "Feature 1 has been reset, \n" "feature 2 has been feature 1" msgstr "" +msgid "Warning:please select Plane's feature." +msgstr "" + +msgid "Warning:please select Point's or Circle's feature." +msgstr "" + +msgid "Warning:please select two different mesh." +msgstr "" + msgid "Copy to clipboard" msgstr "Copier dans le presse-papier" @@ -674,7 +705,22 @@ msgstr "" msgid "Parallel_distance:" msgstr "" -msgid "Featue 2" +msgid "Flip by Face 2" +msgstr "" + +msgid "Assemble" +msgstr "Assembler" + +msgid "Please confirm explosion ratio = 1 and select at least two volumes." +msgstr "" + +msgid "Please select at least two volumes." +msgstr "" + +msgid "(Moving)" +msgstr "" + +msgid "Point and point assembly" msgstr "" msgid "" @@ -683,6 +729,9 @@ msgid "" " It is recommended to assemble them together." msgstr "" +msgid "Face and face assembly" +msgstr "" + msgid "Brush size" msgstr "Taille du pinceau" @@ -1176,9 +1225,6 @@ msgstr "Convertir en mètre" msgid "Restore to meter" msgstr "Restaurer au compteur" -msgid "Assemble" -msgstr "Assembler" - msgid "Assemble the selected objects to an object with multiple parts" msgstr "Assembler les objets sélectionnés à un objet en plusieurs parties" @@ -7052,6 +7098,56 @@ msgstr "Aucune mise à jour disponible." msgid "The configuration is up to date." msgstr "La configuration est à jour." +msgid "Obj file Import color" +msgstr "" + +msgid "Specify number of colors:" +msgstr "" + +#, c-format, boost-format +msgid "The color count should be in range [%d, %d]." +msgstr "" + +msgid "Recommended " +msgstr "" + +msgid "Current filament colors:" +msgstr "" + +msgid "Quick set:" +msgstr "" + +msgid "Color match" +msgstr "" + +msgid "Approximate color matching." +msgstr "" + +msgid "Append" +msgstr "" + +msgid "Add consumable extruder after existing extruders." +msgstr "" + +msgid "Reset mapped extruders." +msgstr "" + +msgid "Cluster colors" +msgstr "" + +msgid "Map Filament" +msgstr "" + +msgid "" +"Note:The color has been selected, you can choose OK \n" +" to continue or manually adjust it." +msgstr "" + +msgid "" +"Waring:The count of newly added and \n" +" current extruders exceeds 16." +msgstr "" + msgid "Auto-Calc" msgstr "Auto-Calc" diff --git a/bbl/i18n/hu/BambuStudio_hu.po b/bbl/i18n/hu/BambuStudio_hu.po index cc6ef07b0..e1eb1dfb6 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-22 16:06+0800\n" +"POT-Creation-Date: 2024-04-23 10:24+0800\n" "Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -629,11 +629,42 @@ msgstr "Hossz" msgid "Selection" msgstr "" +msgid " (Moving)" +msgstr "" + +msgid "" +"Select 2 faces on objects and \n" +" make objects assemble together." +msgstr "" + +msgid "" +"Select 2 points or circles on objects and \n" +" specify distance between them." +msgstr "" + +msgid "Face" +msgstr "" + +msgid " (Fixed)" +msgstr "" + +msgid "Point" +msgstr "" + msgid "" "Feature 1 has been reset, \n" "feature 2 has been feature 1" msgstr "" +msgid "Warning:please select Plane's feature." +msgstr "" + +msgid "Warning:please select Point's or Circle's feature." +msgstr "" + +msgid "Warning:please select two different mesh." +msgstr "" + msgid "Copy to clipboard" msgstr "Másolás a vágólapra" @@ -670,7 +701,22 @@ msgstr "" msgid "Parallel_distance:" msgstr "" -msgid "Featue 2" +msgid "Flip by Face 2" +msgstr "" + +msgid "Assemble" +msgstr "Összeállítás" + +msgid "Please confirm explosion ratio = 1 and select at least two volumes." +msgstr "" + +msgid "Please select at least two volumes." +msgstr "" + +msgid "(Moving)" +msgstr "" + +msgid "Point and point assembly" msgstr "" msgid "" @@ -679,6 +725,9 @@ msgid "" " It is recommended to assemble them together." msgstr "" +msgid "Face and face assembly" +msgstr "" + msgid "Brush size" msgstr "Ecset mérete" @@ -1167,9 +1216,6 @@ msgstr "Átváltás méterről" msgid "Restore to meter" msgstr "Visszaállítás méterre" -msgid "Assemble" -msgstr "Összeállítás" - 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á" @@ -6984,6 +7030,56 @@ msgstr "Nincs elérhető frissítés." msgid "The configuration is up to date." msgstr "A konfiguráció naprakész." +msgid "Obj file Import color" +msgstr "" + +msgid "Specify number of colors:" +msgstr "" + +#, c-format, boost-format +msgid "The color count should be in range [%d, %d]." +msgstr "" + +msgid "Recommended " +msgstr "" + +msgid "Current filament colors:" +msgstr "" + +msgid "Quick set:" +msgstr "" + +msgid "Color match" +msgstr "" + +msgid "Approximate color matching." +msgstr "" + +msgid "Append" +msgstr "" + +msgid "Add consumable extruder after existing extruders." +msgstr "" + +msgid "Reset mapped extruders." +msgstr "" + +msgid "Cluster colors" +msgstr "" + +msgid "Map Filament" +msgstr "" + +msgid "" +"Note:The color has been selected, you can choose OK \n" +" to continue or manually adjust it." +msgstr "" + +msgid "" +"Waring:The count of newly added and \n" +" current extruders exceeds 16." +msgstr "" + msgid "Auto-Calc" msgstr "Automatikus számítás" diff --git a/bbl/i18n/it/BambuStudio_it.po b/bbl/i18n/it/BambuStudio_it.po index 37bf2e097..6b8d6eb86 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-22 16:06+0800\n" +"POT-Creation-Date: 2024-04-23 10:24+0800\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -629,11 +629,42 @@ msgstr "Lunghezza" msgid "Selection" msgstr "" +msgid " (Moving)" +msgstr "" + +msgid "" +"Select 2 faces on objects and \n" +" make objects assemble together." +msgstr "" + +msgid "" +"Select 2 points or circles on objects and \n" +" specify distance between them." +msgstr "" + +msgid "Face" +msgstr "" + +msgid " (Fixed)" +msgstr "" + +msgid "Point" +msgstr "" + msgid "" "Feature 1 has been reset, \n" "feature 2 has been feature 1" msgstr "" +msgid "Warning:please select Plane's feature." +msgstr "" + +msgid "Warning:please select Point's or Circle's feature." +msgstr "" + +msgid "Warning:please select two different mesh." +msgstr "" + msgid "Copy to clipboard" msgstr "Copia negli appunti" @@ -670,7 +701,22 @@ msgstr "" msgid "Parallel_distance:" msgstr "" -msgid "Featue 2" +msgid "Flip by Face 2" +msgstr "" + +msgid "Assemble" +msgstr "Assembla" + +msgid "Please confirm explosion ratio = 1 and select at least two volumes." +msgstr "" + +msgid "Please select at least two volumes." +msgstr "" + +msgid "(Moving)" +msgstr "" + +msgid "Point and point assembly" msgstr "" msgid "" @@ -679,6 +725,9 @@ msgid "" " It is recommended to assemble them together." msgstr "" +msgid "Face and face assembly" +msgstr "" + msgid "Brush size" msgstr "Misura del pennello" @@ -1165,9 +1214,6 @@ msgstr "Converti da metri" msgid "Restore to meter" msgstr "Ripristina in metri" -msgid "Assemble" -msgstr "Assembla" - msgid "Assemble the selected objects to an object with multiple parts" msgstr "Assembla gli oggetti selezionati in un oggetto con più parti" @@ -6998,6 +7044,56 @@ msgstr "Nessun aggiornamento disponibile." msgid "The configuration is up to date." msgstr "Configurazione aggiornata." +msgid "Obj file Import color" +msgstr "" + +msgid "Specify number of colors:" +msgstr "" + +#, c-format, boost-format +msgid "The color count should be in range [%d, %d]." +msgstr "" + +msgid "Recommended " +msgstr "" + +msgid "Current filament colors:" +msgstr "" + +msgid "Quick set:" +msgstr "" + +msgid "Color match" +msgstr "" + +msgid "Approximate color matching." +msgstr "" + +msgid "Append" +msgstr "" + +msgid "Add consumable extruder after existing extruders." +msgstr "" + +msgid "Reset mapped extruders." +msgstr "" + +msgid "Cluster colors" +msgstr "" + +msgid "Map Filament" +msgstr "" + +msgid "" +"Note:The color has been selected, you can choose OK \n" +" to continue or manually adjust it." +msgstr "" + +msgid "" +"Waring:The count of newly added and \n" +" current extruders exceeds 16." +msgstr "" + msgid "Auto-Calc" msgstr "Calcolo automatico" diff --git a/bbl/i18n/ja/BambuStudio_ja.po b/bbl/i18n/ja/BambuStudio_ja.po index ca2f0e988..c77103705 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-22 16:06+0800\n" +"POT-Creation-Date: 2024-04-23 10:24+0800\n" "Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -625,11 +625,42 @@ msgstr "長さ" msgid "Selection" msgstr "" +msgid " (Moving)" +msgstr "" + +msgid "" +"Select 2 faces on objects and \n" +" make objects assemble together." +msgstr "" + +msgid "" +"Select 2 points or circles on objects and \n" +" specify distance between them." +msgstr "" + +msgid "Face" +msgstr "" + +msgid " (Fixed)" +msgstr "" + +msgid "Point" +msgstr "" + msgid "" "Feature 1 has been reset, \n" "feature 2 has been feature 1" msgstr "" +msgid "Warning:please select Plane's feature." +msgstr "" + +msgid "Warning:please select Point's or Circle's feature." +msgstr "" + +msgid "Warning:please select two different mesh." +msgstr "" + msgid "Copy to clipboard" msgstr "コピー" @@ -666,7 +697,22 @@ msgstr "" msgid "Parallel_distance:" msgstr "" -msgid "Featue 2" +msgid "Flip by Face 2" +msgstr "" + +msgid "Assemble" +msgstr "組立てる" + +msgid "Please confirm explosion ratio = 1 and select at least two volumes." +msgstr "" + +msgid "Please select at least two volumes." +msgstr "" + +msgid "(Moving)" +msgstr "" + +msgid "Point and point assembly" msgstr "" msgid "" @@ -675,6 +721,9 @@ msgid "" " It is recommended to assemble them together." msgstr "" +msgid "Face and face assembly" +msgstr "" + msgid "Brush size" msgstr "サイズ" @@ -1154,9 +1203,6 @@ msgstr "メートルから変換" msgid "Restore to meter" msgstr "メータル単位に復元" -msgid "Assemble" -msgstr "組立てる" - msgid "Assemble the selected objects to an object with multiple parts" msgstr "選択したオブジェクトを一つオブジェクトに組み立てます（複数パーツ）" @@ -6808,6 +6854,56 @@ msgstr "利用可能なアップデートはありません" msgid "The configuration is up to date." msgstr "構成データが最新です" +msgid "Obj file Import color" +msgstr "" + +msgid "Specify number of colors:" +msgstr "" + +#, c-format, boost-format +msgid "The color count should be in range [%d, %d]." +msgstr "" + +msgid "Recommended " +msgstr "" + +msgid "Current filament colors:" +msgstr "" + +msgid "Quick set:" +msgstr "" + +msgid "Color match" +msgstr "" + +msgid "Approximate color matching." +msgstr "" + +msgid "Append" +msgstr "" + +msgid "Add consumable extruder after existing extruders." +msgstr "" + +msgid "Reset mapped extruders." +msgstr "" + +msgid "Cluster colors" +msgstr "" + +msgid "Map Filament" +msgstr "" + +msgid "" +"Note:The color has been selected, you can choose OK \n" +" to continue or manually adjust it." +msgstr "" + +msgid "" +"Waring:The count of newly added and \n" +" current extruders exceeds 16." +msgstr "" + msgid "Auto-Calc" msgstr "自動計算" diff --git a/bbl/i18n/ko/BambuStudio_ko.po b/bbl/i18n/ko/BambuStudio_ko.po index 67efa7f3d..987eb2037 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-22 16:06+0800\n" +"POT-Creation-Date: 2024-04-23 10:24+0800\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: \n" @@ -631,6 +631,28 @@ msgstr "길이" msgid "Selection" msgstr "선택" +msgid " (Moving)" +msgstr "" + +msgid "" +"Select 2 faces on objects and \n" +" make objects assemble together." +msgstr "" + +msgid "" +"Select 2 points or circles on objects and \n" +" specify distance between them." +msgstr "" + +msgid "Face" +msgstr "" + +msgid " (Fixed)" +msgstr "" + +msgid "Point" +msgstr "" + msgid "" "Feature 1 has been reset, \n" "feature 2 has been feature 1" @@ -638,6 +660,15 @@ msgstr "" "기능 1이 재설정되었습니다.\n" "기능 2는 기능 1이 되었습니다." +msgid "Warning:please select Plane's feature." +msgstr "" + +msgid "Warning:please select Point's or Circle's feature." +msgstr "" + +msgid "Warning:please select two different mesh." +msgstr "" + msgid "Copy to clipboard" msgstr "클립보드에 복사" @@ -674,8 +705,23 @@ msgstr "중심 회전" msgid "Parallel_distance:" msgstr "병렬_거리" -msgid "Featue 2" -msgstr "기능 2" +msgid "Flip by Face 2" +msgstr "" + +msgid "Assemble" +msgstr "결합" + +msgid "Please confirm explosion ratio = 1 and select at least two volumes." +msgstr "" + +msgid "Please select at least two volumes." +msgstr "" + +msgid "(Moving)" +msgstr "" + +msgid "Point and point assembly" +msgstr "" msgid "" "Due to ensuer_on_bed, assembly between \n" @@ -686,6 +732,9 @@ msgstr "" "다른 객체간의 조립이 3D 보기에서 정확하지 않을 수 있습니다.\n" " 함께 조립하는 것이 좋습니다." +msgid "Face and face assembly" +msgstr "" + msgid "Brush size" msgstr "브러시 크기" @@ -1170,9 +1219,6 @@ msgstr "미터 단위 모델링 변환 (1000배)" msgid "Restore to meter" msgstr "미터 단위로 복원" -msgid "Assemble" -msgstr "결합" - msgid "Assemble the selected objects to an object with multiple parts" msgstr "선택한 객체들을 여러부품으로 이루어진 하나의 객채로 통합" @@ -6975,6 +7021,56 @@ msgstr "사용 가능한 업데이트가 없습니다." msgid "The configuration is up to date." msgstr "설정이 최신 상태입니다." +msgid "Obj file Import color" +msgstr "" + +msgid "Specify number of colors:" +msgstr "" + +#, c-format, boost-format +msgid "The color count should be in range [%d, %d]." +msgstr "" + +msgid "Recommended " +msgstr "" + +msgid "Current filament colors:" +msgstr "" + +msgid "Quick set:" +msgstr "" + +msgid "Color match" +msgstr "" + +msgid "Approximate color matching." +msgstr "" + +msgid "Append" +msgstr "" + +msgid "Add consumable extruder after existing extruders." +msgstr "" + +msgid "Reset mapped extruders." +msgstr "" + +msgid "Cluster colors" +msgstr "" + +msgid "Map Filament" +msgstr "" + +msgid "" +"Note:The color has been selected, you can choose OK \n" +" to continue or manually adjust it." +msgstr "" + +msgid "" +"Waring:The count of newly added and \n" +" current extruders exceeds 16." +msgstr "" + msgid "Auto-Calc" msgstr "자동 계산" @@ -12648,6 +12744,9 @@ msgstr "" "알고 계셨나요? ABS등 뒤틀림이 발생하기 쉬운 소재를 출력할 때, 히트베드 온도" "를 적절하게 높이면 뒤틀림 가능성을 줄일 수 있습니다." +#~ msgid "Featue 2" +#~ msgstr "기능 2" + #~ msgid "active" #~ msgstr "Active" diff --git a/bbl/i18n/list.txt b/bbl/i18n/list.txt index e71c7cc1a..b4cce4cab 100644 --- a/bbl/i18n/list.txt +++ b/bbl/i18n/list.txt @@ -11,6 +11,7 @@ src/slic3r/GUI/Gizmos/GLGizmoAdvancedCut.cpp src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp src/slic3r/GUI/Gizmos/GLGizmoFaceDetector.cpp src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp +src/slic3r/GUI/Gizmos/GLGizmoAssembly.cpp src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp src/slic3r/GUI/Gizmos/GLGizmoSeam.hpp src/slic3r/GUI/Gizmos/GLGizmoText.cpp @@ -104,6 +105,7 @@ src/slic3r/GUI/UnsavedChangesDialog.cpp src/slic3r/GUI/Auxiliary.cpp src/slic3r/GUI/UpdateDialogs.cpp src/slic3r/GUI/UnsavedChangesDialog.cpp +src/slic3r/GUI/ObjColorDialog.cpp src/slic3r/GUI/WipeTowerDialog.cpp src/slic3r/GUI/wxExtensions.cpp src/slic3r/GUI/WebUserLoginDialog.cpp diff --git a/bbl/i18n/nl/BambuStudio_nl.po b/bbl/i18n/nl/BambuStudio_nl.po index a81d14f57..bc3c097dd 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-22 16:06+0800\n" +"POT-Creation-Date: 2024-04-23 10:24+0800\n" "Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -629,11 +629,42 @@ msgstr "Lengte" msgid "Selection" msgstr "" +msgid " (Moving)" +msgstr "" + +msgid "" +"Select 2 faces on objects and \n" +" make objects assemble together." +msgstr "" + +msgid "" +"Select 2 points or circles on objects and \n" +" specify distance between them." +msgstr "" + +msgid "Face" +msgstr "" + +msgid " (Fixed)" +msgstr "" + +msgid "Point" +msgstr "" + msgid "" "Feature 1 has been reset, \n" "feature 2 has been feature 1" msgstr "" +msgid "Warning:please select Plane's feature." +msgstr "" + +msgid "Warning:please select Point's or Circle's feature." +msgstr "" + +msgid "Warning:please select two different mesh." +msgstr "" + msgid "Copy to clipboard" msgstr "Kopieer naar klembord" @@ -670,7 +701,22 @@ msgstr "" msgid "Parallel_distance:" msgstr "" -msgid "Featue 2" +msgid "Flip by Face 2" +msgstr "" + +msgid "Assemble" +msgstr "Monteren" + +msgid "Please confirm explosion ratio = 1 and select at least two volumes." +msgstr "" + +msgid "Please select at least two volumes." +msgstr "" + +msgid "(Moving)" +msgstr "" + +msgid "Point and point assembly" msgstr "" msgid "" @@ -679,6 +725,9 @@ msgid "" " It is recommended to assemble them together." msgstr "" +msgid "Face and face assembly" +msgstr "" + msgid "Brush size" msgstr "Penseelgrootte" @@ -1164,9 +1213,6 @@ msgstr "Converteren vanuit meter" msgid "Restore to meter" msgstr "Terugzetten naar meter" -msgid "Assemble" -msgstr "Monteren" - msgid "Assemble the selected objects to an object with multiple parts" msgstr "" "Monteer de geselecteerde objecten tot een object bestaande uit meerdere delen" @@ -7046,6 +7092,56 @@ msgstr "Geen updates beschikbaar." msgid "The configuration is up to date." msgstr "De configuratie is up to date." +msgid "Obj file Import color" +msgstr "" + +msgid "Specify number of colors:" +msgstr "" + +#, c-format, boost-format +msgid "The color count should be in range [%d, %d]." +msgstr "" + +msgid "Recommended " +msgstr "" + +msgid "Current filament colors:" +msgstr "" + +msgid "Quick set:" +msgstr "" + +msgid "Color match" +msgstr "" + +msgid "Approximate color matching." +msgstr "" + +msgid "Append" +msgstr "" + +msgid "Add consumable extruder after existing extruders." +msgstr "" + +msgid "Reset mapped extruders." +msgstr "" + +msgid "Cluster colors" +msgstr "" + +msgid "Map Filament" +msgstr "" + +msgid "" +"Note:The color has been selected, you can choose OK \n" +" to continue or manually adjust it." +msgstr "" + +msgid "" +"Waring:The count of newly added and \n" +" current extruders exceeds 16." +msgstr "" + msgid "Auto-Calc" msgstr "Automatisch berekenen" diff --git a/bbl/i18n/pt-BR/BambuStudio_pt-BR.po b/bbl/i18n/pt-BR/BambuStudio_pt-BR.po index 63bfb9224..7375c3262 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-22 16:06+0800\n" +"POT-Creation-Date: 2024-04-23 10:24+0800\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: \n" @@ -635,11 +635,42 @@ msgstr "Comprimento" msgid "Selection" msgstr "" +msgid " (Moving)" +msgstr "" + +msgid "" +"Select 2 faces on objects and \n" +" make objects assemble together." +msgstr "" + +msgid "" +"Select 2 points or circles on objects and \n" +" specify distance between them." +msgstr "" + +msgid "Face" +msgstr "" + +msgid " (Fixed)" +msgstr "" + +msgid "Point" +msgstr "" + msgid "" "Feature 1 has been reset, \n" "feature 2 has been feature 1" msgstr "" +msgid "Warning:please select Plane's feature." +msgstr "" + +msgid "Warning:please select Point's or Circle's feature." +msgstr "" + +msgid "Warning:please select two different mesh." +msgstr "" + msgid "Copy to clipboard" msgstr "Copiar para a área de transferência" @@ -676,7 +707,22 @@ msgstr "" msgid "Parallel_distance:" msgstr "" -msgid "Featue 2" +msgid "Flip by Face 2" +msgstr "" + +msgid "Assemble" +msgstr "Montar" + +msgid "Please confirm explosion ratio = 1 and select at least two volumes." +msgstr "" + +msgid "Please select at least two volumes." +msgstr "" + +msgid "(Moving)" +msgstr "" + +msgid "Point and point assembly" msgstr "" msgid "" @@ -685,6 +731,9 @@ msgid "" " It is recommended to assemble them together." msgstr "" +msgid "Face and face assembly" +msgstr "" + msgid "Brush size" msgstr "Tamanho de escova" @@ -1178,9 +1227,6 @@ msgstr "Converter a partir do medidor" msgid "Restore to meter" msgstr "Restaurar para o medidor" -msgid "Assemble" -msgstr "Montar" - msgid "Assemble the selected objects to an object with multiple parts" msgstr "Montar os objetos selecionados em um objeto com várias peças" @@ -7065,6 +7111,56 @@ msgstr "Nenhuma atualização disponível" msgid "The configuration is up to date." msgstr "A configuração está atualizada." +msgid "Obj file Import color" +msgstr "" + +msgid "Specify number of colors:" +msgstr "" + +#, c-format, boost-format +msgid "The color count should be in range [%d, %d]." +msgstr "" + +msgid "Recommended " +msgstr "" + +msgid "Current filament colors:" +msgstr "" + +msgid "Quick set:" +msgstr "" + +msgid "Color match" +msgstr "" + +msgid "Approximate color matching." +msgstr "" + +msgid "Append" +msgstr "" + +msgid "Add consumable extruder after existing extruders." +msgstr "" + +msgid "Reset mapped extruders." +msgstr "" + +msgid "Cluster colors" +msgstr "" + +msgid "Map Filament" +msgstr "" + +msgid "" +"Note:The color has been selected, you can choose OK \n" +" to continue or manually adjust it." +msgstr "" + +msgid "" +"Waring:The count of newly added and \n" +" current extruders exceeds 16." +msgstr "" + msgid "Auto-Calc" msgstr "Cálculo automático" diff --git a/bbl/i18n/ru/BambuStudio_ru.po b/bbl/i18n/ru/BambuStudio_ru.po index a4832eed2..50d8df3a9 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-22 16:06+0800\n" +"POT-Creation-Date: 2024-04-23 10:24+0800\n" "PO-Revision-Date: 2024-04-18 20:55+0700\n" "Last-Translator: Andylg \n" "Language-Team: \n" @@ -643,6 +643,28 @@ msgstr "Длина" msgid "Selection" msgstr "Выделение" +msgid " (Moving)" +msgstr "" + +msgid "" +"Select 2 faces on objects and \n" +" make objects assemble together." +msgstr "" + +msgid "" +"Select 2 points or circles on objects and \n" +" specify distance between them." +msgstr "" + +msgid "Face" +msgstr "" + +msgid " (Fixed)" +msgstr "" + +msgid "Point" +msgstr "" + msgid "" "Feature 1 has been reset, \n" "feature 2 has been feature 1" @@ -650,6 +672,15 @@ msgstr "" "Выбор элемента 1 отменён,\n" "элемент 2 стал элементом 1." +msgid "Warning:please select Plane's feature." +msgstr "" + +msgid "Warning:please select Point's or Circle's feature." +msgstr "" + +msgid "Warning:please select two different mesh." +msgstr "" + msgid "Copy to clipboard" msgstr "Скопировать в буфер обмена" @@ -689,8 +720,23 @@ msgstr "" "Расстояние между \n" "параллельными гранями:" -msgid "Featue 2" -msgstr "Элемент 2" +msgid "Flip by Face 2" +msgstr "" + +msgid "Assemble" +msgstr "Объединить в сборку" + +msgid "Please confirm explosion ratio = 1 and select at least two volumes." +msgstr "" + +msgid "Please select at least two volumes." +msgstr "" + +msgid "(Moving)" +msgstr "" + +msgid "Point and point assembly" +msgstr "" # ??? msgid "" @@ -702,6 +748,9 @@ msgstr "" "сборка различных объектов может быть \n" "некорректной в 3D-виде. Рекомендуется объединить их." +msgid "Face and face assembly" +msgstr "" + msgid "Brush size" msgstr "Размер кисти" @@ -1196,9 +1245,6 @@ msgstr "Преобразовать размеры из метров" msgid "Restore to meter" msgstr "Восстановить размеры в метры" -msgid "Assemble" -msgstr "Объединить в сборку" - msgid "Assemble the selected objects to an object with multiple parts" msgstr "" "Объединение выбранных объектов в модель, состоящую из несколько частей." @@ -7258,6 +7304,56 @@ msgstr "Обновления отсутствуют." msgid "The configuration is up to date." msgstr "Текущая конфигурация не требует обновления." +msgid "Obj file Import color" +msgstr "" + +msgid "Specify number of colors:" +msgstr "" + +#, c-format, boost-format +msgid "The color count should be in range [%d, %d]." +msgstr "" + +msgid "Recommended " +msgstr "" + +msgid "Current filament colors:" +msgstr "" + +msgid "Quick set:" +msgstr "" + +msgid "Color match" +msgstr "" + +msgid "Approximate color matching." +msgstr "" + +msgid "Append" +msgstr "" + +msgid "Add consumable extruder after existing extruders." +msgstr "" + +msgid "Reset mapped extruders." +msgstr "" + +msgid "Cluster colors" +msgstr "" + +msgid "Map Filament" +msgstr "" + +msgid "" +"Note:The color has been selected, you can choose OK \n" +" to continue or manually adjust it." +msgstr "" + +msgid "" +"Waring:The count of newly added and \n" +" current extruders exceeds 16." +msgstr "" + msgid "Auto-Calc" msgstr "Авторасчёт" @@ -13256,6 +13352,9 @@ msgstr "" "ABS, повышение температуры подогреваемого стола может снизить вероятность " "коробления?" +#~ msgid "Featue 2" +#~ msgstr "Элемент 2" + #~ msgid "active" #~ msgstr "активный" diff --git a/bbl/i18n/sv/BambuStudio_sv.po b/bbl/i18n/sv/BambuStudio_sv.po index fdb5a3c54..c9930b66e 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-22 16:06+0800\n" +"POT-Creation-Date: 2024-04-23 10:24+0800\n" "Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -628,11 +628,42 @@ msgstr "Längd" msgid "Selection" msgstr "" +msgid " (Moving)" +msgstr "" + +msgid "" +"Select 2 faces on objects and \n" +" make objects assemble together." +msgstr "" + +msgid "" +"Select 2 points or circles on objects and \n" +" specify distance between them." +msgstr "" + +msgid "Face" +msgstr "" + +msgid " (Fixed)" +msgstr "" + +msgid "Point" +msgstr "" + msgid "" "Feature 1 has been reset, \n" "feature 2 has been feature 1" msgstr "" +msgid "Warning:please select Plane's feature." +msgstr "" + +msgid "Warning:please select Point's or Circle's feature." +msgstr "" + +msgid "Warning:please select two different mesh." +msgstr "" + msgid "Copy to clipboard" msgstr "Kopiera till urklipp" @@ -669,7 +700,22 @@ msgstr "" msgid "Parallel_distance:" msgstr "" -msgid "Featue 2" +msgid "Flip by Face 2" +msgstr "" + +msgid "Assemble" +msgstr "Montera" + +msgid "Please confirm explosion ratio = 1 and select at least two volumes." +msgstr "" + +msgid "Please select at least two volumes." +msgstr "" + +msgid "(Moving)" +msgstr "" + +msgid "Point and point assembly" msgstr "" msgid "" @@ -678,6 +724,9 @@ msgid "" " It is recommended to assemble them together." msgstr "" +msgid "Face and face assembly" +msgstr "" + msgid "Brush size" msgstr "Pensel storlek" @@ -1161,9 +1210,6 @@ msgstr "Konvertera ifrån meter" msgid "Restore to meter" msgstr "Återställ till meter" -msgid "Assemble" -msgstr "Montera" - msgid "Assemble the selected objects to an object with multiple parts" msgstr "Montera de valda objekten till ett objekt med multipla delar" @@ -6958,6 +7004,56 @@ msgstr "Inga uppdateringar tillgängliga." msgid "The configuration is up to date." msgstr "Konfigurationen är aktuell." +msgid "Obj file Import color" +msgstr "" + +msgid "Specify number of colors:" +msgstr "" + +#, c-format, boost-format +msgid "The color count should be in range [%d, %d]." +msgstr "" + +msgid "Recommended " +msgstr "" + +msgid "Current filament colors:" +msgstr "" + +msgid "Quick set:" +msgstr "" + +msgid "Color match" +msgstr "" + +msgid "Approximate color matching." +msgstr "" + +msgid "Append" +msgstr "" + +msgid "Add consumable extruder after existing extruders." +msgstr "" + +msgid "Reset mapped extruders." +msgstr "" + +msgid "Cluster colors" +msgstr "" + +msgid "Map Filament" +msgstr "" + +msgid "" +"Note:The color has been selected, you can choose OK \n" +" to continue or manually adjust it." +msgstr "" + +msgid "" +"Waring:The count of newly added and \n" +" current extruders exceeds 16." +msgstr "" + msgid "Auto-Calc" msgstr "Autoberäkna" diff --git a/bbl/i18n/tr/BambuStudio_tr.po b/bbl/i18n/tr/BambuStudio_tr.po index 092ed3aa6..ea7ca8b43 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-22 16:06+0800\n" +"POT-Creation-Date: 2024-04-23 10:24+0800\n" "PO-Revision-Date: 2024-04-16 18:18+0300\n" "Last-Translator: Fatih AYDIN \n" "Language-Team: \n" @@ -637,6 +637,28 @@ msgstr "Uzunluk" msgid "Selection" msgstr "Seçim" +msgid " (Moving)" +msgstr "" + +msgid "" +"Select 2 faces on objects and \n" +" make objects assemble together." +msgstr "" + +msgid "" +"Select 2 points or circles on objects and \n" +" specify distance between them." +msgstr "" + +msgid "Face" +msgstr "" + +msgid " (Fixed)" +msgstr "" + +msgid "Point" +msgstr "" + msgid "" "Feature 1 has been reset, \n" "feature 2 has been feature 1" @@ -644,6 +666,15 @@ msgstr "" "Özellik 1 sıfırlandı,\n" "özellik 2, özellik 1 olmuştur" +msgid "Warning:please select Plane's feature." +msgstr "" + +msgid "Warning:please select Point's or Circle's feature." +msgstr "" + +msgid "Warning:please select two different mesh." +msgstr "" + msgid "Copy to clipboard" msgstr "Panoya kopyala" @@ -680,8 +711,23 @@ msgstr "Merkez etrafında döndürün:" msgid "Parallel_distance:" msgstr "Paralel_mesafe:" -msgid "Featue 2" -msgstr "Özellik 2" +msgid "Flip by Face 2" +msgstr "" + +msgid "Assemble" +msgstr "Birleştir" + +msgid "Please confirm explosion ratio = 1 and select at least two volumes." +msgstr "" + +msgid "Please select at least two volumes." +msgstr "" + +msgid "(Moving)" +msgstr "" + +msgid "Point and point assembly" +msgstr "" msgid "" "Due to ensuer_on_bed, assembly between \n" @@ -692,6 +738,9 @@ msgstr "" "farklı nesneler 3D görünümde doğru olmayabilir.\n" " Bunları bir araya getirmeniz önerilir." +msgid "Face and face assembly" +msgstr "" + msgid "Brush size" msgstr "Fırça boyutu" @@ -1180,9 +1229,6 @@ msgstr "Metreden dönüştür" msgid "Restore to meter" msgstr "Metreye geri çevir" -msgid "Assemble" -msgstr "Birleştir" - msgid "Assemble the selected objects to an object with multiple parts" msgstr "Seçilen nesneleri birden çok parçalı bir nesneyle birleştirin" @@ -7107,6 +7153,56 @@ msgstr "Güncelleme mevcut değil." msgid "The configuration is up to date." msgstr "Yapılandırma güncel." +msgid "Obj file Import color" +msgstr "" + +msgid "Specify number of colors:" +msgstr "" + +#, c-format, boost-format +msgid "The color count should be in range [%d, %d]." +msgstr "" + +msgid "Recommended " +msgstr "" + +msgid "Current filament colors:" +msgstr "" + +msgid "Quick set:" +msgstr "" + +msgid "Color match" +msgstr "" + +msgid "Approximate color matching." +msgstr "" + +msgid "Append" +msgstr "" + +msgid "Add consumable extruder after existing extruders." +msgstr "" + +msgid "Reset mapped extruders." +msgstr "" + +msgid "Cluster colors" +msgstr "" + +msgid "Map Filament" +msgstr "" + +msgid "" +"Note:The color has been selected, you can choose OK \n" +" to continue or manually adjust it." +msgstr "" + +msgid "" +"Waring:The count of newly added and \n" +" current extruders exceeds 16." +msgstr "" + msgid "Auto-Calc" msgstr "Otomatik Hesaplama" @@ -12988,6 +13084,9 @@ msgstr "" "sıcaklığının uygun şekilde arttırılmasının bükülme olasılığını " "azaltabileceğini biliyor muydunuz." +#~ msgid "Featue 2" +#~ msgstr "Özellik 2" + #~ msgid "active" #~ msgstr "aktif" diff --git a/bbl/i18n/uk/BambuStudio_uk.po b/bbl/i18n/uk/BambuStudio_uk.po index 825f09d00..edbbffb8c 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-22 16:06+0800\n" +"POT-Creation-Date: 2024-04-23 10:24+0800\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: BambuLab Україна\n" @@ -633,6 +633,28 @@ msgstr "Довжина" msgid "Selection" msgstr "Вибір" +msgid " (Moving)" +msgstr "" + +msgid "" +"Select 2 faces on objects and \n" +" make objects assemble together." +msgstr "" + +msgid "" +"Select 2 points or circles on objects and \n" +" specify distance between them." +msgstr "" + +msgid "Face" +msgstr "" + +msgid " (Fixed)" +msgstr "" + +msgid "Point" +msgstr "" + msgid "" "Feature 1 has been reset, \n" "feature 2 has been feature 1" @@ -640,6 +662,15 @@ msgstr "" "Особливість 1 скинута, \n" "Особливість 2 тепер особливість 1" +msgid "Warning:please select Plane's feature." +msgstr "" + +msgid "Warning:please select Point's or Circle's feature." +msgstr "" + +msgid "Warning:please select two different mesh." +msgstr "" + msgid "Copy to clipboard" msgstr "Копіювати в буфер обміну" @@ -676,7 +707,22 @@ msgstr "" msgid "Parallel_distance:" msgstr "" -msgid "Featue 2" +msgid "Flip by Face 2" +msgstr "" + +msgid "Assemble" +msgstr "Зібрати" + +msgid "Please confirm explosion ratio = 1 and select at least two volumes." +msgstr "" + +msgid "Please select at least two volumes." +msgstr "" + +msgid "(Moving)" +msgstr "" + +msgid "Point and point assembly" msgstr "" msgid "" @@ -685,6 +731,9 @@ msgid "" " It is recommended to assemble them together." msgstr "" +msgid "Face and face assembly" +msgstr "" + msgid "Brush size" msgstr "Розмір пензля" @@ -1175,9 +1224,6 @@ msgstr "Перетворити з метричної" msgid "Restore to meter" msgstr "Відновити в метричну" -msgid "Assemble" -msgstr "Зібрати" - msgid "Assemble the selected objects to an object with multiple parts" msgstr "Зберіть вибрані об'єкти в об'єкт з кількома частинами" @@ -7113,6 +7159,56 @@ msgstr "Оновлення відсутні." msgid "The configuration is up to date." msgstr "Конфігурація є актуальною." +msgid "Obj file Import color" +msgstr "" + +msgid "Specify number of colors:" +msgstr "" + +#, c-format, boost-format +msgid "The color count should be in range [%d, %d]." +msgstr "" + +msgid "Recommended " +msgstr "" + +msgid "Current filament colors:" +msgstr "" + +msgid "Quick set:" +msgstr "" + +msgid "Color match" +msgstr "" + +msgid "Approximate color matching." +msgstr "" + +msgid "Append" +msgstr "" + +msgid "Add consumable extruder after existing extruders." +msgstr "" + +msgid "Reset mapped extruders." +msgstr "" + +msgid "Cluster colors" +msgstr "" + +msgid "Map Filament" +msgstr "" + +msgid "" +"Note:The color has been selected, you can choose OK \n" +" to continue or manually adjust it." +msgstr "" + +msgid "" +"Waring:The count of newly added and \n" +" current extruders exceeds 16." +msgstr "" + msgid "Auto-Calc" msgstr "Автокалькулятор" diff --git a/bbl/i18n/zh_cn/BambuStudio_zh_CN.po b/bbl/i18n/zh_cn/BambuStudio_zh_CN.po index 9ba483055..a7cd26c9e 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-22 16:06+0800\n" +"POT-Creation-Date: 2024-04-23 10:24+0800\n" "PO-Revision-Date: 2024-02-23 20:10+0800\n" "Last-Translator: Jiang Yue \n" "Language-Team: \n" @@ -630,11 +630,46 @@ msgstr "长度" msgid "Selection" msgstr "选择" +msgid " (Moving)" +msgstr "(活动的)" + +msgid "" +"Select 2 faces on objects and \n" +" make objects assemble together." +msgstr "" +"在两个物体上选择两个面 \n" +"并将物体组合在一起。" + +msgid "" +"Select 2 points or circles on objects and \n" +" specify distance between them." +msgstr "" +"在两个物体上选择两个点或圆 \n" +"并指定它们之间的距离。" + +msgid "Face" +msgstr "面" + +msgid " (Fixed)" +msgstr "(固定的)" + +msgid "Point" +msgstr "点" + msgid "" "Feature 1 has been reset, \n" "feature 2 has been feature 1" msgstr "特征1已经被重置，特征2变成特征1" +msgid "Warning:please select Plane's feature." +msgstr "警告:请选择面特征。" + +msgid "Warning:please select Point's or Circle's feature." +msgstr "警告:请选择点或圆特征。" + +msgid "Warning:please select two different mesh." +msgstr "警告:请选择两个不同的网格。" + msgid "Copy to clipboard" msgstr "复制到剪贴板" @@ -671,8 +706,23 @@ msgstr "绕中心旋转:" msgid "Parallel_distance:" msgstr "平行距离:" -msgid "Featue 2" -msgstr "特征2" +msgid "Flip by Face 2" +msgstr "通过面2翻转" + +msgid "Assemble" +msgstr "装配" + +msgid "Please confirm explosion ratio = 1 and select at least two volumes." +msgstr "请确保爆炸比例为1且至少选择两个网格。" + +msgid "Please select at least two volumes." +msgstr "请至少选择两个网格。" + +msgid "(Moving)" +msgstr "(活动的)" + +msgid "Point and point assembly" +msgstr "点和点装配" msgid "" "Due to ensuer_on_bed, assembly between \n" @@ -682,6 +732,9 @@ msgstr "" "由于对象必须在热床上，不同对象之间的 \n" "装配在3D视图也许不正确。推荐将它们组合在一起。" +msgid "Face and face assembly" +msgstr "面和面装配" + msgid "Brush size" msgstr "画刷尺寸" @@ -1158,9 +1211,6 @@ msgstr "从米转换" msgid "Restore to meter" msgstr "恢复到米" -msgid "Assemble" -msgstr "组合" - msgid "Assemble the selected objects to an object with multiple parts" msgstr "组合所选对象为一个多零件对象" @@ -6764,6 +6814,60 @@ msgstr "没有可用的更新。" msgid "The configuration is up to date." msgstr "当前配置已经是最新版本。" +msgid "Obj file Import color" +msgstr "Obj文件导入颜色" + +msgid "Specify number of colors:" +msgstr "指定颜色数量:" + +#, c-format, boost-format +msgid "The color count should be in range [%d, %d]." +msgstr "颜色数量范围应该是[%d, %d]。" + +msgid "Recommended " +msgstr "推荐" + +msgid "Current filament colors:" +msgstr "当前耗材丝颜色:" + +msgid "Quick set:" +msgstr "快捷设置:" + +msgid "Color match" +msgstr "颜色匹配" + +msgid "Approximate color matching." +msgstr "近似的颜色匹配。" + +msgid "Append" +msgstr "追加" + +msgid "Add consumable extruder after existing extruders." +msgstr "近似的颜色匹配。" + +msgid "Reset mapped extruders." +msgstr "重置匹配的耗材丝。" + +msgid "Cluster colors" +msgstr "重置匹配的耗材丝" + +msgid "Map Filament" +msgstr "匹配耗材丝" + +msgid "" +"Note:The color has been selected, you can choose OK \n" +" to continue or manually adjust it." +msgstr "" +"注意：颜色已经选好了，您可以选中确认 \n" +" 继续或手动修改它。" + +msgid "" +"Waring:The count of newly added and \n" +" current extruders exceeds 16." +msgstr "" +"警告：新增追加耗材丝数量 \n" +" 和已有耗材丝数量超过了16." + msgid "Auto-Calc" msgstr "自动计算" @@ -12151,6 +12255,9 @@ msgstr "" "避免翘曲\n" "您知道吗？打印ABS这类易翘曲材料时，适当提高热床温度可以降低翘曲的概率。" +#~ msgid "Featue 2" +#~ msgstr "特征2" + #~ msgid "Not Extruded Yet,Retry" #~ msgstr "耗材未挤出，重试" diff --git a/resources/i18n/ko/BambuStudio.mo b/resources/i18n/ko/BambuStudio.mo index 33230f760..4bcb9203b 100644 Binary files a/resources/i18n/ko/BambuStudio.mo and b/resources/i18n/ko/BambuStudio.mo differ diff --git a/resources/i18n/ru/BambuStudio.mo b/resources/i18n/ru/BambuStudio.mo index d912de6d4..e2ab0e198 100644 Binary files a/resources/i18n/ru/BambuStudio.mo and b/resources/i18n/ru/BambuStudio.mo differ diff --git a/resources/i18n/tr/BambuStudio.mo b/resources/i18n/tr/BambuStudio.mo index 994d04c42..cfe57636d 100644 Binary files a/resources/i18n/tr/BambuStudio.mo and b/resources/i18n/tr/BambuStudio.mo differ diff --git a/resources/i18n/zh_cn/BambuStudio.mo b/resources/i18n/zh_cn/BambuStudio.mo index c270ad36c..298075085 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/Gizmos/GLGizmoAssembly.cpp b/src/slic3r/GUI/Gizmos/GLGizmoAssembly.cpp index c0d3f81bf..c0c86b1ac 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoAssembly.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoAssembly.cpp @@ -31,13 +31,13 @@ std::string GLGizmoAssembly::on_get_name() const { if (!on_is_activable() && m_state == EState::Off) { if (wxGetApp().plater()->canvas3D()->get_canvas_type() == GLCanvas3D::ECanvasType::CanvasAssembleView) { - return _u8L("Assembly") + ":\n" + _u8L("Please confirm explosion ratio = 1 and select at least two volumes."); + return _u8L("Assemble") + ":\n" + _u8L("Please confirm explosion ratio = 1 and select at least two volumes."); } else { - return _u8L("Assembly") + ":\n" + _u8L("Please select at least two volumes."); + return _u8L("Assemble") + ":\n" + _u8L("Please select at least two volumes."); } } else { - return _u8L("Assembly"); + return _u8L("Assemble"); } } @@ -85,9 +85,9 @@ void GLGizmoAssembly::on_render_input_window(float x, float y, float bottom_limi init_render_input_window(); float moving_size = m_imgui->calc_text_size(_L("(Moving)")).x; - float combox_content_size = (m_imgui->calc_text_size(_L("Point and point")).x +ImGui::GetStyle().FramePadding.x * 2.0f); + float combox_content_size = (m_imgui->calc_text_size(_L("Point and point assembly")).x +ImGui::GetStyle().FramePadding.x * 2.0f); float caption_size = moving_size + 2 * m_space_size; - if (render_assembly_mode_combo(caption_size + 0.5 * m_space_size, 1.8 * combox_content_size)) { + if (render_assembly_mode_combo(caption_size + 0.5 * m_space_size, 2.0 * combox_content_size)) { ; } show_selection_ui(); @@ -141,7 +141,7 @@ bool GLGizmoAssembly::render_assembly_mode_combo(double label_width, float item_ { ImGui::AlignTextToFramePadding(); size_t selection_idx = int(m_assembly_mode); - std::vector modes = {_u8L("Face and face"), _u8L("Point and point")}; + std::vector modes = {_u8L("Face and face assembly"), _u8L("Point and point assembly")}; bool is_changed = false; ImGuiWrapper::push_combo_style(m_parent.get_scale()); diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp b/src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp index 7ea699ef8..74edb59f2 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp @@ -1796,7 +1796,7 @@ void GLGizmoMeasure::show_selection_ui() ImGui::AlignTextToFramePadding(); if (m_measure_mode == EMeasureMode::ONLY_ASSEMBLY) { if (m_assembly_mode == AssemblyMode::FACE_FACE) { - m_imgui->text(_u8L("Select 2 faces on objects and \n make the object assemble together.")); // tip + m_imgui->text(_u8L("Select 2 faces on objects and \n make objects assemble together.")); // tip } else if (m_assembly_mode == AssemblyMode::POINT_POINT) { m_imgui->text(_u8L("Select 2 points or circles on objects and \n specify distance between them.")); // tip } @@ -1870,6 +1870,9 @@ void GLGizmoMeasure::show_selection_ui() } } } + if (m_measure_mode == EMeasureMode::ONLY_ASSEMBLY && m_hit_different_volumes.size() == 1) { + m_imgui->text(_L("Warning:please select two different mesh.")); + } } void GLGizmoMeasure::show_distance_xyz_ui()