diff --git a/resources/localization/PrusaSlicer.pot b/resources/localization/PrusaSlicer.pot index b238da2dd..88f2b4158 100644 --- a/resources/localization/PrusaSlicer.pot +++ b/resources/localization/PrusaSlicer.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-18 15:00+0200\n" +"POT-Creation-Date: 2023-05-25 13:53+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -212,11 +212,11 @@ msgstr "" #: src/slic3r/GUI/ConfigWizard.cpp:1838 src/slic3r/GUI/ConfigWizard.cpp:1874 #: src/slic3r/GUI/ConfigWizard.cpp:1888 #: src/slic3r/GUI/ExtruderSequenceDialog.cpp:100 -#: src/slic3r/GUI/GCodeViewer.cpp:3452 src/slic3r/GUI/GCodeViewer.cpp:3458 -#: src/slic3r/GUI/GCodeViewer.cpp:3466 src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:234 -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:524 -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:544 -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:1850 +#: src/slic3r/GUI/GCodeViewer.cpp:3471 src/slic3r/GUI/GCodeViewer.cpp:3477 +#: src/slic3r/GUI/GCodeViewer.cpp:3485 src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:234 +#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:493 +#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:513 +#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:1819 #: src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp:1210 #: src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp:1976 #: src/slic3r/GUI/GUI_ObjectLayers.cpp:145 @@ -281,13 +281,14 @@ msgstr "" msgid "Circular" msgstr "" -#: src/slic3r/GUI/BedShapeDialog.cpp:81 +#: src/slic3r/GUI/BedShapeDialog.cpp:81 src/libslic3r/ExtrusionRole.cpp:51 +#: src/libslic3r/ExtrusionRole.cpp:85 msgid "Custom" msgstr "" #: src/slic3r/GUI/BedShapeDialog.cpp:104 src/slic3r/GUI/BedShapeDialog.cpp:182 #: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:221 -#: src/slic3r/GUI/GUI_ObjectList.cpp:1798 +#: src/slic3r/GUI/GUI_ObjectList.cpp:1804 msgid "Shape" msgstr "" @@ -299,7 +300,7 @@ msgstr "" msgid "Load shape from STL..." msgstr "" -#: src/slic3r/GUI/BedShapeDialog.cpp:252 src/slic3r/GUI/GCodeViewer.cpp:3917 +#: src/slic3r/GUI/BedShapeDialog.cpp:252 src/slic3r/GUI/GCodeViewer.cpp:3936 #: src/slic3r/GUI/MainFrame.cpp:2241 msgid "Settings" msgstr "" @@ -1034,7 +1035,7 @@ msgstr "" #. TRN ConfigWizard : Size of possible print, related on printer size #: src/slic3r/GUI/ConfigWizard.cpp:1797 -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:1858 +#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:1827 msgid "Build Volume" msgstr "" @@ -1229,7 +1230,7 @@ msgstr "" #: src/slic3r/GUI/FileArchiveDialog.cpp:277 #: src/slic3r/GUI/FileArchiveDialog.cpp:286 #: src/slic3r/GUI/FirmwareDialog.cpp:153 -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:1841 +#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:1810 #: src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp:2180 #: src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp:2269 #: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:66 @@ -1254,7 +1255,7 @@ msgid "Filament Profiles Selection" msgstr "" #: src/slic3r/GUI/ConfigWizard.cpp:3406 src/slic3r/GUI/ConfigWizard.cpp:3409 -#: src/slic3r/GUI/GUI_ObjectList.cpp:4361 +#: src/slic3r/GUI/GUI_ObjectList.cpp:4367 msgid "Type:" msgstr "" @@ -1334,7 +1335,7 @@ msgid "Perform" msgstr "" #: src/slic3r/GUI/DesktopIntegrationDialog.cpp:653 -#: src/slic3r/GUI/GLCanvas3D.cpp:5305 src/slic3r/GUI/KBShortcutsDialog.cpp:106 +#: src/slic3r/GUI/GLCanvas3D.cpp:5308 src/slic3r/GUI/KBShortcutsDialog.cpp:106 #: src/slic3r/GUI/MainFrame.cpp:1426 msgid "Undo" msgstr "" @@ -1720,10 +1721,10 @@ msgid "Can't create file at %1%" msgstr "" #: src/slic3r/GUI/ExtraRenderers.cpp:323 src/slic3r/GUI/GUI_ObjectList.cpp:582 -#: src/slic3r/GUI/GUI_ObjectList.cpp:594 src/slic3r/GUI/GUI_ObjectList.cpp:1058 -#: src/slic3r/GUI/GUI_ObjectList.cpp:2125 -#: src/slic3r/GUI/GUI_ObjectList.cpp:3025 -#: src/slic3r/GUI/GUI_ObjectList.cpp:4895 +#: src/slic3r/GUI/GUI_ObjectList.cpp:594 src/slic3r/GUI/GUI_ObjectList.cpp:1064 +#: src/slic3r/GUI/GUI_ObjectList.cpp:2131 +#: src/slic3r/GUI/GUI_ObjectList.cpp:3031 +#: src/slic3r/GUI/GUI_ObjectList.cpp:4901 #: src/slic3r/GUI/ObjectDataViewModel.cpp:259 src/libslic3r/PrintConfig.cpp:892 msgid "default" msgstr "" @@ -1975,7 +1976,7 @@ msgid "Add one or more custom shapes" msgstr "" #: src/slic3r/GUI/GalleryDialog.cpp:115 src/slic3r/GUI/GalleryDialog.cpp:528 -#: src/slic3r/GUI/GLCanvas3D.cpp:5106 src/slic3r/GUI/GUI_Factories.cpp:460 +#: src/slic3r/GUI/GLCanvas3D.cpp:5109 src/slic3r/GUI/GUI_Factories.cpp:460 #: src/slic3r/GUI/Tab.cpp:4160 msgid "Delete" msgstr "" @@ -2042,232 +2043,255 @@ msgstr "" msgid "Generating index buffers" msgstr "" -#: src/slic3r/GUI/GCodeViewer.cpp:3274 +#: src/slic3r/GUI/GCodeViewer.cpp:3276 src/libslic3r/PrintConfig.cpp:1171 +msgid "g" +msgstr "" + +#: src/slic3r/GUI/GCodeViewer.cpp:3277 src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:234 +#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:493 +#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:513 +#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:1819 +#: src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp:1210 +#: src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp:1976 +#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:309 +#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:433 +#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:554 +#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:555 +msgid "in" +msgstr "" + +#: src/slic3r/GUI/GCodeViewer.cpp:3278 +msgctxt "Metre" +msgid "m" +msgstr "" + +#: src/slic3r/GUI/GCodeViewer.cpp:3289 msgid "Click to hide" msgstr "" -#: src/slic3r/GUI/GCodeViewer.cpp:3274 +#: src/slic3r/GUI/GCodeViewer.cpp:3289 msgid "Click to show" msgstr "" -#: src/slic3r/GUI/GCodeViewer.cpp:3452 +#: src/slic3r/GUI/GCodeViewer.cpp:3471 msgid "up to" msgstr "" -#: src/slic3r/GUI/GCodeViewer.cpp:3458 +#: src/slic3r/GUI/GCodeViewer.cpp:3477 msgid "above" msgstr "" -#: src/slic3r/GUI/GCodeViewer.cpp:3466 +#: src/slic3r/GUI/GCodeViewer.cpp:3485 msgid "from" msgstr "" -#: src/slic3r/GUI/GCodeViewer.cpp:3466 +#: src/slic3r/GUI/GCodeViewer.cpp:3485 msgid "to" msgstr "" -#: src/slic3r/GUI/GCodeViewer.cpp:3516 src/slic3r/GUI/GCodeViewer.cpp:3517 -#: src/slic3r/GUI/GCodeViewer.cpp:3595 +#: src/slic3r/GUI/GCodeViewer.cpp:3535 src/slic3r/GUI/GCodeViewer.cpp:3536 +#: src/slic3r/GUI/GCodeViewer.cpp:3614 msgid "Percentage" msgstr "" -#: src/slic3r/GUI/GCodeViewer.cpp:3527 src/slic3r/GUI/GCodeViewer.cpp:3573 +#: src/slic3r/GUI/GCodeViewer.cpp:3546 src/slic3r/GUI/GCodeViewer.cpp:3592 msgid "Feature type" msgstr "" -#: src/slic3r/GUI/GCodeViewer.cpp:3527 src/slic3r/GUI/GCodeViewer.cpp:3595 +#: src/slic3r/GUI/GCodeViewer.cpp:3546 src/slic3r/GUI/GCodeViewer.cpp:3614 #: src/slic3r/GUI/RammingChart.cpp:90 msgid "Time" msgstr "" -#: src/slic3r/GUI/GCodeViewer.cpp:3574 +#: src/slic3r/GUI/GCodeViewer.cpp:3593 msgid "Height (mm)" msgstr "" -#: src/slic3r/GUI/GCodeViewer.cpp:3575 +#: src/slic3r/GUI/GCodeViewer.cpp:3594 msgid "Width (mm)" msgstr "" -#: src/slic3r/GUI/GCodeViewer.cpp:3576 +#: src/slic3r/GUI/GCodeViewer.cpp:3595 msgid "Speed (mm/s)" msgstr "" -#: src/slic3r/GUI/GCodeViewer.cpp:3577 +#: src/slic3r/GUI/GCodeViewer.cpp:3596 msgid "Fan speed (%)" msgstr "" -#: src/slic3r/GUI/GCodeViewer.cpp:3578 +#: src/slic3r/GUI/GCodeViewer.cpp:3597 msgid "Temperature (°C)" msgstr "" -#: src/slic3r/GUI/GCodeViewer.cpp:3579 +#: src/slic3r/GUI/GCodeViewer.cpp:3598 msgid "Volumetric flow rate (mm³/s)" msgstr "" -#: src/slic3r/GUI/GCodeViewer.cpp:3580 +#: src/slic3r/GUI/GCodeViewer.cpp:3599 msgid "Layer time (linear)" msgstr "" -#: src/slic3r/GUI/GCodeViewer.cpp:3581 +#: src/slic3r/GUI/GCodeViewer.cpp:3600 msgid "Layer time (logarithmic)" msgstr "" -#: src/slic3r/GUI/GCodeViewer.cpp:3582 +#: src/slic3r/GUI/GCodeViewer.cpp:3601 msgid "Tool" msgstr "" -#: src/slic3r/GUI/GCodeViewer.cpp:3583 +#: src/slic3r/GUI/GCodeViewer.cpp:3602 msgid "Color Print" msgstr "" -#: src/slic3r/GUI/GCodeViewer.cpp:3595 src/slic3r/GUI/GCodeViewer.cpp:3597 -#: src/slic3r/GUI/GCodeViewer.cpp:3863 +#: src/slic3r/GUI/GCodeViewer.cpp:3614 src/slic3r/GUI/GCodeViewer.cpp:3616 +#: src/slic3r/GUI/GCodeViewer.cpp:3882 msgid "Used filament" msgstr "" -#: src/slic3r/GUI/GCodeViewer.cpp:3626 src/slic3r/GUI/GCodeViewer.cpp:4073 +#: src/slic3r/GUI/GCodeViewer.cpp:3645 src/slic3r/GUI/GCodeViewer.cpp:4092 #: src/libslic3r/PrintConfig.cpp:1470 src/libslic3r/PrintConfig.cpp:3080 msgid "Travel" msgstr "" -#: src/slic3r/GUI/GCodeViewer.cpp:3643 src/slic3r/GUI/GCodeViewer.cpp:3688 -#: src/slic3r/GUI/GCodeViewer.cpp:3692 src/slic3r/GUI/GUI_ObjectList.cpp:349 -#: src/slic3r/GUI/Tab.cpp:1959 src/slic3r/GUI/wxExtensions.cpp:510 -#: src/libslic3r/PrintConfig.cpp:886 +#: src/slic3r/GUI/GCodeViewer.cpp:3662 src/slic3r/GUI/GCodeViewer.cpp:3707 +#: src/slic3r/GUI/GCodeViewer.cpp:3711 +#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:74 +#: src/slic3r/GUI/GUI_ObjectList.cpp:349 src/slic3r/GUI/Tab.cpp:1959 +#: src/slic3r/GUI/wxExtensions.cpp:510 src/libslic3r/PrintConfig.cpp:886 msgid "Extruder" msgstr "" -#: src/slic3r/GUI/GCodeViewer.cpp:3665 +#: src/slic3r/GUI/GCodeViewer.cpp:3684 msgid "Default color" msgstr "" -#: src/slic3r/GUI/GCodeViewer.cpp:3688 +#: src/slic3r/GUI/GCodeViewer.cpp:3707 msgid "default color" msgstr "" -#: src/slic3r/GUI/GCodeViewer.cpp:3788 src/slic3r/GUI/GCodeViewer.cpp:3844 +#: src/slic3r/GUI/GCodeViewer.cpp:3807 src/slic3r/GUI/GCodeViewer.cpp:3863 msgid "Color change" msgstr "" -#: src/slic3r/GUI/GCodeViewer.cpp:3807 src/slic3r/GUI/GCodeViewer.cpp:3842 +#: src/slic3r/GUI/GCodeViewer.cpp:3826 src/slic3r/GUI/GCodeViewer.cpp:3861 msgid "Print" msgstr "" -#: src/slic3r/GUI/GCodeViewer.cpp:3843 src/slic3r/GUI/GCodeViewer.cpp:3877 +#: src/slic3r/GUI/GCodeViewer.cpp:3862 src/slic3r/GUI/GCodeViewer.cpp:3896 msgid "Pause" msgstr "" -#: src/slic3r/GUI/GCodeViewer.cpp:3860 src/slic3r/GUI/GCodeViewer.cpp:3863 +#: src/slic3r/GUI/GCodeViewer.cpp:3879 src/slic3r/GUI/GCodeViewer.cpp:3882 msgid "Event" msgstr "" -#: src/slic3r/GUI/GCodeViewer.cpp:3860 src/slic3r/GUI/GCodeViewer.cpp:3863 +#: src/slic3r/GUI/GCodeViewer.cpp:3879 src/slic3r/GUI/GCodeViewer.cpp:3882 msgid "Remaining time" msgstr "" -#: src/slic3r/GUI/GCodeViewer.cpp:3860 src/slic3r/GUI/GCodeViewer.cpp:3863 +#: src/slic3r/GUI/GCodeViewer.cpp:3879 src/slic3r/GUI/GCodeViewer.cpp:3882 msgid "Duration" msgstr "" -#: src/slic3r/GUI/GCodeViewer.cpp:3931 src/slic3r/GUI/GUI.cpp:332 +#: src/slic3r/GUI/GCodeViewer.cpp:3950 src/slic3r/GUI/GUI.cpp:332 #: src/slic3r/GUI/Plater.cpp:855 src/libslic3r/PrintConfig.cpp:332 msgid "Printer" msgstr "" -#: src/slic3r/GUI/GCodeViewer.cpp:3934 src/slic3r/GUI/GUI.cpp:328 +#: src/slic3r/GUI/GCodeViewer.cpp:3953 src/slic3r/GUI/GUI.cpp:328 #: src/slic3r/GUI/Plater.cpp:851 msgid "Print settings" msgstr "" -#: src/slic3r/GUI/GCodeViewer.cpp:3939 src/slic3r/GUI/GUI.cpp:330 +#: src/slic3r/GUI/GCodeViewer.cpp:3958 src/slic3r/GUI/GUI.cpp:330 #: src/slic3r/GUI/Plater.cpp:852 src/slic3r/GUI/Tab.cpp:1998 #: src/slic3r/GUI/Tab.cpp:1999 msgid "Filament" msgstr "" -#: src/slic3r/GUI/GCodeViewer.cpp:3954 +#: src/slic3r/GUI/GCodeViewer.cpp:3973 msgid "Hide Custom G-code" msgstr "" -#: src/slic3r/GUI/GCodeViewer.cpp:3954 +#: src/slic3r/GUI/GCodeViewer.cpp:3973 msgid "Show Custom G-code" msgstr "" -#: src/slic3r/GUI/GCodeViewer.cpp:3967 +#: src/slic3r/GUI/GCodeViewer.cpp:3986 msgid "Estimated printing times" msgstr "" -#: src/slic3r/GUI/GCodeViewer.cpp:3986 +#: src/slic3r/GUI/GCodeViewer.cpp:4005 msgid "Normal mode" msgstr "" -#: src/slic3r/GUI/GCodeViewer.cpp:3987 +#: src/slic3r/GUI/GCodeViewer.cpp:4006 msgid "Stealth mode" msgstr "" -#: src/slic3r/GUI/GCodeViewer.cpp:3996 src/libslic3r/PrintConfig.cpp:1247 +#: src/slic3r/GUI/GCodeViewer.cpp:4015 src/libslic3r/PrintConfig.cpp:1247 #: src/libslic3r/PrintConfig.cpp:1265 src/libslic3r/PrintConfig.cpp:1275 #: src/libslic3r/PrintConfig.cpp:1320 msgid "First layer" msgstr "" -#: src/slic3r/GUI/GCodeViewer.cpp:4000 +#: src/slic3r/GUI/GCodeViewer.cpp:4019 msgid "Total" msgstr "" -#: src/slic3r/GUI/GCodeViewer.cpp:4019 +#: src/slic3r/GUI/GCodeViewer.cpp:4038 msgid "Show stealth mode" msgstr "" -#: src/slic3r/GUI/GCodeViewer.cpp:4023 +#: src/slic3r/GUI/GCodeViewer.cpp:4042 msgid "Show normal mode" msgstr "" -#: src/slic3r/GUI/GCodeViewer.cpp:4077 +#: src/slic3r/GUI/GCodeViewer.cpp:4096 msgid "Wipe" msgstr "" -#: src/slic3r/GUI/GCodeViewer.cpp:4081 +#: src/slic3r/GUI/GCodeViewer.cpp:4100 msgid "Retractions" msgstr "" -#: src/slic3r/GUI/GCodeViewer.cpp:4085 +#: src/slic3r/GUI/GCodeViewer.cpp:4104 msgid "Deretractions" msgstr "" -#: src/slic3r/GUI/GCodeViewer.cpp:4089 +#: src/slic3r/GUI/GCodeViewer.cpp:4108 msgid "Seams" msgstr "" -#: src/slic3r/GUI/GCodeViewer.cpp:4093 +#: src/slic3r/GUI/GCodeViewer.cpp:4112 msgid "Tool changes" msgstr "" -#: src/slic3r/GUI/GCodeViewer.cpp:4097 +#: src/slic3r/GUI/GCodeViewer.cpp:4116 msgid "Color changes" msgstr "" -#: src/slic3r/GUI/GCodeViewer.cpp:4101 +#: src/slic3r/GUI/GCodeViewer.cpp:4120 msgid "Print pauses" msgstr "" -#: src/slic3r/GUI/GCodeViewer.cpp:4105 +#: src/slic3r/GUI/GCodeViewer.cpp:4124 msgid "Custom G-codes" msgstr "" -#: src/slic3r/GUI/GCodeViewer.cpp:4109 +#: src/slic3r/GUI/GCodeViewer.cpp:4128 msgid "Center of gravity" msgstr "" -#: src/slic3r/GUI/GCodeViewer.cpp:4114 +#: src/slic3r/GUI/GCodeViewer.cpp:4133 msgid "Shells" msgstr "" -#: src/slic3r/GUI/GCodeViewer.cpp:4119 +#: src/slic3r/GUI/GCodeViewer.cpp:4138 msgid "Tool marker" msgstr "" -#: src/slic3r/GUI/GLCanvas3D.cpp:185 src/slic3r/GUI/GLCanvas3D.cpp:5252 +#: src/slic3r/GUI/GLCanvas3D.cpp:185 src/slic3r/GUI/GLCanvas3D.cpp:5255 #: src/slic3r/GUI/ObjectDataViewModel.cpp:71 msgid "Variable layer height" msgstr "" @@ -2336,7 +2360,7 @@ msgstr "" msgid "Keep min" msgstr "" -#: src/slic3r/GUI/GLCanvas3D.cpp:255 src/slic3r/GUI/GLCanvas3D.cpp:4677 +#: src/slic3r/GUI/GLCanvas3D.cpp:255 src/slic3r/GUI/GLCanvas3D.cpp:4680 msgid "Reset" msgstr "" @@ -2376,7 +2400,7 @@ msgstr "" msgid "Mirror Object" msgstr "" -#: src/slic3r/GUI/GLCanvas3D.cpp:2981 src/slic3r/GUI/Gizmos/GLGizmoMove.cpp:91 +#: src/slic3r/GUI/GLCanvas3D.cpp:2981 src/slic3r/GUI/Gizmos/GLGizmoMove.cpp:78 msgid "Gizmo-Move" msgstr "" @@ -2385,209 +2409,209 @@ msgstr "" msgid "Gizmo-Rotate" msgstr "" -#: src/slic3r/GUI/GLCanvas3D.cpp:3717 +#: src/slic3r/GUI/GLCanvas3D.cpp:3720 msgid "Move Object" msgstr "" -#: src/slic3r/GUI/GLCanvas3D.cpp:3966 +#: src/slic3r/GUI/GLCanvas3D.cpp:3969 #: src/slic3r/GUI/Gizmos/GLGizmoFlatten.cpp:33 msgid "Gizmo-Place on Face" msgstr "" -#: src/slic3r/GUI/GLCanvas3D.cpp:4340 src/slic3r/GUI/GLCanvas3D.cpp:5212 +#: src/slic3r/GUI/GLCanvas3D.cpp:4343 src/slic3r/GUI/GLCanvas3D.cpp:5215 msgid "Switch to Settings" msgstr "" -#: src/slic3r/GUI/GLCanvas3D.cpp:4341 src/slic3r/GUI/GLCanvas3D.cpp:5212 +#: src/slic3r/GUI/GLCanvas3D.cpp:4344 src/slic3r/GUI/GLCanvas3D.cpp:5215 msgid "Print Settings Tab" msgstr "" -#: src/slic3r/GUI/GLCanvas3D.cpp:4342 src/slic3r/GUI/GLCanvas3D.cpp:5213 +#: src/slic3r/GUI/GLCanvas3D.cpp:4345 src/slic3r/GUI/GLCanvas3D.cpp:5216 msgid "Filament Settings Tab" msgstr "" -#: src/slic3r/GUI/GLCanvas3D.cpp:4342 src/slic3r/GUI/GLCanvas3D.cpp:5213 +#: src/slic3r/GUI/GLCanvas3D.cpp:4345 src/slic3r/GUI/GLCanvas3D.cpp:5216 msgid "Material Settings Tab" msgstr "" -#: src/slic3r/GUI/GLCanvas3D.cpp:4343 src/slic3r/GUI/GLCanvas3D.cpp:5214 +#: src/slic3r/GUI/GLCanvas3D.cpp:4346 src/slic3r/GUI/GLCanvas3D.cpp:5217 msgid "Printer Settings Tab" msgstr "" -#: src/slic3r/GUI/GLCanvas3D.cpp:4516 +#: src/slic3r/GUI/GLCanvas3D.cpp:4519 msgid "Undo History" msgstr "" -#: src/slic3r/GUI/GLCanvas3D.cpp:4516 +#: src/slic3r/GUI/GLCanvas3D.cpp:4519 msgid "Redo History" msgstr "" -#: src/slic3r/GUI/GLCanvas3D.cpp:4536 +#: src/slic3r/GUI/GLCanvas3D.cpp:4539 #, possible-c-format, possible-boost-format msgid "Undo %1$d Action" msgid_plural "Undo %1$d Actions" msgstr[0] "" msgstr[1] "" -#: src/slic3r/GUI/GLCanvas3D.cpp:4536 +#: src/slic3r/GUI/GLCanvas3D.cpp:4539 #, possible-c-format, possible-boost-format msgid "Redo %1$d Action" msgid_plural "Redo %1$d Actions" msgstr[0] "" msgstr[1] "" -#: src/slic3r/GUI/GLCanvas3D.cpp:4555 src/slic3r/GUI/GLCanvas3D.cpp:5230 +#: src/slic3r/GUI/GLCanvas3D.cpp:4558 src/slic3r/GUI/GLCanvas3D.cpp:5233 #: src/slic3r/GUI/KBShortcutsDialog.cpp:115 src/slic3r/GUI/Search.cpp:482 msgid "Search" msgstr "" -#: src/slic3r/GUI/GLCanvas3D.cpp:4569 src/slic3r/GUI/GLCanvas3D.cpp:4577 +#: src/slic3r/GUI/GLCanvas3D.cpp:4572 src/slic3r/GUI/GLCanvas3D.cpp:4580 #: src/slic3r/GUI/Search.cpp:488 msgid "Enter a search term" msgstr "" -#: src/slic3r/GUI/GLCanvas3D.cpp:4609 +#: src/slic3r/GUI/GLCanvas3D.cpp:4612 msgid "Arrange options" msgstr "" -#: src/slic3r/GUI/GLCanvas3D.cpp:4644 +#: src/slic3r/GUI/GLCanvas3D.cpp:4647 #, possible-boost-format msgid "Press %1%left mouse button to enter the exact value" msgstr "" -#: src/slic3r/GUI/GLCanvas3D.cpp:4646 +#: src/slic3r/GUI/GLCanvas3D.cpp:4649 msgid "Spacing" msgstr "" -#: src/slic3r/GUI/GLCanvas3D.cpp:4653 +#: src/slic3r/GUI/GLCanvas3D.cpp:4656 msgid "Spacing from bed" msgstr "" -#: src/slic3r/GUI/GLCanvas3D.cpp:4660 +#: src/slic3r/GUI/GLCanvas3D.cpp:4663 msgid "Enable rotations (slow)" msgstr "" -#: src/slic3r/GUI/GLCanvas3D.cpp:4669 +#: src/slic3r/GUI/GLCanvas3D.cpp:4672 msgid "Alignment" msgstr "" -#: src/slic3r/GUI/GLCanvas3D.cpp:4669 src/libslic3r/PrintConfig.cpp:4761 +#: src/slic3r/GUI/GLCanvas3D.cpp:4672 src/libslic3r/PrintConfig.cpp:4761 msgid "Center" msgstr "" -#: src/slic3r/GUI/GLCanvas3D.cpp:4669 +#: src/slic3r/GUI/GLCanvas3D.cpp:4672 msgid "Rear left" msgstr "" -#: src/slic3r/GUI/GLCanvas3D.cpp:4669 +#: src/slic3r/GUI/GLCanvas3D.cpp:4672 msgid "Front left" msgstr "" -#: src/slic3r/GUI/GLCanvas3D.cpp:4669 +#: src/slic3r/GUI/GLCanvas3D.cpp:4672 msgid "Front right" msgstr "" -#: src/slic3r/GUI/GLCanvas3D.cpp:4669 +#: src/slic3r/GUI/GLCanvas3D.cpp:4672 msgid "Rear right" msgstr "" -#: src/slic3r/GUI/GLCanvas3D.cpp:4669 src/libslic3r/PrintConfig.cpp:2305 +#: src/slic3r/GUI/GLCanvas3D.cpp:4672 src/libslic3r/PrintConfig.cpp:2305 msgid "Random" msgstr "" -#: src/slic3r/GUI/GLCanvas3D.cpp:4696 src/slic3r/GUI/GLCanvas3D.cpp:5124 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:141 src/slic3r/GUI/Plater.cpp:7175 +#: src/slic3r/GUI/GLCanvas3D.cpp:4699 src/slic3r/GUI/GLCanvas3D.cpp:5127 +#: src/slic3r/GUI/KBShortcutsDialog.cpp:141 src/slic3r/GUI/Plater.cpp:7179 msgid "Arrange" msgstr "" -#: src/slic3r/GUI/GLCanvas3D.cpp:5098 +#: src/slic3r/GUI/GLCanvas3D.cpp:5101 msgid "Add..." msgstr "" -#: src/slic3r/GUI/GLCanvas3D.cpp:5115 src/slic3r/GUI/KBShortcutsDialog.cpp:105 +#: src/slic3r/GUI/GLCanvas3D.cpp:5118 src/slic3r/GUI/KBShortcutsDialog.cpp:105 #: src/slic3r/GUI/Plater.cpp:6044 src/slic3r/GUI/Tab.cpp:4570 msgid "Delete all" msgstr "" -#: src/slic3r/GUI/GLCanvas3D.cpp:5124 src/slic3r/GUI/KBShortcutsDialog.cpp:142 +#: src/slic3r/GUI/GLCanvas3D.cpp:5127 src/slic3r/GUI/KBShortcutsDialog.cpp:142 msgid "Arrange selection" msgstr "" -#: src/slic3r/GUI/GLCanvas3D.cpp:5124 +#: src/slic3r/GUI/GLCanvas3D.cpp:5127 msgid "Click right mouse button to show arrangement options" msgstr "" -#: src/slic3r/GUI/GLCanvas3D.cpp:5144 +#: src/slic3r/GUI/GLCanvas3D.cpp:5147 msgid "Copy" msgstr "" -#: src/slic3r/GUI/GLCanvas3D.cpp:5153 +#: src/slic3r/GUI/GLCanvas3D.cpp:5156 msgid "Paste" msgstr "" -#: src/slic3r/GUI/GLCanvas3D.cpp:5165 src/slic3r/GUI/GUI_Factories.cpp:1246 +#: src/slic3r/GUI/GLCanvas3D.cpp:5168 src/slic3r/GUI/GUI_Factories.cpp:1246 #: src/slic3r/GUI/GUI_Factories.cpp:1270 src/slic3r/GUI/GUI_Factories.cpp:1281 msgid "Add instance" msgstr "" -#: src/slic3r/GUI/GLCanvas3D.cpp:5176 src/slic3r/GUI/GUI_Factories.cpp:1249 +#: src/slic3r/GUI/GLCanvas3D.cpp:5179 src/slic3r/GUI/GUI_Factories.cpp:1249 msgid "Remove instance" msgstr "" -#: src/slic3r/GUI/GLCanvas3D.cpp:5189 +#: src/slic3r/GUI/GLCanvas3D.cpp:5192 msgid "Split to objects" msgstr "" -#: src/slic3r/GUI/GLCanvas3D.cpp:5199 +#: src/slic3r/GUI/GLCanvas3D.cpp:5202 msgid "Split to parts" msgstr "" -#: src/slic3r/GUI/GLCanvas3D.cpp:5305 src/slic3r/GUI/GLCanvas3D.cpp:5342 +#: src/slic3r/GUI/GLCanvas3D.cpp:5308 src/slic3r/GUI/GLCanvas3D.cpp:5345 msgid "Click right mouse button to open/close History" msgstr "" -#: src/slic3r/GUI/GLCanvas3D.cpp:5327 +#: src/slic3r/GUI/GLCanvas3D.cpp:5330 #, possible-boost-format msgid "Next Undo action: %1%" msgstr "" -#: src/slic3r/GUI/GLCanvas3D.cpp:5342 src/slic3r/GUI/KBShortcutsDialog.cpp:107 +#: src/slic3r/GUI/GLCanvas3D.cpp:5345 src/slic3r/GUI/KBShortcutsDialog.cpp:107 #: src/slic3r/GUI/MainFrame.cpp:1429 msgid "Redo" msgstr "" -#: src/slic3r/GUI/GLCanvas3D.cpp:5363 +#: src/slic3r/GUI/GLCanvas3D.cpp:5366 #, possible-boost-format msgid "Next Redo action: %1%" msgstr "" -#: src/slic3r/GUI/GLCanvas3D.cpp:7251 +#: src/slic3r/GUI/GLCanvas3D.cpp:7256 msgid "An object outside the print area was detected." msgstr "" -#: src/slic3r/GUI/GLCanvas3D.cpp:7252 +#: src/slic3r/GUI/GLCanvas3D.cpp:7257 msgid "A toolpath outside the print area was detected." msgstr "" -#: src/slic3r/GUI/GLCanvas3D.cpp:7253 +#: src/slic3r/GUI/GLCanvas3D.cpp:7258 msgid "SLA supports outside the print area were detected." msgstr "" -#: src/slic3r/GUI/GLCanvas3D.cpp:7254 +#: src/slic3r/GUI/GLCanvas3D.cpp:7259 msgid "Some objects are not visible during editing." msgstr "" -#: src/slic3r/GUI/GLCanvas3D.cpp:7256 +#: src/slic3r/GUI/GLCanvas3D.cpp:7261 msgid "" "An object outside the print area was detected.\n" "Resolve the current problem to continue slicing." msgstr "" -#: src/slic3r/GUI/GLCanvas3D.cpp:7331 +#: src/slic3r/GUI/GLCanvas3D.cpp:7336 msgid "Selection-Add from rectangle" msgstr "" -#: src/slic3r/GUI/GLCanvas3D.cpp:7346 +#: src/slic3r/GUI/GLCanvas3D.cpp:7351 msgid "Selection-Remove from rectangle" msgstr "" @@ -2664,28 +2688,15 @@ msgstr "" msgid "Depth" msgstr "" -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:234 -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:524 -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:544 -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:1850 -#: src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp:1210 -#: src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp:1976 -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:309 -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:433 -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:554 -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:555 -msgid "in" -msgstr "" - #: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:237 -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:2046 -#: src/slic3r/GUI/GUI_ObjectList.cpp:4147 -#: src/slic3r/GUI/GUI_ObjectList.cpp:4339 +#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:2015 +#: src/slic3r/GUI/GUI_ObjectList.cpp:4153 +#: src/slic3r/GUI/GUI_ObjectList.cpp:4345 msgid "Part" msgstr "" #: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:237 -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:2046 +#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:2015 msgid "Object" msgstr "" @@ -2708,180 +2719,180 @@ msgid "°" msgstr "" #: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:382 -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:587 -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:1235 +#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:556 +#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:1204 msgid "Move cut plane" msgstr "" -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:560 +#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:529 msgid "Value" msgstr "" -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:565 +#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:534 msgid "Tolerance" msgstr "" -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:853 -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:856 -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:857 +#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:822 +#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:825 +#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:826 #: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1265 #: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1268 #: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1269 msgid "Left click" msgstr "" -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:853 -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:2803 +#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:822 +#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:2772 msgid "Add connector" msgstr "" -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:854 +#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:823 #: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1266 msgid "Right click" msgstr "" -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:854 +#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:823 msgid "Remove connector" msgstr "" -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:855 +#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:824 #: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1267 #: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1270 #: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1271 msgid "Drag" msgstr "" -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:855 -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:1219 +#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:824 +#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:1188 msgid "Move connector" msgstr "" -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:856 +#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:825 msgid "Add connector to selection" msgstr "" -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:857 +#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:826 msgid "Remove connector from selection" msgstr "" -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:858 +#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:827 msgid "Select all connectors" msgstr "" -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:882 src/libslic3r/PrintConfig.cpp:4739 +#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:851 src/libslic3r/PrintConfig.cpp:4739 msgid "Cut" msgstr "" -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:1230 +#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:1199 msgid "Rotate cut plane" msgstr "" -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:1789 +#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:1758 msgid "Remove connectors" msgstr "" -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:1834 +#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:1803 msgid "Confirm connectors" msgstr "" -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:1903 -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:1942 +#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:1872 +#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:1911 msgid "Flip cut plane" msgstr "" -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:1986 +#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:1955 msgid "Hold SHIFT key to draw a cut line" msgstr "" -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:1992 +#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:1961 msgid "Cut position" msgstr "" -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:2001 +#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:1970 msgid "Reset cutting plane" msgstr "" -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:2013 +#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:1982 msgid "Edit connectors" msgstr "" -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:2013 +#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:1982 msgid "Add connectors" msgstr "" -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:2020 +#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:1989 msgid "Reset cut" msgstr "" -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:2021 +#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:1990 msgid "Reset cutting plane and remove connectors" msgstr "" -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:2076 +#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:2045 msgid "Cut result" msgstr "" -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:2096 +#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:2065 msgid "Cut into" msgstr "" #. TRN CutGizmo: RadioButton Cut into ... -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:2103 +#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:2072 msgid "Objects" msgstr "" #. TRN CutGizmo: RadioButton Cut into ... -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:2107 +#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:2076 msgid "Parts" msgstr "" -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:2121 +#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:2090 msgid "Perform cut" msgstr "" -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:2219 +#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:2188 msgid "Invalid connectors detected" msgstr "" -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:2221 +#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:2190 #, possible-c-format, possible-boost-format msgid "%1$d connector is out of cut contour" msgid_plural "%1$d connectors are out of cut contour" msgstr[0] "" msgstr[1] "" -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:2224 +#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:2193 #, possible-c-format, possible-boost-format msgid "%1$d connector is out of object" msgid_plural "%1$d connectors are out of object" msgstr[0] "" msgstr[1] "" -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:2227 +#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:2196 msgid "Some connectors are overlapped" msgstr "" -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:2231 +#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:2200 msgid "Select at least one object to keep after cutting." msgstr "" -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:2233 +#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:2202 msgid "Cut plane is placed out of object" msgstr "" -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:2470 +#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:2439 msgid "Connector" msgstr "" -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:2511 +#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:2480 msgid "Cut by Plane" msgstr "" -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:2778 +#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:2747 msgid "Cut by line" msgstr "" -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:2829 +#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:2798 msgid "Delete connector" msgstr "" @@ -2986,7 +2997,7 @@ msgstr "" #: src/slic3r/GUI/GUI_Factories.cpp:138 src/slic3r/GUI/Tab.cpp:1444 #: src/slic3r/GUI/Tab.cpp:1479 src/slic3r/GUI/Tab.cpp:1619 #: src/slic3r/GUI/Tab.cpp:1623 src/slic3r/GUI/Tab.cpp:2069 -#: src/slic3r/GUI/Tab.cpp:2537 src/slic3r/GUI/Tab.cpp:5189 +#: src/slic3r/GUI/Tab.cpp:2537 src/slic3r/GUI/Tab.cpp:5188 #: src/libslic3r/PrintConfig.cpp:273 src/libslic3r/PrintConfig.cpp:511 #: src/libslic3r/PrintConfig.cpp:1491 src/libslic3r/PrintConfig.cpp:1573 #: src/libslic3r/PrintConfig.cpp:1620 src/libslic3r/PrintConfig.cpp:2582 @@ -3037,7 +3048,7 @@ msgid "No symbol" msgstr "" #: src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp:1775 -#: src/slic3r/GUI/GUI_ObjectList.cpp:1602 src/slic3r/GUI/Plater.cpp:2447 +#: src/slic3r/GUI/GUI_ObjectList.cpp:1608 src/slic3r/GUI/Plater.cpp:2447 msgid "Loading" msgstr "" @@ -3074,7 +3085,7 @@ msgid "Click to change text into object part." msgstr "" #: src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp:2098 -#: src/slic3r/GUI/GUI_ObjectList.cpp:4329 +#: src/slic3r/GUI/GUI_ObjectList.cpp:4335 msgid "You can't change a type of the last solid part of the object." msgstr "" @@ -3088,7 +3099,7 @@ msgid "Click to change part type into negative volume." msgstr "" #: src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp:2111 -#: src/slic3r/GUI/GUI_ObjectList.cpp:4346 +#: src/slic3r/GUI/GUI_ObjectList.cpp:4352 msgid "Modifier" msgstr "" @@ -3490,12 +3501,12 @@ msgid "" msgstr "" #: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:232 -#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:371 +#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:373 msgid "Paints facets according to the chosen painting brush." msgstr "" #: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:240 -#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:384 +#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:386 msgid "" "Paints neighboring facets whose relative angle is less or equal to set angle." msgstr "" @@ -3506,26 +3517,26 @@ msgid "Allows painting only on facets selected by: \"%1%\"" msgstr "" #: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:259 -#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:412 +#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:414 #: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:141 msgid "Paints all facets inside, regardless of their orientation." msgstr "" #: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:268 -#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:421 +#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:423 #: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:149 msgid "Ignores facets facing away from the camera." msgstr "" #: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:277 -#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:430 +#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:432 msgid "Paints only one facet." msgstr "" #: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:285 #: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:300 -#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:438 -#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:455 +#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:440 +#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:457 #: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:129 msgid "Alt + Mouse wheel" msgstr "" @@ -3535,13 +3546,13 @@ msgid "Splits bigger facets into smaller ones while the object is painted." msgstr "" #: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:323 -#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:476 +#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:478 #: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:167 msgid "Ctrl + Mouse wheel" msgstr "" #: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:328 -#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:481 +#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:483 #: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:172 msgid "Reset selection" msgstr "" @@ -3839,7 +3850,7 @@ msgid "Second color" msgstr "" #: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:115 -#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:642 +#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:644 msgid "Remove painted color" msgstr "" @@ -3851,15 +3862,15 @@ msgstr "" msgid "Bucket fill" msgstr "" -#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:397 +#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:399 msgid "Paints neighboring facets that have the same color." msgstr "" -#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:443 +#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:445 msgid "Split bigger facets into smaller ones while the object is painted." msgstr "" -#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:645 +#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:647 #, possible-boost-format msgid "Painted using: Extruder %1%" msgstr "" @@ -4774,6 +4785,7 @@ msgstr "" #: src/slic3r/GUI/GUI_Factories.cpp:56 src/slic3r/GUI/GUI_Factories.cpp:131 #: src/slic3r/GUI/Tab.cpp:1501 src/slic3r/GUI/Tab.cpp:1503 +#: src/libslic3r/ExtrusionRole.cpp:48 src/libslic3r/ExtrusionRole.cpp:79 #: src/libslic3r/PrintConfig.cpp:771 src/libslic3r/PrintConfig.cpp:2133 #: src/libslic3r/PrintConfig.cpp:2142 src/libslic3r/PrintConfig.cpp:2151 #: src/libslic3r/PrintConfig.cpp:2161 src/libslic3r/PrintConfig.cpp:2170 @@ -4806,6 +4818,7 @@ msgid "Pad and Support" msgstr "" #: src/slic3r/GUI/GUI_Factories.cpp:129 src/slic3r/GUI/Tab.cpp:1467 +#: src/libslic3r/ExtrusionRole.cpp:44 src/libslic3r/ExtrusionRole.cpp:71 #: src/libslic3r/PrintConfig.cpp:1627 src/libslic3r/PrintConfig.cpp:1633 #: src/libslic3r/PrintConfig.cpp:1645 src/libslic3r/PrintConfig.cpp:1655 #: src/libslic3r/PrintConfig.cpp:1663 src/libslic3r/PrintConfig.cpp:1665 @@ -4867,8 +4880,8 @@ msgid "Supports" msgstr "" #: src/slic3r/GUI/GUI_Factories.cpp:141 src/slic3r/GUI/Plater.cpp:592 -#: src/slic3r/GUI/Tab.cpp:5164 src/slic3r/GUI/Tab.cpp:5165 -#: src/slic3r/GUI/Tab.cpp:5230 src/libslic3r/PrintConfig.cpp:3962 +#: src/slic3r/GUI/Tab.cpp:5163 src/slic3r/GUI/Tab.cpp:5164 +#: src/slic3r/GUI/Tab.cpp:5229 src/libslic3r/PrintConfig.cpp:3962 #: src/libslic3r/PrintConfig.cpp:3969 src/libslic3r/PrintConfig.cpp:3983 #: src/libslic3r/PrintConfig.cpp:3994 src/libslic3r/PrintConfig.cpp:4004 #: src/libslic3r/PrintConfig.cpp:4026 src/libslic3r/PrintConfig.cpp:4037 @@ -4878,8 +4891,8 @@ msgstr "" msgid "Pad" msgstr "" -#: src/slic3r/GUI/GUI_Factories.cpp:142 src/slic3r/GUI/Tab.cpp:5182 -#: src/slic3r/GUI/Tab.cpp:5183 src/libslic3r/SLA/Hollowing.cpp:82 +#: src/slic3r/GUI/GUI_Factories.cpp:142 src/slic3r/GUI/Tab.cpp:5181 +#: src/slic3r/GUI/Tab.cpp:5182 src/libslic3r/SLA/Hollowing.cpp:82 #: src/libslic3r/SLA/Hollowing.cpp:87 src/libslic3r/SLA/Hollowing.cpp:102 #: src/libslic3r/SLA/Hollowing.cpp:111 src/libslic3r/PrintConfig.cpp:4090 #: src/libslic3r/PrintConfig.cpp:4097 src/libslic3r/PrintConfig.cpp:4107 @@ -4984,8 +4997,8 @@ msgstr "" msgid "Printable" msgstr "" -#: src/slic3r/GUI/GUI_Factories.cpp:763 src/slic3r/GUI/GUI_ObjectList.cpp:2070 -#: src/slic3r/GUI/GUI_ObjectList.cpp:2582 +#: src/slic3r/GUI/GUI_Factories.cpp:763 src/slic3r/GUI/GUI_ObjectList.cpp:2076 +#: src/slic3r/GUI/GUI_ObjectList.cpp:2588 msgid "Invalidate cut info" msgstr "" @@ -5017,9 +5030,10 @@ msgstr "" msgid "Set extruder for selected items" msgstr "" -#: src/slic3r/GUI/GUI_Factories.cpp:870 src/slic3r/Utils/Repetier.cpp:145 -#: src/slic3r/Utils/Repetier.cpp:226 src/libslic3r/PrintConfig.cpp:736 -#: src/libslic3r/PrintConfig.cpp:2810 src/libslic3r/PrintConfig.cpp:3927 +#: src/slic3r/GUI/GUI_Factories.cpp:870 src/slic3r/GUI/Tab.cpp:5157 +#: src/slic3r/Utils/Repetier.cpp:145 src/slic3r/Utils/Repetier.cpp:226 +#: src/libslic3r/PrintConfig.cpp:736 src/libslic3r/PrintConfig.cpp:2810 +#: src/libslic3r/PrintConfig.cpp:3927 msgid "Default" msgstr "" @@ -5031,23 +5045,23 @@ msgstr "" msgid "Scale the selected object to fit the print volume" msgstr "" -#: src/slic3r/GUI/GUI_Factories.cpp:929 src/slic3r/GUI/Plater.cpp:6225 +#: src/slic3r/GUI/GUI_Factories.cpp:929 src/slic3r/GUI/Plater.cpp:6229 msgid "Convert from imperial units" msgstr "" -#: src/slic3r/GUI/GUI_Factories.cpp:930 src/slic3r/GUI/Plater.cpp:6226 +#: src/slic3r/GUI/GUI_Factories.cpp:930 src/slic3r/GUI/Plater.cpp:6230 msgid "Revert conversion from imperial units" msgstr "" -#: src/slic3r/GUI/GUI_Factories.cpp:931 src/slic3r/GUI/Plater.cpp:6227 +#: src/slic3r/GUI/GUI_Factories.cpp:931 src/slic3r/GUI/Plater.cpp:6231 msgid "Convert from meters" msgstr "" -#: src/slic3r/GUI/GUI_Factories.cpp:932 src/slic3r/GUI/Plater.cpp:6227 +#: src/slic3r/GUI/GUI_Factories.cpp:932 src/slic3r/GUI/Plater.cpp:6231 msgid "Revert conversion from meters" msgstr "" -#: src/slic3r/GUI/GUI_Factories.cpp:953 src/slic3r/GUI/GUI_ObjectList.cpp:2290 +#: src/slic3r/GUI/GUI_Factories.cpp:953 src/slic3r/GUI/GUI_ObjectList.cpp:2296 #: src/libslic3r/PrintConfig.cpp:4784 msgid "Merge" msgstr "" @@ -5096,7 +5110,7 @@ msgstr "" msgid "Ability to change text, font, size, ..." msgstr "" -#: src/slic3r/GUI/GUI_Factories.cpp:1030 src/slic3r/GUI/GUI_ObjectList.cpp:1793 +#: src/slic3r/GUI/GUI_Factories.cpp:1030 src/slic3r/GUI/GUI_ObjectList.cpp:1799 msgid "Add Shape" msgstr "" @@ -5271,248 +5285,248 @@ msgstr "" msgid "Rename Sub-object" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:1327 -#: src/slic3r/GUI/GUI_ObjectList.cpp:4597 +#: src/slic3r/GUI/GUI_ObjectList.cpp:1333 +#: src/slic3r/GUI/GUI_ObjectList.cpp:4603 msgid "Instances to Separated Objects" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:1333 +#: src/slic3r/GUI/GUI_ObjectList.cpp:1339 msgid "Volumes in Object reordered" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:1333 +#: src/slic3r/GUI/GUI_ObjectList.cpp:1339 msgid "Object reordered" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:1383 +#: src/slic3r/GUI/GUI_ObjectList.cpp:1389 msgid "Add Settings for Layers" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:1384 +#: src/slic3r/GUI/GUI_ObjectList.cpp:1390 msgid "Add Settings for Sub-object" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:1385 +#: src/slic3r/GUI/GUI_ObjectList.cpp:1391 msgid "Add Settings for Object" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:1424 +#: src/slic3r/GUI/GUI_ObjectList.cpp:1430 msgid "Add Settings Bundle for Height range" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:1425 +#: src/slic3r/GUI/GUI_ObjectList.cpp:1431 msgid "Add Settings Bundle for Sub-object" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:1426 +#: src/slic3r/GUI/GUI_ObjectList.cpp:1432 msgid "Add Settings Bundle for Object" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:1506 +#: src/slic3r/GUI/GUI_ObjectList.cpp:1512 msgid "Load Part" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:1506 +#: src/slic3r/GUI/GUI_ObjectList.cpp:1512 msgid "Load Modifier" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:1633 src/slic3r/GUI/Plater.cpp:2488 +#: src/slic3r/GUI/GUI_ObjectList.cpp:1639 src/slic3r/GUI/Plater.cpp:2488 msgid "Loading file" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:1641 +#: src/slic3r/GUI/GUI_ObjectList.cpp:1647 msgid "Error!" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:1731 +#: src/slic3r/GUI/GUI_ObjectList.cpp:1737 msgid "Add Generic Subobject" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:1761 +#: src/slic3r/GUI/GUI_ObjectList.cpp:1767 msgid "Generic" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:1826 +#: src/slic3r/GUI/GUI_ObjectList.cpp:1832 msgid "Add Shape from Gallery" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:1826 +#: src/slic3r/GUI/GUI_ObjectList.cpp:1832 msgid "Add Shapes from Gallery" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:1946 +#: src/slic3r/GUI/GUI_ObjectList.cpp:1952 msgid "Remove paint-on supports" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:1953 +#: src/slic3r/GUI/GUI_ObjectList.cpp:1959 msgid "Remove paint-on seam" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:1967 +#: src/slic3r/GUI/GUI_ObjectList.cpp:1973 msgid "Remove Multi Material painting" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:1973 +#: src/slic3r/GUI/GUI_ObjectList.cpp:1979 msgid "Shift objects to bed" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:1979 +#: src/slic3r/GUI/GUI_ObjectList.cpp:1985 msgid "Remove variable layer height" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:2000 +#: src/slic3r/GUI/GUI_ObjectList.cpp:2006 msgid "Delete Settings" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:2024 +#: src/slic3r/GUI/GUI_ObjectList.cpp:2030 msgid "Delete All Instances from Object" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:2040 +#: src/slic3r/GUI/GUI_ObjectList.cpp:2046 msgid "Delete Height Range" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:2058 +#: src/slic3r/GUI/GUI_ObjectList.cpp:2064 msgid "Delete connector from object which is a part of cut" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:2059 +#: src/slic3r/GUI/GUI_ObjectList.cpp:2065 msgid "Delete solid part from object which is a part of cut" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:2060 +#: src/slic3r/GUI/GUI_ObjectList.cpp:2066 msgid "Delete negative volume from object which is a part of cut" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:2062 +#: src/slic3r/GUI/GUI_ObjectList.cpp:2068 msgid "" "To save cut information you can delete all connectors from all related " "objects." msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:2065 +#: src/slic3r/GUI/GUI_ObjectList.cpp:2071 msgid "" "This action will break a cut information.\n" "After that PrusaSlicer can't guarantee model consistency." msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:2067 +#: src/slic3r/GUI/GUI_ObjectList.cpp:2073 msgid "" "To manipulate with solid parts or negative volumes you have to invalidate " "cut information first." msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:2072 -#: src/slic3r/GUI/GUI_ObjectList.cpp:2612 +#: src/slic3r/GUI/GUI_ObjectList.cpp:2078 +#: src/slic3r/GUI/GUI_ObjectList.cpp:2618 msgid "Delete all connectors" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:2103 +#: src/slic3r/GUI/GUI_ObjectList.cpp:2109 msgid "From Object List You can't delete the last solid part from object." msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:2112 +#: src/slic3r/GUI/GUI_ObjectList.cpp:2118 msgid "Delete Subobject" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:2138 +#: src/slic3r/GUI/GUI_ObjectList.cpp:2144 msgid "Last instance of an object cannot be deleted." msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:2142 +#: src/slic3r/GUI/GUI_ObjectList.cpp:2148 msgid "Instance cannot be deleted from cut object." msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:2146 +#: src/slic3r/GUI/GUI_ObjectList.cpp:2152 msgid "Delete Instance" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:2170 +#: src/slic3r/GUI/GUI_ObjectList.cpp:2176 msgid "" "The selected object couldn't be split because it contains only one part." msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:2174 +#: src/slic3r/GUI/GUI_ObjectList.cpp:2180 msgid "Split to Parts" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:2177 src/slic3r/GUI/Plater.cpp:3141 +#: src/slic3r/GUI/GUI_ObjectList.cpp:2183 src/slic3r/GUI/Plater.cpp:3141 msgid "" "Custom supports, seams and multimaterial painting were removed after " "splitting the object." msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:2297 +#: src/slic3r/GUI/GUI_ObjectList.cpp:2303 msgid "Merged" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:2392 +#: src/slic3r/GUI/GUI_ObjectList.cpp:2398 msgid "Merge all parts to the one single object" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:2424 +#: src/slic3r/GUI/GUI_ObjectList.cpp:2430 msgid "Add Layers" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:2697 +#: src/slic3r/GUI/GUI_ObjectList.cpp:2703 msgid "Cut Connectors information" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:2707 -#: src/slic3r/GUI/GUI_ObjectList.cpp:2772 +#: src/slic3r/GUI/GUI_ObjectList.cpp:2713 +#: src/slic3r/GUI/GUI_ObjectList.cpp:2778 msgid "Object manipulation" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:2717 +#: src/slic3r/GUI/GUI_ObjectList.cpp:2723 msgid "Group manipulation" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:2808 +#: src/slic3r/GUI/GUI_ObjectList.cpp:2814 msgid "Object Settings to modify" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:2812 +#: src/slic3r/GUI/GUI_ObjectList.cpp:2818 msgid "Part Settings to modify" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:2817 +#: src/slic3r/GUI/GUI_ObjectList.cpp:2823 msgid "Layer range Settings to modify" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:2823 +#: src/slic3r/GUI/GUI_ObjectList.cpp:2829 msgid "Part manipulation" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:2831 +#: src/slic3r/GUI/GUI_ObjectList.cpp:2837 msgid "Instance manipulation" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:2839 +#: src/slic3r/GUI/GUI_ObjectList.cpp:2845 msgid "Height ranges" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:2839 +#: src/slic3r/GUI/GUI_ObjectList.cpp:2845 msgid "Settings for height range" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:3375 +#: src/slic3r/GUI/GUI_ObjectList.cpp:3381 msgid "Delete Selected" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:3453 -#: src/slic3r/GUI/GUI_ObjectList.cpp:3481 -#: src/slic3r/GUI/GUI_ObjectList.cpp:3501 +#: src/slic3r/GUI/GUI_ObjectList.cpp:3459 +#: src/slic3r/GUI/GUI_ObjectList.cpp:3487 +#: src/slic3r/GUI/GUI_ObjectList.cpp:3507 msgid "Add Height Range" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:3547 +#: src/slic3r/GUI/GUI_ObjectList.cpp:3553 msgid "" "Cannot insert a new layer range after the current layer range.\n" "The next layer range is too thin to be split to two\n" "without violating the minimum layer height." msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:3551 +#: src/slic3r/GUI/GUI_ObjectList.cpp:3557 msgid "" "Cannot insert a new layer range between the current and the next layer " "range.\n" @@ -5520,142 +5534,142 @@ msgid "" "is thinner than the minimum layer height allowed." msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:3556 +#: src/slic3r/GUI/GUI_ObjectList.cpp:3562 msgid "" "Cannot insert a new layer range after the current layer range.\n" "Current layer range overlaps with the next layer range." msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:3615 +#: src/slic3r/GUI/GUI_ObjectList.cpp:3621 msgid "Edit Height Range" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:3997 +#: src/slic3r/GUI/GUI_ObjectList.cpp:4003 msgid "Selection-Remove from list" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:4009 +#: src/slic3r/GUI/GUI_ObjectList.cpp:4015 msgid "Selection-Add from list" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:4146 +#: src/slic3r/GUI/GUI_ObjectList.cpp:4152 msgid "Object or Instance" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:4147 +#: src/slic3r/GUI/GUI_ObjectList.cpp:4153 msgid "Layer" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:4149 +#: src/slic3r/GUI/GUI_ObjectList.cpp:4155 msgid "Unsupported selection" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:4150 +#: src/slic3r/GUI/GUI_ObjectList.cpp:4156 #, possible-c-format, possible-boost-format msgid "You started your selection with %s Item." msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:4151 +#: src/slic3r/GUI/GUI_ObjectList.cpp:4157 #, possible-c-format, possible-boost-format msgid "In this mode you can select only other %s Items%s" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:4154 +#: src/slic3r/GUI/GUI_ObjectList.cpp:4160 msgid "of a current Object" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:4159 -#: src/slic3r/GUI/GUI_ObjectList.cpp:4234 src/slic3r/GUI/Plater.cpp:199 +#: src/slic3r/GUI/GUI_ObjectList.cpp:4165 +#: src/slic3r/GUI/GUI_ObjectList.cpp:4240 src/slic3r/GUI/Plater.cpp:199 msgid "Info" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:4339 +#: src/slic3r/GUI/GUI_ObjectList.cpp:4345 msgid "Negative Volume" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:4351 +#: src/slic3r/GUI/GUI_ObjectList.cpp:4357 msgid "Support Blocker" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:4351 +#: src/slic3r/GUI/GUI_ObjectList.cpp:4357 msgid "Support Enforcer" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:4361 +#: src/slic3r/GUI/GUI_ObjectList.cpp:4367 msgid "Select type of part" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:4367 +#: src/slic3r/GUI/GUI_ObjectList.cpp:4373 msgid "Change Part Type" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:4627 +#: src/slic3r/GUI/GUI_ObjectList.cpp:4633 msgid "Enter new name" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:4627 +#: src/slic3r/GUI/GUI_ObjectList.cpp:4633 msgid "Renaming" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:4689 +#: src/slic3r/GUI/GUI_ObjectList.cpp:4695 msgid "Repairing model" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:4699 +#: src/slic3r/GUI/GUI_ObjectList.cpp:4705 msgid "" "Custom supports, seams and multimaterial painting were removed after " "repairing the mesh." msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:4719 +#: src/slic3r/GUI/GUI_ObjectList.cpp:4725 msgid "Fix through NetFabb" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:4722 +#: src/slic3r/GUI/GUI_ObjectList.cpp:4728 msgid "Fixing through NetFabb" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:4752 +#: src/slic3r/GUI/GUI_ObjectList.cpp:4758 msgid "The following model was repaired successfully" msgid_plural "The following models were repaired successfully" msgstr[0] "" msgstr[1] "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:4758 +#: src/slic3r/GUI/GUI_ObjectList.cpp:4764 msgid "Folowing model repair failed" msgid_plural "Folowing models repair failed" msgstr[0] "" msgstr[1] "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:4763 +#: src/slic3r/GUI/GUI_ObjectList.cpp:4769 msgid "Repairing was canceled" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:4880 +#: src/slic3r/GUI/GUI_ObjectList.cpp:4886 msgid "Change Extruders" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:5006 +#: src/slic3r/GUI/GUI_ObjectList.cpp:5012 msgid "Set Printable group" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:5006 +#: src/slic3r/GUI/GUI_ObjectList.cpp:5012 msgid "Set Unprintable group" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:5008 +#: src/slic3r/GUI/GUI_ObjectList.cpp:5014 msgid "Set Printable" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:5008 +#: src/slic3r/GUI/GUI_ObjectList.cpp:5014 msgid "Set Unprintable" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:5009 +#: src/slic3r/GUI/GUI_ObjectList.cpp:5015 msgid "Set Printable Instance" msgstr "" -#: src/slic3r/GUI/GUI_ObjectList.cpp:5009 +#: src/slic3r/GUI/GUI_ObjectList.cpp:5015 msgid "Set Unprintable Instance" msgstr "" @@ -5823,15 +5837,15 @@ msgstr "" msgid "Edit" msgstr "" -#: src/slic3r/GUI/ImGuiWrapper.cpp:1180 src/slic3r/GUI/Search.cpp:531 +#: src/slic3r/GUI/ImGuiWrapper.cpp:1186 src/slic3r/GUI/Search.cpp:531 msgid "Use for search" msgstr "" -#: src/slic3r/GUI/ImGuiWrapper.cpp:1181 src/slic3r/GUI/Search.cpp:524 +#: src/slic3r/GUI/ImGuiWrapper.cpp:1187 src/slic3r/GUI/Search.cpp:524 msgid "Category" msgstr "" -#: src/slic3r/GUI/ImGuiWrapper.cpp:1183 src/slic3r/GUI/Search.cpp:526 +#: src/slic3r/GUI/ImGuiWrapper.cpp:1189 src/slic3r/GUI/Search.cpp:526 msgid "Search in English" msgstr "" @@ -6024,11 +6038,11 @@ msgid "Load Config from ini/amf/3mf/gcode and merge" msgstr "" #: src/slic3r/GUI/KBShortcutsDialog.cpp:96 src/slic3r/GUI/Plater.cpp:951 -#: src/slic3r/GUI/Plater.cpp:7218 src/libslic3r/PrintConfig.cpp:4670 +#: src/slic3r/GUI/Plater.cpp:7222 src/libslic3r/PrintConfig.cpp:4670 msgid "Export G-code" msgstr "" -#: src/slic3r/GUI/KBShortcutsDialog.cpp:97 src/slic3r/GUI/Plater.cpp:7219 +#: src/slic3r/GUI/KBShortcutsDialog.cpp:97 src/slic3r/GUI/Plater.cpp:7223 msgid "Send G-code" msgstr "" @@ -7190,8 +7204,8 @@ msgid "Save ZIP file as:" msgstr "" #: src/slic3r/GUI/MainFrame.cpp:1780 src/slic3r/GUI/Plater.cpp:3369 -#: src/slic3r/GUI/Plater.cpp:6692 src/slic3r/GUI/Tab.cpp:1640 -#: src/slic3r/GUI/Tab.cpp:5190 +#: src/slic3r/GUI/Plater.cpp:6696 src/slic3r/GUI/Tab.cpp:1640 +#: src/slic3r/GUI/Tab.cpp:5189 msgid "Slicing" msgstr "" @@ -7778,12 +7792,12 @@ msgstr "" msgid "Around object" msgstr "" -#: src/slic3r/GUI/Plater.cpp:932 src/slic3r/GUI/Plater.cpp:7219 +#: src/slic3r/GUI/Plater.cpp:932 src/slic3r/GUI/Plater.cpp:7223 msgid "Send to printer" msgstr "" #: src/slic3r/GUI/Plater.cpp:952 src/slic3r/GUI/Plater.cpp:3369 -#: src/slic3r/GUI/Plater.cpp:6695 +#: src/slic3r/GUI/Plater.cpp:6699 msgid "Slice now" msgstr "" @@ -8312,72 +8326,72 @@ msgstr "" msgid "Increase Instances" msgstr "" -#: src/slic3r/GUI/Plater.cpp:6121 +#: src/slic3r/GUI/Plater.cpp:6120 msgid "Decrease Instances" msgstr "" -#: src/slic3r/GUI/Plater.cpp:6179 +#: src/slic3r/GUI/Plater.cpp:6178 msgid "Enter the number of copies:" msgstr "" -#: src/slic3r/GUI/Plater.cpp:6180 +#: src/slic3r/GUI/Plater.cpp:6179 msgid "Copies of the selected object" msgstr "" -#: src/slic3r/GUI/Plater.cpp:6183 +#: src/slic3r/GUI/Plater.cpp:6182 #, possible-c-format, possible-boost-format msgid "Set numbers of copies to %d" msgstr "" -#: src/slic3r/GUI/Plater.cpp:6199 +#: src/slic3r/GUI/Plater.cpp:6203 msgid "Fill bed" msgstr "" -#: src/slic3r/GUI/Plater.cpp:6341 +#: src/slic3r/GUI/Plater.cpp:6345 msgid "Save G-code file as:" msgstr "" -#: src/slic3r/GUI/Plater.cpp:6341 +#: src/slic3r/GUI/Plater.cpp:6345 msgid "Save SL1 / SL1S file as:" msgstr "" -#: src/slic3r/GUI/Plater.cpp:6354 +#: src/slic3r/GUI/Plater.cpp:6358 msgid "The provided file name is not valid." msgstr "" -#: src/slic3r/GUI/Plater.cpp:6355 +#: src/slic3r/GUI/Plater.cpp:6359 msgid "The following characters are not allowed by a FAT file system:" msgstr "" -#: src/slic3r/GUI/Plater.cpp:6415 +#: src/slic3r/GUI/Plater.cpp:6419 msgid "" "Unable to perform boolean operation on model meshes. Only positive parts " "will be exported." msgstr "" -#: src/slic3r/GUI/Plater.cpp:6569 +#: src/slic3r/GUI/Plater.cpp:6573 msgid "" "The plater is empty.\n" "Do you want to save the project?" msgstr "" -#: src/slic3r/GUI/Plater.cpp:6569 +#: src/slic3r/GUI/Plater.cpp:6573 msgid "Save project" msgstr "" -#: src/slic3r/GUI/Plater.cpp:6804 +#: src/slic3r/GUI/Plater.cpp:6808 msgid "Is the printer ready? Is the print sheet in place, empty and clean?" msgstr "" -#: src/slic3r/GUI/Plater.cpp:6804 src/slic3r/GUI/PrintHostDialogs.cpp:132 +#: src/slic3r/GUI/Plater.cpp:6808 src/slic3r/GUI/PrintHostDialogs.cpp:132 msgid "Upload and Print" msgstr "" -#: src/slic3r/GUI/Plater.cpp:7218 +#: src/slic3r/GUI/Plater.cpp:7222 msgid "Export" msgstr "" -#: src/slic3r/GUI/Plater.cpp:7363 +#: src/slic3r/GUI/Plater.cpp:7367 msgid "Paste From Clipboard" msgstr "" @@ -9652,7 +9666,7 @@ msgstr "" msgid "Reducing printing time" msgstr "" -#: src/slic3r/GUI/Tab.cpp:1489 +#: src/slic3r/GUI/Tab.cpp:1489 src/libslic3r/ExtrusionRole.cpp:77 msgid "Skirt" msgstr "" @@ -9704,7 +9718,8 @@ msgstr "" msgid "Ooze prevention" msgstr "" -#: src/slic3r/GUI/Tab.cpp:1606 +#: src/slic3r/GUI/Tab.cpp:1606 src/libslic3r/ExtrusionRole.cpp:50 +#: src/libslic3r/ExtrusionRole.cpp:83 msgid "Wipe tower" msgstr "" @@ -9724,7 +9739,7 @@ msgstr "" msgid "Arachne perimeter generator" msgstr "" -#: src/slic3r/GUI/Tab.cpp:1656 src/slic3r/GUI/Tab.cpp:5194 +#: src/slic3r/GUI/Tab.cpp:1656 src/slic3r/GUI/Tab.cpp:5193 msgid "Output options" msgstr "" @@ -9736,7 +9751,7 @@ msgstr "" msgid "Extruder clearance" msgstr "" -#: src/slic3r/GUI/Tab.cpp:1664 src/slic3r/GUI/Tab.cpp:5195 +#: src/slic3r/GUI/Tab.cpp:1664 src/slic3r/GUI/Tab.cpp:5194 msgid "Output file" msgstr "" @@ -9755,13 +9770,13 @@ msgstr "" #: src/slic3r/GUI/Tab.cpp:1702 src/slic3r/GUI/Tab.cpp:2156 #: src/slic3r/GUI/Tab.cpp:2643 src/slic3r/GUI/Tab.cpp:2721 -#: src/slic3r/GUI/Tab.cpp:5034 src/slic3r/GUI/Tab.cpp:5200 +#: src/slic3r/GUI/Tab.cpp:5034 src/slic3r/GUI/Tab.cpp:5199 msgid "Dependencies" msgstr "" #: src/slic3r/GUI/Tab.cpp:1703 src/slic3r/GUI/Tab.cpp:2157 #: src/slic3r/GUI/Tab.cpp:2644 src/slic3r/GUI/Tab.cpp:2722 -#: src/slic3r/GUI/Tab.cpp:5035 src/slic3r/GUI/Tab.cpp:5201 +#: src/slic3r/GUI/Tab.cpp:5035 src/slic3r/GUI/Tab.cpp:5200 msgid "Profile dependencies" msgstr "" @@ -10337,22 +10352,26 @@ msgstr "" msgid "Connection of the support sticks and junctions" msgstr "" -#: src/slic3r/GUI/Tab.cpp:5160 +#: src/slic3r/GUI/Tab.cpp:5157 +msgid "Branching" +msgstr "" + +#: src/slic3r/GUI/Tab.cpp:5159 msgid "Automatic generation" msgstr "" -#: src/slic3r/GUI/Tab.cpp:5228 +#: src/slic3r/GUI/Tab.cpp:5227 #, possible-boost-format msgid "" "\"%1%\" is disabled because \"%2%\" is on in \"%3%\" category.\n" "To enable \"%1%\", please switch off \"%2%\"" msgstr "" -#: src/slic3r/GUI/Tab.cpp:5230 src/libslic3r/PrintConfig.cpp:3571 +#: src/slic3r/GUI/Tab.cpp:5229 src/libslic3r/PrintConfig.cpp:3571 msgid "Object elevation" msgstr "" -#: src/slic3r/GUI/Tab.cpp:5230 src/libslic3r/PrintConfig.cpp:4036 +#: src/slic3r/GUI/Tab.cpp:5229 src/libslic3r/PrintConfig.cpp:4036 msgid "Pad around object" msgstr "" @@ -11298,6 +11317,52 @@ msgid "" "collision." msgstr "" +#: src/libslic3r/ExtrusionRole.cpp:38 src/libslic3r/ExtrusionRole.cpp:59 +msgid "Perimeter" +msgstr "" + +#: src/libslic3r/ExtrusionRole.cpp:39 src/libslic3r/ExtrusionRole.cpp:61 +msgid "External perimeter" +msgstr "" + +#: src/libslic3r/ExtrusionRole.cpp:40 src/libslic3r/ExtrusionRole.cpp:63 +msgid "Overhang perimeter" +msgstr "" + +#: src/libslic3r/ExtrusionRole.cpp:41 src/libslic3r/ExtrusionRole.cpp:65 +msgid "Internal infill" +msgstr "" + +#: src/libslic3r/ExtrusionRole.cpp:42 src/libslic3r/ExtrusionRole.cpp:67 +#: src/libslic3r/PrintConfig.cpp:1452 src/libslic3r/PrintConfig.cpp:2432 +#: src/libslic3r/PrintConfig.cpp:2444 +msgid "Solid infill" +msgstr "" + +#: src/libslic3r/ExtrusionRole.cpp:43 src/libslic3r/ExtrusionRole.cpp:69 +#: src/libslic3r/PrintConfig.cpp:1461 src/libslic3r/PrintConfig.cpp:3033 +#: src/libslic3r/PrintConfig.cpp:3046 +msgid "Top solid infill" +msgstr "" + +#: src/libslic3r/ExtrusionRole.cpp:45 src/libslic3r/ExtrusionRole.cpp:73 +msgid "Bridge infill" +msgstr "" + +#: src/libslic3r/ExtrusionRole.cpp:46 src/libslic3r/ExtrusionRole.cpp:75 +#: src/libslic3r/PrintConfig.cpp:1380 +msgid "Gap fill" +msgstr "" + +#: src/libslic3r/ExtrusionRole.cpp:47 src/libslic3r/ExtrusionRole.cpp:77 +msgid "Skirt/Brim" +msgstr "" + +#: src/libslic3r/ExtrusionRole.cpp:49 src/libslic3r/ExtrusionRole.cpp:81 +#: src/libslic3r/PrintConfig.cpp:2781 +msgid "Support material interface" +msgstr "" + #: src/libslic3r/Flow.cpp:58 #, possible-boost-format msgid "" @@ -11853,6 +11918,28 @@ msgid "" "objects printable." msgstr "" +#: src/libslic3r/Utils.cpp:1016 +#, possible-boost-format +msgid "%1%d" +msgstr "" + +#: src/libslic3r/Utils.cpp:1016 src/libslic3r/Utils.cpp:1018 +#, possible-boost-format +msgid "%1%h" +msgstr "" + +#. TRN "m" means "minutes" +#: src/libslic3r/Utils.cpp:1016 src/libslic3r/Utils.cpp:1018 +#: src/libslic3r/Utils.cpp:1021 +#, possible-boost-format +msgid "%1%m" +msgstr "" + +#: src/libslic3r/Utils.cpp:1022 +#, possible-boost-format +msgid "%1%s" +msgstr "" + #: src/libslic3r/PrintBase.cpp:80 msgid "Failed processing of the output_filename_format template." msgstr "" @@ -12841,10 +12928,6 @@ msgid "" "amount of filament on the spool is sufficient to finish the print." msgstr "" -#: src/libslic3r/PrintConfig.cpp:1171 -msgid "g" -msgstr "" - #: src/libslic3r/PrintConfig.cpp:1180 src/libslic3r/PrintConfig.cpp:3890 msgid "(Unknown)" msgstr "" @@ -13048,10 +13131,6 @@ msgid "" "perimeters and infill." msgstr "" -#: src/libslic3r/PrintConfig.cpp:1380 -msgid "Gap fill" -msgstr "" - #: src/libslic3r/PrintConfig.cpp:1382 msgid "" "Speed for filling small gaps using short zigzag moves. Keep this reasonably " @@ -13123,22 +13202,12 @@ msgid "" "disable acceleration control for infill." msgstr "" -#: src/libslic3r/PrintConfig.cpp:1452 src/libslic3r/PrintConfig.cpp:2432 -#: src/libslic3r/PrintConfig.cpp:2444 -msgid "Solid infill" -msgstr "" - #: src/libslic3r/PrintConfig.cpp:1453 msgid "" "This is the acceleration your printer will use for solid infill. Set zero to " "use the value for infill." msgstr "" -#: src/libslic3r/PrintConfig.cpp:1461 src/libslic3r/PrintConfig.cpp:3033 -#: src/libslic3r/PrintConfig.cpp:3046 -msgid "Top solid infill" -msgstr "" - #: src/libslic3r/PrintConfig.cpp:1462 msgid "" "This is the acceleration your printer will use for top solid infill. Set " @@ -14525,10 +14594,6 @@ msgstr "" msgid "Spacing between interface lines. Set zero to get a solid interface." msgstr "" -#: src/libslic3r/PrintConfig.cpp:2781 -msgid "Support material interface" -msgstr "" - #: src/libslic3r/PrintConfig.cpp:2783 msgid "" "Speed for printing support material interface layers. If expressed as " diff --git a/resources/localization/list.txt b/resources/localization/list.txt index 875e92721..dc665a721 100644 --- a/resources/localization/list.txt +++ b/resources/localization/list.txt @@ -98,7 +98,7 @@ src/slic3r/Utils/Process.cpp src/slic3r/Utils/Repetier.cpp src/slic3r/Config/Snapshot.cpp src/libslic3r/GCode.cpp -src/libslic3r/ExtrusionEntity.cpp +src/libslic3r/ExtrusionRole.cpp src/libslic3r/Flow.cpp src/libslic3r/Format/3mf.cpp src/libslic3r/Format/AMF.cpp @@ -111,6 +111,7 @@ src/libslic3r/SLA/Pad.cpp src/libslic3r/SLA/Hollowing.cpp src/libslic3r/SLAPrint.cpp src/libslic3r/SLAPrintSteps.cpp +src/libslic3r/Utils.cpp src/libslic3r/PrintBase.cpp src/libslic3r/PrintConfig.cpp src/libslic3r/Zipper.cpp diff --git a/src/libslic3r/Utils.hpp b/src/libslic3r/Utils.hpp index 815d6ff55..9cc81b241 100644 --- a/src/libslic3r/Utils.hpp +++ b/src/libslic3r/Utils.hpp @@ -307,43 +307,9 @@ public: // Shorten the dhms time by removing the seconds, rounding the dhm to full minutes // and removing spaces. -inline std::string short_time(const std::string &time) -{ - // Parse the dhms time format. - int days = 0; - int hours = 0; - int minutes = 0; - int seconds = 0; - if (time.find('d') != std::string::npos) - ::sscanf(time.c_str(), "%dd %dh %dm %ds", &days, &hours, &minutes, &seconds); - else if (time.find('h') != std::string::npos) - ::sscanf(time.c_str(), "%dh %dm %ds", &hours, &minutes, &seconds); - else if (time.find('m') != std::string::npos) - ::sscanf(time.c_str(), "%dm %ds", &minutes, &seconds); - else if (time.find('s') != std::string::npos) - ::sscanf(time.c_str(), "%ds", &seconds); - // Round to full minutes. - if (days + hours + minutes > 0 && seconds >= 30) { - if (++minutes == 60) { - minutes = 0; - if (++hours == 24) { - hours = 0; - ++days; - } - } - } - // Format the dhm time. - char buffer[64]; - if (days > 0) - ::sprintf(buffer, "%dd%dh%dm", days, hours, minutes); - else if (hours > 0) - ::sprintf(buffer, "%dh%dm", hours, minutes); - else if (minutes > 0) - ::sprintf(buffer, "%dm", minutes); - else - ::sprintf(buffer, "%ds", seconds); - return buffer; -} +std::string short_time(const std::string& time, bool force_localization = false); +// localized short_time used on UI +inline std::string short_time_ui(const std::string& time) { return short_time(time, true); } // Returns the given time is seconds in format DDd HHh MMm SSs inline std::string get_time_dhms(float time_in_secs) diff --git a/src/libslic3r/utils.cpp b/src/libslic3r/utils.cpp index 2615937eb..db9537edb 100644 --- a/src/libslic3r/utils.cpp +++ b/src/libslic3r/utils.cpp @@ -983,6 +983,61 @@ std::string xml_escape_double_quotes_attribute_value(std::string text) return text; } +std::string short_time(const std::string &time, bool force_localization /*= false*/) +{ + // Parse the dhms time format. + int days = 0; + int hours = 0; + int minutes = 0; + int seconds = 0; + if (time.find('d') != std::string::npos) + ::sscanf(time.c_str(), "%dd %dh %dm %ds", &days, &hours, &minutes, &seconds); + else if (time.find('h') != std::string::npos) + ::sscanf(time.c_str(), "%dh %dm %ds", &hours, &minutes, &seconds); + else if (time.find('m') != std::string::npos) + ::sscanf(time.c_str(), "%dm %ds", &minutes, &seconds); + else if (time.find('s') != std::string::npos) + ::sscanf(time.c_str(), "%ds", &seconds); + // Round to full minutes. + if (days + hours + minutes > 0 && seconds >= 30) { + if (++minutes == 60) { + minutes = 0; + if (++hours == 24) { + hours = 0; + ++days; + } + } + } + + // Format the dhm time + + if (force_localization) { + auto get_d = [days]() { return format(_u8L("%1%d"), days); }; + auto get_h = [hours]() { return format(_u8L("%1%h"), hours); }; + // TRN "m" means "minutes" + auto get_m = [minutes]() { return format(_u8L("%1%m"), minutes); }; + + if (days > 0) + return get_d() + get_h() + get_m(); + if (hours > 0) + return get_h() + get_m(); + if (minutes > 0) + return get_m(); + return format(_u8L("%1%s"), seconds); + } + + char buffer[64]; + if (days > 0) + ::sprintf(buffer, "%dd%dh%dm", days, hours, minutes); + else if (hours > 0) + ::sprintf(buffer, "%dh%dm", hours, minutes); + else if (minutes > 0) + ::sprintf(buffer, "%dm", minutes); + else + ::sprintf(buffer, "%ds", seconds); + return buffer; +} + std::string format_memsize_MB(size_t n) { std::string out; diff --git a/src/slic3r/GUI/DoubleSlider.cpp b/src/slic3r/GUI/DoubleSlider.cpp index a0816c22f..380e2f5b7 100644 --- a/src/slic3r/GUI/DoubleSlider.cpp +++ b/src/slic3r/GUI/DoubleSlider.cpp @@ -708,28 +708,28 @@ static wxString short_and_splitted_time(const std::string& time) ::sscanf(time.c_str(), "%ds", &seconds); // Format the dhm time. - char buffer[64]; + auto get_d = [days]() { return format(_u8L("%1%d"), days); }; + auto get_h = [hours]() { return format(_u8L("%1%h"), hours); }; + auto get_m = [minutes](){ return format(_u8L("%1%m"), minutes); }; + auto get_s = [seconds](){ return format(_u8L("%1%s"), seconds); }; + if (days > 0) - ::sprintf(buffer, "%dd%dh\n%dm", days, hours, minutes); - else if (hours > 0) { + return format_wxstr("%1%%2%\n%3%", get_d(), get_h(), get_m()); + if (hours > 0) { if (hours < 10 && minutes < 10 && seconds < 10) - ::sprintf(buffer, "%dh%dm%ds", hours, minutes, seconds); - else if (hours > 10 && minutes > 10 && seconds > 10) - ::sprintf(buffer, "%dh\n%dm\n%ds", hours, minutes, seconds); - else if ((minutes < 10 && seconds > 10) || (minutes > 10 && seconds < 10)) - ::sprintf(buffer, "%dh\n%dm%ds", hours, minutes, seconds); - else - ::sprintf(buffer, "%dh%dm\n%ds", hours, minutes, seconds); + return format_wxstr("%1%%2%%3%", get_h(), get_m(), get_s()); + if (hours > 10 && minutes > 10 && seconds > 10) + return format_wxstr("%1%\n%2%\n%3%", get_h(), get_m(), get_s()); + if ((minutes < 10 && seconds > 10) || (minutes > 10 && seconds < 10)) + return format_wxstr("%1%\n%2%%3%", get_h(), get_m(), get_s()); + return format_wxstr("%1%%2%\n%3%", get_h(), get_m(), get_s()); } - else if (minutes > 0) { + if (minutes > 0) { if (minutes > 10 && seconds > 10) - ::sprintf(buffer, "%dm\n%ds", minutes, seconds); - else - ::sprintf(buffer, "%dm%ds", minutes, seconds); + return format_wxstr("%1%\n%2%", get_m(), get_s()); + return format_wxstr("%1%%2%", get_m(), get_s()); } - else - ::sprintf(buffer, "%ds", seconds); - return wxString::FromUTF8(buffer); + return from_u8(get_s()); } wxString Control::get_label(int tick, LabelType label_type/* = ltHeightWithLayer*/) const diff --git a/src/slic3r/GUI/GCodeViewer.cpp b/src/slic3r/GUI/GCodeViewer.cpp index 9421e8ca7..4e73c95ed 100644 --- a/src/slic3r/GUI/GCodeViewer.cpp +++ b/src/slic3r/GUI/GCodeViewer.cpp @@ -3271,6 +3271,11 @@ void GCodeViewer::render_legend(float& legend_height) // draw text ImGui::Dummy({ icon_size, icon_size }); ImGui::SameLine(); + + // localize "g" and "m" units + const std::string& grams = _u8L("g"); + const std::string& inches = _u8L("in"); + const std::string& metres = _CTX_utf8(L_CONTEXT("m", "Metre"), "Metre"); if (callback != nullptr) { if (ImGui::MenuItem(label.c_str())) callback(); @@ -3306,10 +3311,10 @@ void GCodeViewer::render_legend(float& legend_height) ::sprintf(buf, "%.1f%%", 100.0f * percent); ImGui::TextUnformatted((percent > 0.0f) ? buf : ""); ImGui::SameLine(offsets[2]); - ::sprintf(buf, imperial_units ? "%.2f in" : "%.2f m", used_filament_m); + ::sprintf(buf, "%.2f %s", used_filament_m, (imperial_units ? inches : metres).c_str()); imgui.text(buf); ImGui::SameLine(offsets[3]); - ::sprintf(buf, "%.2f g", used_filament_g); + ::sprintf(buf, "%.2f %s", used_filament_g, grams.c_str()); imgui.text(buf); } } @@ -3332,10 +3337,10 @@ void GCodeViewer::render_legend(float& legend_height) else if (used_filament_m > 0.0) { char buf[64]; ImGui::SameLine(offsets[0]); - ::sprintf(buf, imperial_units ? "%.2f in" : "%.2f m", used_filament_m); + ::sprintf(buf, "%.2f %s", used_filament_m, (imperial_units ? inches : metres).c_str()); imgui.text(buf); ImGui::SameLine(offsets[1]); - ::sprintf(buf, "%.2f g", used_filament_g); + ::sprintf(buf, "%.2f %s", used_filament_g, grams.c_str()); imgui.text(buf); } } @@ -3506,7 +3511,7 @@ void GCodeViewer::render_legend(float& legend_height) if (role < GCodeExtrusionRole::Count) { labels.push_back(_u8L(gcode_extrusion_role_to_string(role))); auto [time, percent] = role_time_and_percent(role); - times.push_back((time > 0.0f) ? short_time(get_time_dhms(time)) : ""); + times.push_back((time > 0.0f) ? short_time_ui(get_time_dhms(time)) : ""); percents.push_back(percent); max_time_percent = std::max(max_time_percent, percent); auto [used_filament_m, used_filament_g] = used_filament_per_role(role); @@ -3630,7 +3635,7 @@ void GCodeViewer::render_legend(float& legend_height) } if (m_buffers[buffer_id(EMoveType::Travel)].visible) - append_item(EItemType::Line, Travel_Colors[0], _u8L("Travel"), true, short_time(get_time_dhms(time_mode.travel_time)), + append_item(EItemType::Line, Travel_Colors[0], _u8L("Travel"), true, short_time_ui(get_time_dhms(time_mode.travel_time)), time_mode.travel_time / time_mode.time, max_time_percent, offsets, 0.0f, 0.0f); break; @@ -3807,7 +3812,7 @@ void GCodeViewer::render_legend(float& legend_height) ImGuiWrapper::to_ImU32(color2)); ImGui::SameLine(offsets[0]); - imgui.text(short_time(get_time_dhms(times.second - times.first))); + imgui.text(short_time_ui(get_time_dhms(times.second - times.first))); }; auto append_print = [&imgui, imperial_units](const ColorRGBA& color, const std::array& offsets, const Times& times, std::pair used_filament) { @@ -3823,9 +3828,9 @@ void GCodeViewer::render_legend(float& legend_height) ImGuiWrapper::to_ImU32(color)); ImGui::SameLine(offsets[0]); - imgui.text(short_time(get_time_dhms(times.second))); + imgui.text(short_time_ui(get_time_dhms(times.second))); ImGui::SameLine(offsets[1]); - imgui.text(short_time(get_time_dhms(times.first))); + imgui.text(short_time_ui(get_time_dhms(times.first))); if (used_filament.first > 0.0f) { char buffer[64]; ImGui::SameLine(offsets[2]); @@ -3850,7 +3855,7 @@ void GCodeViewer::render_legend(float& legend_height) case PartialTime::EType::Pause: { labels.push_back(_u8L("Pause")); break; } case PartialTime::EType::ColorChange: { labels.push_back(_u8L("Color change")); break; } } - times.push_back(short_time(get_time_dhms(item.times.second))); + times.push_back(short_time_ui(get_time_dhms(item.times.second))); } @@ -3883,7 +3888,7 @@ void GCodeViewer::render_legend(float& legend_height) case PartialTime::EType::Pause: { imgui.text(_u8L("Pause")); ImGui::SameLine(offsets[0]); - imgui.text(short_time(get_time_dhms(item.times.second - item.times.first))); + imgui.text(short_time_ui(get_time_dhms(item.times.second - item.times.first))); break; } case PartialTime::EType::ColorChange: { @@ -4001,11 +4006,11 @@ void GCodeViewer::render_legend(float& legend_height) if (ImGui::BeginTable("Times", 2)) { if (!time_mode.layers_times.empty()) { add_strings_row_to_table(_u8L("First layer") + ":", ImGuiWrapper::COL_ORANGE_LIGHT, - short_time(get_time_dhms(time_mode.layers_times.front())), ImGuiWrapper::to_ImVec4(ColorRGBA::WHITE())); + short_time_ui(get_time_dhms(time_mode.layers_times.front())), ImGuiWrapper::to_ImVec4(ColorRGBA::WHITE())); } add_strings_row_to_table(_u8L("Total") + ":", ImGuiWrapper::COL_ORANGE_LIGHT, - short_time(get_time_dhms(time_mode.time)), ImGuiWrapper::to_ImVec4(ColorRGBA::WHITE())); + short_time_ui(get_time_dhms(time_mode.time)), ImGuiWrapper::to_ImVec4(ColorRGBA::WHITE())); ImGui::EndTable(); } diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 6e6b72f9a..086165419 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -1370,7 +1370,7 @@ void Sidebar::update_sliced_info_sizer() } p->sliced_info->SetTextAndShow(siCost, str_total_cost, "Cost"); - wxString t_est = std::isnan(ps.estimated_print_time) ? "N/A" : get_time_dhms(float(ps.estimated_print_time)); + wxString t_est = std::isnan(ps.estimated_print_time) ? "N/A" : from_u8(short_time_ui(get_time_dhms(float(ps.estimated_print_time)))); p->sliced_info->SetTextAndShow(siEstimatedTime, t_est, _L("Estimated printing time") + ":"); p->plater->get_notification_manager()->set_slicing_complete_print_time(_u8L("Estimated printing time") + ": " + boost::nowide::narrow(t_est), p->plater->is_sidebar_collapsed()); @@ -1459,14 +1459,14 @@ void Sidebar::update_sliced_info_sizer() new_label = _L("Estimated printing time") + ":"; if (ps.estimated_normal_print_time != "N/A") { new_label += format_wxstr("\n - %1%", _L("normal mode")); - info_text += format_wxstr("\n%1%", short_time(ps.estimated_normal_print_time)); + info_text += format_wxstr("\n%1%", short_time_ui(ps.estimated_normal_print_time)); p->plater->get_notification_manager()->set_slicing_complete_print_time(_u8L("Estimated printing time") + ": " + ps.estimated_normal_print_time, p->plater->is_sidebar_collapsed()); } if (ps.estimated_silent_print_time != "N/A") { new_label += format_wxstr("\n - %1%", _L("stealth mode")); - info_text += format_wxstr("\n%1%", short_time(ps.estimated_silent_print_time)); + info_text += format_wxstr("\n%1%", short_time_ui(ps.estimated_silent_print_time)); } p->sliced_info->SetTextAndShow(siEstimatedTime, info_text, new_label); }