diff options
| author | Lukas Matena <lukasmatena@seznam.cz> | 2022-02-01 16:16:13 +0300 |
|---|---|---|
| committer | Lukas Matena <lukasmatena@seznam.cz> | 2022-02-01 16:16:13 +0300 |
| commit | 5c616c5931e61ea37c6be15f66297e4241824e33 (patch) | |
| tree | 225e9c469da05540220c5b066753feab8628632d | |
| parent | ebb9041041008cd759704c1507612d6172718ede (diff) | |
Sync to 2.4.1-beta1
92 files changed, 929 insertions, 45299 deletions
diff --git a/resources/icons/white/info.svg b/resources/icons/white/info.svg deleted file mode 100644 index db227aa32..000000000 --- a/resources/icons/white/info.svg +++ /dev/null @@ -1,71 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.0" - id="error" - x="0px" - y="0px" - viewBox="0 0 200 200" - enable-background="new 0 0 100 100" - xml:space="preserve" - sodipodi:docname="notification_error.svg" - width="200" - height="200" - inkscape:version="1.0 (4035a4fb49, 2020-05-01)"><metadata - id="metadata19"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs - id="defs17" /><sodipodi:namedview - inkscape:document-rotation="0" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1" - objecttolerance="10" - gridtolerance="10" - guidetolerance="10" - inkscape:pageopacity="0" - inkscape:pageshadow="2" - inkscape:window-width="2560" - inkscape:window-height="1377" - id="namedview15" - showgrid="false" - inkscape:zoom="5.04" - inkscape:cx="117.17146" - inkscape:cy="98.609664" - inkscape:window-x="-8" - inkscape:window-y="-8" - inkscape:window-maximized="1" - inkscape:current-layer="error" /> -<g - id="g4" - transform="matrix(2.52,0,0,2.52,-26,-26)"> - <path - fill="#FFFFFF" - d="m 50,54.25 c -2.35,0 -4.25,-1.9 -4.25,-4.25 V 35 c 0,-2.35 1.9,-4.25 4.25,-4.25 2.35,0 4.25,1.9 4.25,4.25 v 15 c 0,2.35 -1.9,4.25 -4.25,4.25 z" - id="path2" /> -</g> -<g - id="g8" - transform="matrix(2.52,0,0,2.52,-26,-26)"> - <circle - fill="#FFFFFF" - cx="50" - cy="65" - r="5" - id="circle6" /> -</g> -<g - id="g12" - transform="matrix(2.52,0,0,2.52,-26,-26)"> - <path - fill="#FFFFFF" - d="M 50,89.25 C 28.36,89.25 10.75,71.64 10.75,50 10.75,28.36 28.36,10.75 50,10.75 71.64,10.75 89.25,28.36 89.25,50 89.25,71.64 71.64,89.25 50,89.25 Z m 0,-70 C 33.05,19.25 19.25,33.04 19.25,50 19.25,66.95 33.04,80.75 50,80.75 66.95,80.75 80.75,66.96 80.75,50 80.75,33.05 66.95,19.25 50,19.25 Z" - id="path10" /> -</g> -</svg> diff --git a/resources/localization/PrusaSlicer.pot b/resources/localization/PrusaSlicer.pot index ca7ce6e00..3034b5aeb 100644 --- a/resources/localization/PrusaSlicer.pot +++ b/resources/localization/PrusaSlicer.pot @@ -8,11 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -"POT-Creation-Date: 2021-07-07 13:33+0200\n" -======= "POT-Creation-Date: 2022-01-25 17:28+0100\n" ->>>>>>> master "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -42,30 +38,17 @@ msgstr "" msgid "About %s" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/AboutDialog.cpp:238 src/slic3r/GUI/AboutDialog.cpp:361 -#: src/slic3r/GUI/GUI_App.cpp:243 src/slic3r/GUI/MainFrame.cpp:151 -======= #: src/slic3r/GUI/AboutDialog.cpp:242 src/slic3r/GUI/AboutDialog.cpp:367 #: src/slic3r/GUI/GUI_App.cpp:262 ->>>>>>> master msgid "Version" msgstr "" #. TRN "Slic3r _is licensed under the_ License" -<<<<<<< HEAD -#: src/slic3r/GUI/AboutDialog.cpp:265 src/slic3r/GUI/GUI_App.cpp:248 -msgid "is licensed under the" -msgstr "" - -#: src/slic3r/GUI/AboutDialog.cpp:266 src/slic3r/GUI/GUI_App.cpp:248 -======= #: src/slic3r/GUI/AboutDialog.cpp:269 src/slic3r/GUI/GUI_App.cpp:268 msgid "is licensed under the" msgstr "" #: src/slic3r/GUI/AboutDialog.cpp:270 src/slic3r/GUI/GUI_App.cpp:268 ->>>>>>> master msgid "GNU Affero General Public License, version 3" msgstr "" @@ -204,15 +187,9 @@ msgstr "" msgid "Scheduling upload to `%1%`. See Window -> Print Host Upload Queue" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/BedShapeDialog.cpp:93 -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:240 src/slic3r/GUI/Plater.cpp:163 -#: src/slic3r/GUI/Tab.cpp:2543 -======= #: src/slic3r/GUI/BedShapeDialog.cpp:31 #: src/slic3r/GUI/GUI_ObjectManipulation.cpp:218 src/slic3r/GUI/Plater.cpp:204 #: src/slic3r/GUI/Tab.cpp:2755 ->>>>>>> master msgid "Size" msgstr "" @@ -234,50 +211,6 @@ msgid "" "rectangle." msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/BedShapeDialog.cpp:129 src/slic3r/GUI/ConfigWizard.cpp:246 -#: src/slic3r/GUI/ConfigWizard.cpp:1372 src/slic3r/GUI/ConfigWizard.cpp:1386 -#: src/slic3r/GUI/ExtruderSequenceDialog.cpp:88 -#: src/slic3r/GUI/GCodeViewer.cpp:3986 src/slic3r/GUI/GCodeViewer.cpp:3992 -#: src/slic3r/GUI/GCodeViewer.cpp:4000 src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:179 -#: src/slic3r/GUI/GUI_ObjectLayers.cpp:145 -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:341 -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:418 -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:486 -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:487 -#: src/slic3r/GUI/ObjectDataViewModel.cpp:96 -#: src/slic3r/GUI/WipeTowerDialog.cpp:85 src/libslic3r/PrintConfig.cpp:77 -#: src/libslic3r/PrintConfig.cpp:84 src/libslic3r/PrintConfig.cpp:95 -#: src/libslic3r/PrintConfig.cpp:135 src/libslic3r/PrintConfig.cpp:244 -#: src/libslic3r/PrintConfig.cpp:302 src/libslic3r/PrintConfig.cpp:377 -#: src/libslic3r/PrintConfig.cpp:385 src/libslic3r/PrintConfig.cpp:435 -#: src/libslic3r/PrintConfig.cpp:565 src/libslic3r/PrintConfig.cpp:576 -#: src/libslic3r/PrintConfig.cpp:594 src/libslic3r/PrintConfig.cpp:774 -#: src/libslic3r/PrintConfig.cpp:1258 src/libslic3r/PrintConfig.cpp:1439 -#: src/libslic3r/PrintConfig.cpp:1500 src/libslic3r/PrintConfig.cpp:1518 -#: src/libslic3r/PrintConfig.cpp:1536 src/libslic3r/PrintConfig.cpp:1596 -#: src/libslic3r/PrintConfig.cpp:1606 src/libslic3r/PrintConfig.cpp:1731 -#: src/libslic3r/PrintConfig.cpp:1739 src/libslic3r/PrintConfig.cpp:1780 -#: src/libslic3r/PrintConfig.cpp:1788 src/libslic3r/PrintConfig.cpp:1798 -#: src/libslic3r/PrintConfig.cpp:1806 src/libslic3r/PrintConfig.cpp:1814 -#: src/libslic3r/PrintConfig.cpp:1877 src/libslic3r/PrintConfig.cpp:2143 -#: src/libslic3r/PrintConfig.cpp:2214 src/libslic3r/PrintConfig.cpp:2248 -#: src/libslic3r/PrintConfig.cpp:2377 src/libslic3r/PrintConfig.cpp:2456 -#: src/libslic3r/PrintConfig.cpp:2463 src/libslic3r/PrintConfig.cpp:2470 -#: src/libslic3r/PrintConfig.cpp:2500 src/libslic3r/PrintConfig.cpp:2510 -#: src/libslic3r/PrintConfig.cpp:2520 src/libslic3r/PrintConfig.cpp:2680 -#: src/libslic3r/PrintConfig.cpp:2714 src/libslic3r/PrintConfig.cpp:2853 -#: src/libslic3r/PrintConfig.cpp:2862 src/libslic3r/PrintConfig.cpp:2871 -#: src/libslic3r/PrintConfig.cpp:2881 src/libslic3r/PrintConfig.cpp:2946 -#: src/libslic3r/PrintConfig.cpp:2956 src/libslic3r/PrintConfig.cpp:2968 -#: src/libslic3r/PrintConfig.cpp:2988 src/libslic3r/PrintConfig.cpp:2998 -#: src/libslic3r/PrintConfig.cpp:3008 src/libslic3r/PrintConfig.cpp:3026 -#: src/libslic3r/PrintConfig.cpp:3041 src/libslic3r/PrintConfig.cpp:3055 -#: src/libslic3r/PrintConfig.cpp:3066 src/libslic3r/PrintConfig.cpp:3079 -#: src/libslic3r/PrintConfig.cpp:3124 src/libslic3r/PrintConfig.cpp:3134 -#: src/libslic3r/PrintConfig.cpp:3143 src/libslic3r/PrintConfig.cpp:3153 -#: src/libslic3r/PrintConfig.cpp:3169 src/libslic3r/PrintConfig.cpp:3193 -======= #: src/slic3r/GUI/BedShapeDialog.cpp:64 src/slic3r/GUI/ConfigWizard.cpp:262 #: src/slic3r/GUI/ConfigWizard.cpp:1476 src/slic3r/GUI/ConfigWizard.cpp:1490 #: src/slic3r/GUI/ExtruderSequenceDialog.cpp:100 @@ -326,7 +259,6 @@ msgstr "" #: src/libslic3r/PrintConfig.cpp:3708 src/libslic3r/PrintConfig.cpp:3717 #: src/libslic3r/PrintConfig.cpp:3727 src/libslic3r/PrintConfig.cpp:3743 #: src/libslic3r/PrintConfig.cpp:3767 ->>>>>>> master msgid "mm" msgstr "" @@ -349,17 +281,8 @@ msgstr "" msgid "Custom" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/BedShapeDialog.cpp:145 -msgid "Invalid" -msgstr "" - -#: src/slic3r/GUI/BedShapeDialog.cpp:156 src/slic3r/GUI/BedShapeDialog.cpp:222 -#: src/slic3r/GUI/GUI_ObjectList.cpp:2292 -======= #: src/slic3r/GUI/BedShapeDialog.cpp:104 src/slic3r/GUI/BedShapeDialog.cpp:179 #: src/slic3r/GUI/GUI_ObjectList.cpp:1701 ->>>>>>> master msgid "Shape" msgstr "" @@ -367,12 +290,8 @@ msgstr "" msgid "Load shape from STL..." msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/BedShapeDialog.cpp:292 src/slic3r/GUI/MainFrame.cpp:1836 -======= #: src/slic3r/GUI/BedShapeDialog.cpp:249 src/slic3r/GUI/GCodeViewer.cpp:3710 #: src/slic3r/GUI/MainFrame.cpp:2140 ->>>>>>> master msgid "Settings" msgstr "" @@ -384,13 +303,8 @@ msgstr "" msgid "Load..." msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/BedShapeDialog.cpp:333 src/slic3r/GUI/BedShapeDialog.cpp:413 -#: src/slic3r/GUI/Tab.cpp:3491 -======= #: src/slic3r/GUI/BedShapeDialog.cpp:292 src/slic3r/GUI/BedShapeDialog.cpp:362 #: src/slic3r/GUI/Tab.cpp:3734 ->>>>>>> master msgid "Remove" msgstr "" @@ -432,11 +346,7 @@ msgstr "" msgid "Choose an STL file to import bed model from:" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/BedShapeDialog.hpp:98 src/slic3r/GUI/ConfigWizard.cpp:1331 -======= #: src/slic3r/GUI/BedShapeDialog.hpp:95 src/slic3r/GUI/ConfigWizard.cpp:1396 ->>>>>>> master msgid "Bed Shape" msgstr "" @@ -493,15 +403,9 @@ msgid "" "The layer height will be reset to 0.01." msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigManipulation.cpp:49 -#: src/slic3r/GUI/GUI_ObjectLayers.cpp:29 src/slic3r/GUI/Tab.cpp:1394 -#: src/libslic3r/PrintConfig.cpp:73 -======= #: src/slic3r/GUI/ConfigManipulation.cpp:50 #: src/slic3r/GUI/GUI_ObjectLayers.cpp:29 src/slic3r/GUI/Tab.cpp:1453 #: src/libslic3r/PrintConfig.cpp:263 ->>>>>>> master msgid "Layer height" msgstr "" @@ -586,19 +490,6 @@ msgstr "" msgid "Shall I switch to rectilinear fill pattern?" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigManipulation.cpp:202 -#: src/slic3r/GUI/GUI_ObjectList.cpp:35 src/slic3r/GUI/GUI_ObjectList.cpp:93 -#: src/slic3r/GUI/GUI_ObjectList.cpp:668 src/slic3r/GUI/Plater.cpp:390 -#: src/slic3r/GUI/Tab.cpp:1439 src/slic3r/GUI/Tab.cpp:1441 -#: src/libslic3r/PrintConfig.cpp:259 src/libslic3r/PrintConfig.cpp:472 -#: src/libslic3r/PrintConfig.cpp:496 src/libslic3r/PrintConfig.cpp:848 -#: src/libslic3r/PrintConfig.cpp:862 src/libslic3r/PrintConfig.cpp:899 -#: src/libslic3r/PrintConfig.cpp:1076 src/libslic3r/PrintConfig.cpp:1086 -#: src/libslic3r/PrintConfig.cpp:1153 src/libslic3r/PrintConfig.cpp:1172 -#: src/libslic3r/PrintConfig.cpp:1191 src/libslic3r/PrintConfig.cpp:1930 -#: src/libslic3r/PrintConfig.cpp:1947 -======= #: src/slic3r/GUI/ConfigManipulation.cpp:199 #: src/slic3r/GUI/GUI_Factories.cpp:55 src/slic3r/GUI/GUI_Factories.cpp:128 #: src/slic3r/GUI/Plater.cpp:460 src/slic3r/GUI/Tab.cpp:1506 @@ -609,7 +500,6 @@ msgstr "" #: src/libslic3r/PrintConfig.cpp:1385 src/libslic3r/PrintConfig.cpp:1454 #: src/libslic3r/PrintConfig.cpp:1474 src/libslic3r/PrintConfig.cpp:1493 #: src/libslic3r/PrintConfig.cpp:2314 src/libslic3r/PrintConfig.cpp:2331 ->>>>>>> master msgid "Infill" msgstr "" @@ -658,11 +548,7 @@ msgstr "" msgid "PrusaSlicer version" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:55 src/libslic3r/Preset.cpp:1306 -======= #: src/slic3r/GUI/ConfigSnapshotDialog.cpp:64 src/libslic3r/Preset.cpp:1338 ->>>>>>> master msgid "print" msgstr "" @@ -670,22 +556,6 @@ msgstr "" msgid "filaments" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:59 src/libslic3r/Preset.cpp:1308 -msgid "SLA print" -msgstr "" - -#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:60 src/slic3r/GUI/GUI.cpp:353 -#: src/slic3r/GUI/Plater.cpp:697 src/libslic3r/Preset.cpp:1309 -msgid "SLA material" -msgstr "" - -#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:62 src/libslic3r/Preset.cpp:1310 -msgid "printer" -msgstr "" - -#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:66 src/slic3r/GUI/Tab.cpp:1311 -======= #: src/slic3r/GUI/ConfigSnapshotDialog.cpp:68 src/libslic3r/Preset.cpp:1340 msgid "SLA print" msgstr "" @@ -701,7 +571,6 @@ msgid "printer" msgstr "" #: src/slic3r/GUI/ConfigSnapshotDialog.cpp:75 src/slic3r/GUI/Tab.cpp:1370 ->>>>>>> master msgid "vendor" msgstr "" @@ -738,51 +607,6 @@ msgstr "" msgid "Configuration Snapshots" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigWizard.cpp:246 -msgid "nozzle" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:250 -msgid "Alternate nozzles:" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:314 -msgid "All standard" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:314 -msgid "Standard" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:315 src/slic3r/GUI/ConfigWizard.cpp:609 -#: src/slic3r/GUI/Tab.cpp:3572 src/slic3r/GUI/UnsavedChangesDialog.cpp:933 -msgid "All" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:316 src/slic3r/GUI/ConfigWizard.cpp:610 -#: src/slic3r/GUI/DoubleSlider.cpp:1879 src/slic3r/GUI/Plater.cpp:362 -#: src/slic3r/GUI/Plater.cpp:505 -msgid "None" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:456 -#, possible-c-format -msgid "Welcome to the %s Configuration Assistant" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:458 -#, possible-c-format -msgid "Welcome to the %s Configuration Wizard" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:460 -msgid "Welcome" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:462 -#, possible-c-format -======= #: src/slic3r/GUI/ConfigWizard.cpp:262 msgid "nozzle" msgstr "" @@ -828,41 +652,11 @@ msgstr "" #: src/slic3r/GUI/ConfigWizard.cpp:490 #, possible-c-format, possible-boost-format ->>>>>>> master msgid "" "Hello, welcome to %s! This %s helps you with the initial configuration; just " "a few settings and you will be ready to print." msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigWizard.cpp:467 -msgid "Remove user profiles (a snapshot will be taken beforehand)" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:510 -#, possible-c-format -msgid "%s Family" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:598 -msgid "Printer:" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:600 -msgid "Vendor:" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:601 -msgid "Profile:" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:673 src/slic3r/GUI/ConfigWizard.cpp:823 -#: src/slic3r/GUI/ConfigWizard.cpp:884 src/slic3r/GUI/ConfigWizard.cpp:1021 -msgid "(All)" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:702 -======= #: src/slic3r/GUI/ConfigWizard.cpp:495 msgid "Remove user profiles (a snapshot will be taken beforehand)" msgstr "" @@ -897,19 +691,11 @@ msgstr "" #: src/slic3r/GUI/ConfigWizard.cpp:752 #, possible-boost-format ->>>>>>> master msgid "" "%1% marked with <b>*</b> are <b>not</b> compatible with some installed " "printers." msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigWizard.cpp:705 -msgid "All installed printers are compatible with the selected filament." -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:725 -======= #: src/slic3r/GUI/ConfigWizard.cpp:752 src/slic3r/GUI/ConfigWizard.cpp:2043 #: src/slic3r/GUI/ConfigWizard.cpp:2912 msgid "Filaments" @@ -929,44 +715,11 @@ msgid "filament" msgstr "" #: src/slic3r/GUI/ConfigWizard.cpp:778 ->>>>>>> master msgid "" "Only the following installed printers are compatible with the selected " "filaments" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigWizard.cpp:1111 -msgid "Custom Printer Setup" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:1111 -msgid "Custom Printer" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:1113 -msgid "Define a custom printer profile" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:1115 -msgid "Custom profile name:" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:1140 -msgid "Automatic updates" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:1140 -msgid "Updates" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:1148 src/slic3r/GUI/Preferences.cpp:94 -msgid "Check for application updates" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:1152 -#, possible-c-format -======= #: src/slic3r/GUI/ConfigWizard.cpp:779 msgid "" "Only the following installed printers are compatible with the selected SLA " @@ -1003,7 +756,6 @@ msgstr "" #: src/slic3r/GUI/ConfigWizard.cpp:1218 #, possible-c-format, possible-boost-format ->>>>>>> master msgid "" "If enabled, %s checks for new application versions online. When a new " "version becomes available, a notification is displayed at the next " @@ -1011,21 +763,12 @@ msgid "" "notification mechanisms, no automatic installation is done." msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigWizard.cpp:1158 src/slic3r/GUI/Preferences.cpp:129 -msgid "Update built-in Presets automatically" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:1162 -#, possible-c-format -======= #: src/slic3r/GUI/ConfigWizard.cpp:1224 src/slic3r/GUI/Preferences.cpp:175 msgid "Update built-in Presets automatically" msgstr "" #: src/slic3r/GUI/ConfigWizard.cpp:1228 #, possible-c-format, possible-boost-format ->>>>>>> master msgid "" "If enabled, %s downloads updates of built-in system presets in the " "background.These updates are downloaded into a separate temporary location." @@ -1033,51 +776,29 @@ msgid "" "startup." msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigWizard.cpp:1165 -======= #: src/slic3r/GUI/ConfigWizard.cpp:1231 ->>>>>>> master msgid "" "Updates are never applied without user's consent and never overwrite user's " "customized settings." msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigWizard.cpp:1170 -======= #: src/slic3r/GUI/ConfigWizard.cpp:1236 ->>>>>>> master msgid "" "Additionally a backup snapshot of the whole configuration is created before " "an update is applied." msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigWizard.cpp:1177 src/slic3r/GUI/GUI_ObjectList.cpp:1829 -#: src/slic3r/GUI/GUI_ObjectList.cpp:4573 src/slic3r/GUI/Plater.cpp:3124 -#: src/slic3r/GUI/Plater.cpp:4018 src/slic3r/GUI/Plater.cpp:4049 -msgid "Reload from disk" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:1180 -======= #: src/slic3r/GUI/ConfigWizard.cpp:1243 src/slic3r/GUI/GUI_Factories.cpp:726 #: src/slic3r/GUI/Plater.cpp:3548 msgid "Reload from disk" msgstr "" #: src/slic3r/GUI/ConfigWizard.cpp:1246 ->>>>>>> master msgid "" "Export full pathnames of models and parts sources into 3mf and amf files" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigWizard.cpp:1184 -======= #: src/slic3r/GUI/ConfigWizard.cpp:1250 ->>>>>>> master msgid "" "If enabled, allows the Reload from disk command to automatically find and " "load the files when invoked.\n" @@ -1085,25 +806,6 @@ msgid "" "using an open file dialog." msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigWizard.cpp:1194 -msgid "Files association" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:1196 src/slic3r/GUI/Preferences.cpp:112 -msgid "Associate .3mf files to PrusaSlicer" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:1197 src/slic3r/GUI/Preferences.cpp:119 -msgid "Associate .stl files to PrusaSlicer" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:1208 -msgid "View mode" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:1210 -======= #: src/slic3r/GUI/ConfigWizard.cpp:1259 msgid "Files association" msgstr "" @@ -1121,7 +823,6 @@ msgid "View mode" msgstr "" #: src/slic3r/GUI/ConfigWizard.cpp:1274 ->>>>>>> master msgid "" "PrusaSlicer's user interfaces comes in three variants:\n" "Simple, Advanced, and Expert.\n" @@ -1130,78 +831,6 @@ msgid "" "fine-tuning, they are suitable for advanced and expert users, respectively." msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigWizard.cpp:1215 -msgid "Simple mode" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:1216 -msgid "Advanced mode" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:1217 -msgid "Expert mode" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:1223 -msgid "The size of the object can be specified in inches" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:1224 -msgid "Use inches" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:1258 -msgid "Other Vendors" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:1262 -#, possible-c-format -msgid "Pick another vendor supported by %s" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:1293 -msgid "Firmware Type" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:1293 src/slic3r/GUI/Tab.cpp:2179 -msgid "Firmware" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:1297 -msgid "Choose the type of firmware used by your printer." -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:1331 -msgid "Bed Shape and Size" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:1334 -msgid "Set the shape of your printer's bed." -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:1354 -msgid "Filament and Nozzle Diameters" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:1354 -msgid "Print Diameters" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:1368 -msgid "Enter the diameter of your printer's hot end nozzle." -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:1371 -msgid "Nozzle Diameter:" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:1381 -msgid "Enter the diameter of your filament." -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:1382 -======= #: src/slic3r/GUI/ConfigWizard.cpp:1279 msgid "Simple mode" msgstr "" @@ -1278,45 +907,11 @@ msgid "Enter the diameter of your filament." msgstr "" #: src/slic3r/GUI/ConfigWizard.cpp:1486 ->>>>>>> master msgid "" "Good precision is required, so use a caliper and do multiple measurements " "along the filament, then compute the average." msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigWizard.cpp:1385 -msgid "Filament Diameter:" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:1419 -msgid "Nozzle and Bed Temperatures" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:1419 -msgid "Temperatures" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:1435 -msgid "Enter the temperature needed for extruding your filament." -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:1436 -msgid "A rule of thumb is 160 to 230 °C for PLA, and 215 to 250 °C for ABS." -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:1439 -msgid "Extrusion Temperature:" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:1440 src/slic3r/GUI/ConfigWizard.cpp:1454 -#: src/libslic3r/PrintConfig.cpp:202 src/libslic3r/PrintConfig.cpp:950 -#: src/libslic3r/PrintConfig.cpp:994 src/libslic3r/PrintConfig.cpp:2296 -msgid "°C" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:1449 -======= #: src/slic3r/GUI/ConfigWizard.cpp:1489 msgid "Filament Diameter:" msgstr "" @@ -1348,83 +943,17 @@ msgid "°C" msgstr "" #: src/slic3r/GUI/ConfigWizard.cpp:1577 ->>>>>>> master msgid "" "Enter the bed temperature needed for getting your filament to stick to your " "heated bed." msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigWizard.cpp:1450 -======= #: src/slic3r/GUI/ConfigWizard.cpp:1578 ->>>>>>> master msgid "" "A rule of thumb is 60 °C for PLA and 110 °C for ABS. Leave zero if you have " "no heated bed." msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigWizard.cpp:1453 -msgid "Bed Temperature:" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:1913 src/slic3r/GUI/ConfigWizard.cpp:2590 -msgid "Filaments" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:1913 src/slic3r/GUI/ConfigWizard.cpp:2592 -msgid "SLA Materials" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:1967 -msgid "FFF Technology Printers" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:1972 -msgid "SLA Technology Printers" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:2278 src/slic3r/GUI/DoubleSlider.cpp:2265 -#: src/slic3r/GUI/DoubleSlider.cpp:2285 src/slic3r/GUI/GUI.cpp:246 -msgid "Notice" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:2299 -msgid "The following FFF printer models have no filament selected:" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:2303 -msgid "Do you want to select default filaments for these FFF printer models?" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:2317 -msgid "The following SLA printer models have no materials selected:" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:2321 -msgid "Do you want to select default SLA materials for these printer models?" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:2553 -msgid "Select all standard printers" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:2556 -msgid "< &Back" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:2557 -msgid "&Next >" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:2558 -msgid "&Finish" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:2559 src/slic3r/GUI/FirmwareDialog.cpp:153 -#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:248 -======= #: src/slic3r/GUI/ConfigWizard.cpp:1581 msgid "Bed Temperature:" msgstr "" @@ -1544,49 +1073,12 @@ msgstr "" #: src/slic3r/GUI/DesktopIntegrationDialog.cpp:490 #: src/slic3r/GUI/FirmwareDialog.cpp:153 #: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:58 ->>>>>>> master #: src/slic3r/GUI/ProgressStatusBar.cpp:26 #: src/slic3r/GUI/SendSystemInfoDialog.cpp:93 #: src/slic3r/GUI/UnsavedChangesDialog.cpp:878 msgid "Cancel" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigWizard.cpp:2572 -msgid "Prusa FFF Technology Printers" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:2575 -msgid "Prusa MSLA Technology Printers" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:2590 -msgid "Filament Profiles Selection" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:2590 src/slic3r/GUI/ConfigWizard.cpp:2592 -#: src/slic3r/GUI/GUI_ObjectList.cpp:4150 -msgid "Type:" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:2592 -msgid "SLA Material Profiles Selection" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:2709 -msgid "Configuration Assistant" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:2710 -msgid "Configuration &Assistant" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:2712 -msgid "Configuration Wizard" -msgstr "" - -#: src/slic3r/GUI/ConfigWizard.cpp:2713 -======= #: src/slic3r/GUI/ConfigWizard.cpp:2884 msgid "Prusa FFF Technology Printers" msgstr "" @@ -1621,7 +1113,6 @@ msgid "Configuration Wizard" msgstr "" #: src/slic3r/GUI/ConfigWizard.cpp:3040 ->>>>>>> master msgid "Configuration &Wizard" msgstr "" @@ -1673,22 +1164,6 @@ msgstr "" msgid "Place bearings in slots and resume printing" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/DoubleSlider.cpp:1244 -msgid "One layer mode" -msgstr "" - -#: src/slic3r/GUI/DoubleSlider.cpp:1246 -msgid "Discard all custom changes" -msgstr "" - -#: src/slic3r/GUI/DoubleSlider.cpp:1250 src/slic3r/GUI/DoubleSlider.cpp:2015 -msgid "Jump to move" -msgstr "" - -#: src/slic3r/GUI/DoubleSlider.cpp:1253 -#, possible-c-format -======= #: src/slic3r/GUI/DoubleSlider.cpp:1379 msgid "One layer mode" msgstr "" @@ -1703,40 +1178,19 @@ msgstr "" #: src/slic3r/GUI/DoubleSlider.cpp:1388 #, possible-c-format, possible-boost-format ->>>>>>> master msgid "" "Jump to height %s\n" "Set ruler mode\n" "or Set extruder sequence for the entire print" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/DoubleSlider.cpp:1256 -#, possible-c-format -======= #: src/slic3r/GUI/DoubleSlider.cpp:1391 #, possible-c-format, possible-boost-format ->>>>>>> master msgid "" "Jump to height %s\n" "or Set ruler mode" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/DoubleSlider.cpp:1261 -msgid "Edit current color - Right click the colored slider segment" -msgstr "" - -#: src/slic3r/GUI/DoubleSlider.cpp:1271 -msgid "Print mode" -msgstr "" - -#: src/slic3r/GUI/DoubleSlider.cpp:1285 -msgid "Add extruder change - Left click" -msgstr "" - -#: src/slic3r/GUI/DoubleSlider.cpp:1287 -======= #: src/slic3r/GUI/DoubleSlider.cpp:1396 msgid "Edit current color - Right click the colored slider segment" msgstr "" @@ -1760,31 +1214,11 @@ msgid "Add extruder change - Left click" msgstr "" #: src/slic3r/GUI/DoubleSlider.cpp:1428 ->>>>>>> master msgid "" "Add color change - Left click for predefined color or Shift + Left click for " "custom color selection" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/DoubleSlider.cpp:1289 -msgid "Add color change - Left click" -msgstr "" - -#: src/slic3r/GUI/DoubleSlider.cpp:1290 -msgid "or press \"+\" key" -msgstr "" - -#: src/slic3r/GUI/DoubleSlider.cpp:1292 -msgid "Add another code - Ctrl + Left click" -msgstr "" - -#: src/slic3r/GUI/DoubleSlider.cpp:1293 -msgid "Add another code - Right click" -msgstr "" - -#: src/slic3r/GUI/DoubleSlider.cpp:1299 -======= #: src/slic3r/GUI/DoubleSlider.cpp:1430 msgid "Add color change - Left click" msgstr "" @@ -1802,7 +1236,6 @@ msgid "Add another code - Right click" msgstr "" #: src/slic3r/GUI/DoubleSlider.cpp:1440 ->>>>>>> master msgid "" "The sequential print is on.\n" "It's impossible to apply any custom G-code for objects printing " @@ -1810,33 +1243,6 @@ msgid "" "This code won't be processed during G-code generation." msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/DoubleSlider.cpp:1308 -msgid "Color change (\"%1%\")" -msgstr "" - -#: src/slic3r/GUI/DoubleSlider.cpp:1309 -msgid "Color change (\"%1%\") for Extruder %2%" -msgstr "" - -#: src/slic3r/GUI/DoubleSlider.cpp:1311 -msgid "Pause print (\"%1%\")" -msgstr "" - -#: src/slic3r/GUI/DoubleSlider.cpp:1313 -msgid "Custom template (\"%1%\")" -msgstr "" - -#: src/slic3r/GUI/DoubleSlider.cpp:1315 -msgid "Extruder (tool) is changed to Extruder \"%1%\"" -msgstr "" - -#: src/slic3r/GUI/DoubleSlider.cpp:1322 -msgid "Note" -msgstr "" - -#: src/slic3r/GUI/DoubleSlider.cpp:1324 -======= #: src/slic3r/GUI/DoubleSlider.cpp:1458 msgid "continue" msgstr "" @@ -1871,216 +1277,30 @@ msgid "Note" msgstr "" #: src/slic3r/GUI/DoubleSlider.cpp:1482 ->>>>>>> master msgid "" "G-code associated to this tick mark is in a conflict with print mode.\n" "Editing it will cause changes of Slider data." msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/DoubleSlider.cpp:1327 -======= #: src/slic3r/GUI/DoubleSlider.cpp:1485 ->>>>>>> master msgid "" "There is a color change for extruder that won't be used till the end of " "print job.\n" "This code won't be processed during G-code generation." msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/DoubleSlider.cpp:1330 -======= #: src/slic3r/GUI/DoubleSlider.cpp:1488 ->>>>>>> master msgid "" "There is an extruder change set to the same extruder.\n" "This code won't be processed during G-code generation." msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/DoubleSlider.cpp:1333 -======= #: src/slic3r/GUI/DoubleSlider.cpp:1491 ->>>>>>> master msgid "" "There is a color change for extruder that has not been used before.\n" "Check your settings to avoid redundant color changes." msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/DoubleSlider.cpp:1338 -msgid "Delete tick mark - Left click or press \"-\" key" -msgstr "" - -#: src/slic3r/GUI/DoubleSlider.cpp:1340 -msgid "Edit tick mark - Ctrl + Left click" -msgstr "" - -#: src/slic3r/GUI/DoubleSlider.cpp:1341 -msgid "Edit tick mark - Right click" -msgstr "" - -#: src/slic3r/GUI/DoubleSlider.cpp:1437 src/slic3r/GUI/DoubleSlider.cpp:1471 -#: src/slic3r/GUI/GUI_ObjectList.cpp:1868 -#, possible-c-format -msgid "Extruder %d" -msgstr "" - -#: src/slic3r/GUI/DoubleSlider.cpp:1438 src/slic3r/GUI/GUI_ObjectList.cpp:1869 -msgid "active" -msgstr "" - -#: src/slic3r/GUI/DoubleSlider.cpp:1447 -msgid "Switch code to Change extruder" -msgstr "" - -#: src/slic3r/GUI/DoubleSlider.cpp:1447 src/slic3r/GUI/GUI_ObjectList.cpp:1836 -msgid "Change extruder" -msgstr "" - -#: src/slic3r/GUI/DoubleSlider.cpp:1448 -msgid "Change extruder (N/A)" -msgstr "" - -#: src/slic3r/GUI/DoubleSlider.cpp:1450 -msgid "Use another extruder" -msgstr "" - -#: src/slic3r/GUI/DoubleSlider.cpp:1472 -msgid "used" -msgstr "" - -#: src/slic3r/GUI/DoubleSlider.cpp:1480 -msgid "Switch code to Color change (%1%) for:" -msgstr "" - -#: src/slic3r/GUI/DoubleSlider.cpp:1481 -msgid "Add color change (%1%) for:" -msgstr "" - -#: src/slic3r/GUI/DoubleSlider.cpp:1817 -msgid "Add color change" -msgstr "" - -#: src/slic3r/GUI/DoubleSlider.cpp:1828 -msgid "Add pause print" -msgstr "" - -#: src/slic3r/GUI/DoubleSlider.cpp:1832 -msgid "Add custom template" -msgstr "" - -#: src/slic3r/GUI/DoubleSlider.cpp:1835 -msgid "Add custom G-code" -msgstr "" - -#: src/slic3r/GUI/DoubleSlider.cpp:1853 -msgid "Edit color" -msgstr "" - -#: src/slic3r/GUI/DoubleSlider.cpp:1854 -msgid "Edit pause print message" -msgstr "" - -#: src/slic3r/GUI/DoubleSlider.cpp:1855 -msgid "Edit custom G-code" -msgstr "" - -#: src/slic3r/GUI/DoubleSlider.cpp:1861 -msgid "Delete color change" -msgstr "" - -#: src/slic3r/GUI/DoubleSlider.cpp:1862 -msgid "Delete tool change" -msgstr "" - -#: src/slic3r/GUI/DoubleSlider.cpp:1863 -msgid "Delete pause print" -msgstr "" - -#: src/slic3r/GUI/DoubleSlider.cpp:1864 -msgid "Delete custom G-code" -msgstr "" - -#: src/slic3r/GUI/DoubleSlider.cpp:1874 src/slic3r/GUI/DoubleSlider.cpp:2015 -msgid "Jump to height" -msgstr "" - -#: src/slic3r/GUI/DoubleSlider.cpp:1879 -msgid "Hide ruler" -msgstr "" - -#: src/slic3r/GUI/DoubleSlider.cpp:1883 -msgid "Show object height" -msgstr "" - -#: src/slic3r/GUI/DoubleSlider.cpp:1883 -msgid "Show object height on the ruler" -msgstr "" - -#: src/slic3r/GUI/DoubleSlider.cpp:1887 -msgid "Show estimated print time" -msgstr "" - -#: src/slic3r/GUI/DoubleSlider.cpp:1887 -msgid "Show estimated print time on the ruler" -msgstr "" - -#: src/slic3r/GUI/DoubleSlider.cpp:1891 -msgid "Ruler mode" -msgstr "" - -#: src/slic3r/GUI/DoubleSlider.cpp:1891 -msgid "Set ruler mode" -msgstr "" - -#: src/slic3r/GUI/DoubleSlider.cpp:1896 -msgid "Set extruder sequence for the entire print" -msgstr "" - -#: src/slic3r/GUI/DoubleSlider.cpp:1982 -msgid "Enter custom G-code used on current layer" -msgstr "" - -#: src/slic3r/GUI/DoubleSlider.cpp:1983 -msgid "Custom G-code on current layer (%1% mm)." -msgstr "" - -#: src/slic3r/GUI/DoubleSlider.cpp:1998 -msgid "Enter short message shown on Printer display when a print is paused" -msgstr "" - -#: src/slic3r/GUI/DoubleSlider.cpp:1999 -msgid "Message for pause print on current layer (%1% mm)." -msgstr "" - -#: src/slic3r/GUI/DoubleSlider.cpp:2014 -msgid "Enter the move you want to jump to" -msgstr "" - -#: src/slic3r/GUI/DoubleSlider.cpp:2014 -msgid "Enter the height you want to jump to" -msgstr "" - -#: src/slic3r/GUI/DoubleSlider.cpp:2259 -msgid "The last color change data was saved for a single extruder printing." -msgstr "" - -#: src/slic3r/GUI/DoubleSlider.cpp:2260 src/slic3r/GUI/DoubleSlider.cpp:2275 -msgid "The last color change data was saved for a multi extruder printing." -msgstr "" - -#: src/slic3r/GUI/DoubleSlider.cpp:2262 -msgid "Your current changes will delete all saved color changes." -msgstr "" - -#: src/slic3r/GUI/DoubleSlider.cpp:2263 src/slic3r/GUI/DoubleSlider.cpp:2283 -msgid "Are you sure you want to continue?" -msgstr "" - -#: src/slic3r/GUI/DoubleSlider.cpp:2276 -======= #: src/slic3r/GUI/DoubleSlider.cpp:1496 msgid "Delete tick mark - Left click or press \"-\" key" msgstr "" @@ -2278,46 +1498,22 @@ msgid "Are you sure you want to continue?" msgstr "" #: src/slic3r/GUI/DoubleSlider.cpp:2532 ->>>>>>> master msgid "" "Select YES if you want to delete all saved tool changes, \n" "NO if you want all tool changes switch to color changes, \n" "or CANCEL to leave it unchanged." msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/DoubleSlider.cpp:2279 -msgid "Do you want to delete all saved tool changes?" -msgstr "" - -#: src/slic3r/GUI/DoubleSlider.cpp:2281 -======= #: src/slic3r/GUI/DoubleSlider.cpp:2535 msgid "Do you want to delete all saved tool changes?" msgstr "" #: src/slic3r/GUI/DoubleSlider.cpp:2537 ->>>>>>> master msgid "" "The last color change data was saved for a multi extruder printing with tool " "changes for whole print." msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/DoubleSlider.cpp:2282 -msgid "Your current changes will delete all saved extruder (tool) changes." -msgstr "" - -#: src/slic3r/GUI/ExtraRenderers.cpp:297 src/slic3r/GUI/GUI_ObjectList.cpp:512 -#: src/slic3r/GUI/GUI_ObjectList.cpp:524 src/slic3r/GUI/GUI_ObjectList.cpp:1033 -#: src/slic3r/GUI/GUI_ObjectList.cpp:4588 -#: src/slic3r/GUI/GUI_ObjectList.cpp:4598 -#: src/slic3r/GUI/GUI_ObjectList.cpp:4633 -#: src/slic3r/GUI/ObjectDataViewModel.cpp:209 -#: src/slic3r/GUI/ObjectDataViewModel.cpp:266 -#: src/slic3r/GUI/ObjectDataViewModel.cpp:291 -#: src/slic3r/GUI/ObjectDataViewModel.cpp:499 src/libslic3r/PrintConfig.cpp:552 -======= #: src/slic3r/GUI/DoubleSlider.cpp:2538 msgid "Your current changes will delete all saved extruder (tool) changes." msgstr "" @@ -2330,7 +1526,6 @@ msgstr "" #: src/slic3r/GUI/ObjectDataViewModel.cpp:352 #: src/slic3r/GUI/ObjectDataViewModel.cpp:376 #: src/slic3r/GUI/ObjectDataViewModel.cpp:607 src/libslic3r/PrintConfig.cpp:774 ->>>>>>> master msgid "default" msgstr "" @@ -2342,19 +1537,11 @@ msgstr "" msgid "Set extruder change for every" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/ExtruderSequenceDialog.cpp:53 -#: src/libslic3r/PrintConfig.cpp:418 src/libslic3r/PrintConfig.cpp:1089 -#: src/libslic3r/PrintConfig.cpp:1720 src/libslic3r/PrintConfig.cpp:1885 -#: src/libslic3r/PrintConfig.cpp:1952 src/libslic3r/PrintConfig.cpp:2159 -#: src/libslic3r/PrintConfig.cpp:2205 -======= #: src/slic3r/GUI/ExtruderSequenceDialog.cpp:60 #: src/libslic3r/PrintConfig.cpp:639 src/libslic3r/PrintConfig.cpp:1388 #: src/libslic3r/PrintConfig.cpp:2085 src/libslic3r/PrintConfig.cpp:2260 #: src/libslic3r/PrintConfig.cpp:2336 src/libslic3r/PrintConfig.cpp:2589 #: src/libslic3r/PrintConfig.cpp:2637 src/libslic3r/PrintConfig.cpp:2656 ->>>>>>> master msgid "layers" msgstr "" @@ -2405,18 +1592,8 @@ msgstr "" msgid "%s doesn't support percentage" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/Field.cpp:253 src/slic3r/GUI/Field.cpp:307 -#: src/slic3r/GUI/Field.cpp:1528 src/slic3r/GUI/GUI_ObjectLayers.cpp:413 -msgid "Invalid numeric input." -msgstr "" - -#: src/slic3r/GUI/Field.cpp:264 -#, possible-c-format -======= #: src/slic3r/GUI/Field.cpp:266 #, possible-c-format, possible-boost-format ->>>>>>> master msgid "" "Input value is out of range\n" "Are you sure that %s is a correct value and that you want to continue?" @@ -2426,13 +1603,8 @@ msgstr "" msgid "Parameter validation" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/Field.cpp:279 src/slic3r/GUI/Field.cpp:373 -#: src/slic3r/GUI/Field.cpp:1540 -======= #: src/slic3r/GUI/Field.cpp:282 src/slic3r/GUI/Field.cpp:390 #: src/slic3r/GUI/Field.cpp:1574 ->>>>>>> master msgid "Input value is out of range" msgstr "" @@ -2463,22 +1635,6 @@ msgstr "" msgid "Flashing failed" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/FirmwareDialog.cpp:284 -msgid "Flashing succeeded!" -msgstr "" - -#: src/slic3r/GUI/FirmwareDialog.cpp:285 -msgid "Flashing failed. Please see the avrdude log below." -msgstr "" - -#: src/slic3r/GUI/FirmwareDialog.cpp:286 -msgid "Flashing cancelled." -msgstr "" - -#: src/slic3r/GUI/FirmwareDialog.cpp:334 -#, possible-c-format -======= #: src/slic3r/GUI/FirmwareDialog.cpp:283 msgid "Flashing succeeded!" msgstr "" @@ -2493,7 +1649,6 @@ msgstr "" #: src/slic3r/GUI/FirmwareDialog.cpp:333 #, possible-c-format, possible-boost-format ->>>>>>> master msgid "" "This firmware hex file does not match the printer model.\n" "The hex file is intended for: %s\n" @@ -2503,96 +1658,20 @@ msgid "" "Please only continue if you are sure this is the right thing to do." msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/FirmwareDialog.cpp:421 src/slic3r/GUI/FirmwareDialog.cpp:456 -#, possible-c-format -======= #: src/slic3r/GUI/FirmwareDialog.cpp:420 src/slic3r/GUI/FirmwareDialog.cpp:455 #, possible-c-format, possible-boost-format ->>>>>>> master msgid "" "Multiple %s devices found. Please only connect one at a time for flashing." msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/FirmwareDialog.cpp:438 -#, possible-c-format -======= #: src/slic3r/GUI/FirmwareDialog.cpp:437 #, possible-c-format, possible-boost-format ->>>>>>> master msgid "" "The %s device was not found.\n" "If the device is connected, please press the Reset button next to the USB " "connector ..." msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/FirmwareDialog.cpp:550 -#, possible-c-format -msgid "The %s device could not have been found" -msgstr "" - -#: src/slic3r/GUI/FirmwareDialog.cpp:651 -#, possible-c-format -msgid "Error accessing port at %s: %s" -msgstr "" - -#: src/slic3r/GUI/FirmwareDialog.cpp:653 -#, possible-c-format -msgid "Error: %s" -msgstr "" - -#: src/slic3r/GUI/FirmwareDialog.cpp:782 -msgid "Firmware flasher" -msgstr "" - -#: src/slic3r/GUI/FirmwareDialog.cpp:807 -msgid "Firmware image:" -msgstr "" - -#: src/slic3r/GUI/FirmwareDialog.cpp:810 -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:291 -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:366 -msgid "Browse" -msgstr "" - -#: src/slic3r/GUI/FirmwareDialog.cpp:812 -msgid "Serial port:" -msgstr "" - -#: src/slic3r/GUI/FirmwareDialog.cpp:814 -msgid "Autodetected" -msgstr "" - -#: src/slic3r/GUI/FirmwareDialog.cpp:815 -msgid "Rescan" -msgstr "" - -#: src/slic3r/GUI/FirmwareDialog.cpp:822 -msgid "Progress:" -msgstr "" - -#: src/slic3r/GUI/FirmwareDialog.cpp:825 -msgid "Status:" -msgstr "" - -#: src/slic3r/GUI/FirmwareDialog.cpp:826 -msgid "Ready" -msgstr "" - -#: src/slic3r/GUI/FirmwareDialog.cpp:846 -msgid "Advanced: Output log" -msgstr "" - -#: src/slic3r/GUI/FirmwareDialog.cpp:857 -#: src/slic3r/GUI/Mouse3DController.cpp:551 -#: src/slic3r/GUI/PrintHostDialogs.cpp:200 -msgid "Close" -msgstr "" - -#: src/slic3r/GUI/FirmwareDialog.cpp:907 -======= #: src/slic3r/GUI/FirmwareDialog.cpp:549 #, possible-c-format, possible-boost-format msgid "The %s device could not have been found" @@ -2663,239 +1742,11 @@ msgid "Close" msgstr "" #: src/slic3r/GUI/FirmwareDialog.cpp:915 ->>>>>>> master msgid "" "Are you sure you want to cancel firmware flashing?\n" "This could leave your printer in an unusable state!" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/FirmwareDialog.cpp:908 -msgid "Confirmation" -msgstr "" - -#: src/slic3r/GUI/FirmwareDialog.cpp:911 -msgid "Cancelling..." -msgstr "" - -#: src/slic3r/GUI/GCodeViewer.cpp:306 -msgid "Tool position" -msgstr "" - -#: src/slic3r/GUI/GCodeViewer.cpp:1499 src/slic3r/GUI/GCodeViewer.cpp:2035 -msgid "Generating toolpaths" -msgstr "" - -#: src/slic3r/GUI/GCodeViewer.cpp:1537 src/slic3r/GUI/GCodeViewer.cpp:2419 -msgid "Generating vertex buffer" -msgstr "" - -#: src/slic3r/GUI/GCodeViewer.cpp:1814 src/slic3r/GUI/GCodeViewer.cpp:2507 -msgid "Generating index buffers" -msgstr "" - -#: src/slic3r/GUI/GCodeViewer.cpp:3874 -msgid "Click to hide" -msgstr "" - -#: src/slic3r/GUI/GCodeViewer.cpp:3874 -msgid "Click to show" -msgstr "" - -#: src/slic3r/GUI/GCodeViewer.cpp:3986 -msgid "up to" -msgstr "" - -#: src/slic3r/GUI/GCodeViewer.cpp:3992 -msgid "above" -msgstr "" - -#: src/slic3r/GUI/GCodeViewer.cpp:4000 -msgid "from" -msgstr "" - -#: src/slic3r/GUI/GCodeViewer.cpp:4000 -msgid "to" -msgstr "" - -#: src/slic3r/GUI/GCodeViewer.cpp:4028 src/slic3r/GUI/GCodeViewer.cpp:4036 -#: src/slic3r/GUI/GUI_Preview.cpp:214 src/slic3r/GUI/GUI_Preview.cpp:539 -#: src/slic3r/GUI/GUI_Preview.cpp:948 -msgid "Feature type" -msgstr "" - -#: src/slic3r/GUI/GCodeViewer.cpp:4028 src/slic3r/GUI/GCodeViewer.cpp:4036 -#: src/slic3r/GUI/RammingChart.cpp:76 -msgid "Time" -msgstr "" - -#: src/slic3r/GUI/GCodeViewer.cpp:4036 -msgid "Percentage" -msgstr "" - -#: src/slic3r/GUI/GCodeViewer.cpp:4039 -msgid "Height (mm)" -msgstr "" - -#: src/slic3r/GUI/GCodeViewer.cpp:4040 -msgid "Width (mm)" -msgstr "" - -#: src/slic3r/GUI/GCodeViewer.cpp:4041 -msgid "Speed (mm/s)" -msgstr "" - -#: src/slic3r/GUI/GCodeViewer.cpp:4042 -msgid "Fan Speed (%)" -msgstr "" - -#: src/slic3r/GUI/GCodeViewer.cpp:4043 -msgid "Volumetric flow rate (mm³/s)" -msgstr "" - -#: src/slic3r/GUI/GCodeViewer.cpp:4044 src/slic3r/GUI/GUI_Preview.cpp:220 -#: src/slic3r/GUI/GUI_Preview.cpp:326 src/slic3r/GUI/GUI_Preview.cpp:477 -#: src/slic3r/GUI/GUI_Preview.cpp:538 src/slic3r/GUI/GUI_Preview.cpp:884 -#: src/slic3r/GUI/GUI_Preview.cpp:948 -msgid "Tool" -msgstr "" - -#: src/slic3r/GUI/GCodeViewer.cpp:4045 src/slic3r/GUI/GUI_Preview.cpp:221 -#: src/slic3r/GUI/GUI_Preview.cpp:536 src/slic3r/GUI/GUI_Preview.cpp:947 -msgid "Color Print" -msgstr "" - -#: src/slic3r/GUI/GCodeViewer.cpp:4082 src/slic3r/GUI/GCodeViewer.cpp:4117 -#: src/slic3r/GUI/GCodeViewer.cpp:4122 src/slic3r/GUI/GUI_ObjectList.cpp:312 -#: src/slic3r/GUI/wxExtensions.cpp:519 src/libslic3r/PrintConfig.cpp:547 -msgid "Extruder" -msgstr "" - -#: src/slic3r/GUI/GCodeViewer.cpp:4093 -msgid "Default color" -msgstr "" - -#: src/slic3r/GUI/GCodeViewer.cpp:4117 -msgid "default color" -msgstr "" - -#: src/slic3r/GUI/GCodeViewer.cpp:4212 src/slic3r/GUI/GCodeViewer.cpp:4258 -msgid "Color change" -msgstr "" - -#: src/slic3r/GUI/GCodeViewer.cpp:4231 src/slic3r/GUI/GCodeViewer.cpp:4256 -msgid "Print" -msgstr "" - -#: src/slic3r/GUI/GCodeViewer.cpp:4257 src/slic3r/GUI/GCodeViewer.cpp:4274 -msgid "Pause" -msgstr "" - -#: src/slic3r/GUI/GCodeViewer.cpp:4262 src/slic3r/GUI/GCodeViewer.cpp:4265 -msgid "Event" -msgstr "" - -#: src/slic3r/GUI/GCodeViewer.cpp:4262 src/slic3r/GUI/GCodeViewer.cpp:4265 -msgid "Remaining time" -msgstr "" - -#: src/slic3r/GUI/GCodeViewer.cpp:4265 -msgid "Duration" -msgstr "" - -#: src/slic3r/GUI/GCodeViewer.cpp:4300 src/slic3r/GUI/GUI_Preview.cpp:1029 -#: src/libslic3r/PrintConfig.cpp:2382 -msgid "Travel" -msgstr "" - -#: src/slic3r/GUI/GCodeViewer.cpp:4303 -msgid "Movement" -msgstr "" - -#: src/slic3r/GUI/GCodeViewer.cpp:4304 -msgid "Extrusion" -msgstr "" - -#: src/slic3r/GUI/GCodeViewer.cpp:4305 src/slic3r/GUI/Tab.cpp:1701 -#: src/slic3r/GUI/Tab.cpp:2589 -msgid "Retraction" -msgstr "" - -#: src/slic3r/GUI/GCodeViewer.cpp:4322 src/slic3r/GUI/GCodeViewer.cpp:4325 -#: src/slic3r/GUI/GUI_Preview.cpp:1030 -msgid "Wipe" -msgstr "" - -#: src/slic3r/GUI/GCodeViewer.cpp:4356 src/slic3r/GUI/GUI_Preview.cpp:248 -#: src/slic3r/GUI/GUI_Preview.cpp:262 -msgid "Options" -msgstr "" - -#: src/slic3r/GUI/GCodeViewer.cpp:4359 src/slic3r/GUI/GUI_Preview.cpp:1031 -msgid "Retractions" -msgstr "" - -#: src/slic3r/GUI/GCodeViewer.cpp:4360 src/slic3r/GUI/GUI_Preview.cpp:1032 -msgid "Deretractions" -msgstr "" - -#: src/slic3r/GUI/GCodeViewer.cpp:4361 src/slic3r/GUI/GUI_Preview.cpp:1033 -msgid "Tool changes" -msgstr "" - -#: src/slic3r/GUI/GCodeViewer.cpp:4362 src/slic3r/GUI/GUI_Preview.cpp:1034 -msgid "Color changes" -msgstr "" - -#: src/slic3r/GUI/GCodeViewer.cpp:4363 src/slic3r/GUI/GUI_Preview.cpp:1035 -msgid "Print pauses" -msgstr "" - -#: src/slic3r/GUI/GCodeViewer.cpp:4364 src/slic3r/GUI/GUI_Preview.cpp:1036 -msgid "Custom G-codes" -msgstr "" - -#: src/slic3r/GUI/GCodeViewer.cpp:4375 src/slic3r/GUI/GCodeViewer.cpp:4399 -#: src/slic3r/GUI/GUI.cpp:354 src/slic3r/GUI/Plater.cpp:698 -#: src/libslic3r/PrintConfig.cpp:117 -msgid "Printer" -msgstr "" - -#: src/slic3r/GUI/GCodeViewer.cpp:4377 src/slic3r/GUI/GCodeViewer.cpp:4404 -#: src/slic3r/GUI/GUI.cpp:350 src/slic3r/GUI/Plater.cpp:694 -msgid "Print settings" -msgstr "" - -#: src/slic3r/GUI/GCodeViewer.cpp:4380 src/slic3r/GUI/GCodeViewer.cpp:4410 -#: src/slic3r/GUI/GUI.cpp:352 src/slic3r/GUI/Plater.cpp:695 -#: src/slic3r/GUI/Tab.cpp:1801 src/slic3r/GUI/Tab.cpp:1802 -msgid "Filament" -msgstr "" - -#: src/slic3r/GUI/GCodeViewer.cpp:4435 src/slic3r/GUI/GCodeViewer.cpp:4440 -#: src/slic3r/GUI/Plater.cpp:243 src/slic3r/GUI/Plater.cpp:1136 -#: src/slic3r/GUI/Plater.cpp:1221 -msgid "Estimated printing time" -msgstr "" - -#: src/slic3r/GUI/GCodeViewer.cpp:4435 -msgid "Normal mode" -msgstr "" - -#: src/slic3r/GUI/GCodeViewer.cpp:4440 -msgid "Stealth mode" -msgstr "" - -#: src/slic3r/GUI/GCodeViewer.cpp:4468 -msgid "Show stealth mode" -msgstr "" - -#: src/slic3r/GUI/GCodeViewer.cpp:4472 -msgid "Show normal mode" -msgstr "" - -#: src/slic3r/GUI/GLCanvas3D.cpp:236 src/slic3r/GUI/GLCanvas3D.cpp:4619 -======= #: src/slic3r/GUI/FirmwareDialog.cpp:916 msgid "Confirmation" msgstr "" @@ -3203,7 +2054,6 @@ msgstr "" #: src/slic3r/GUI/GLCanvas3D.cpp:225 src/slic3r/GUI/GLCanvas3D.cpp:4627 #: src/slic3r/GUI/ObjectDataViewModel.cpp:53 ->>>>>>> master msgid "Variable layer height" msgstr "" @@ -3271,11 +2121,7 @@ msgstr "" msgid "Keep min" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/GLCanvas3D.cpp:304 src/slic3r/GUI/GLCanvas3D.cpp:4055 -======= #: src/slic3r/GUI/GLCanvas3D.cpp:295 src/slic3r/GUI/GLCanvas3D.cpp:4056 ->>>>>>> master msgid "Reset" msgstr "" @@ -3313,42 +2159,6 @@ msgstr "" msgid "Gizmo-Rotate" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/GLCanvas3D.cpp:3389 -msgid "Move Object" -msgstr "" - -#: src/slic3r/GUI/GLCanvas3D.cpp:3859 src/slic3r/GUI/GLCanvas3D.cpp:4580 -msgid "Switch to Settings" -msgstr "" - -#: src/slic3r/GUI/GLCanvas3D.cpp:3860 src/slic3r/GUI/GLCanvas3D.cpp:4580 -msgid "Print Settings Tab" -msgstr "" - -#: src/slic3r/GUI/GLCanvas3D.cpp:3861 src/slic3r/GUI/GLCanvas3D.cpp:4581 -msgid "Filament Settings Tab" -msgstr "" - -#: src/slic3r/GUI/GLCanvas3D.cpp:3861 src/slic3r/GUI/GLCanvas3D.cpp:4581 -msgid "Material Settings Tab" -msgstr "" - -#: src/slic3r/GUI/GLCanvas3D.cpp:3862 src/slic3r/GUI/GLCanvas3D.cpp:4582 -msgid "Printer Settings Tab" -msgstr "" - -#: src/slic3r/GUI/GLCanvas3D.cpp:3914 -msgid "Undo History" -msgstr "" - -#: src/slic3r/GUI/GLCanvas3D.cpp:3914 -msgid "Redo History" -msgstr "" - -#: src/slic3r/GUI/GLCanvas3D.cpp:3935 -#, possible-c-format -======= #: src/slic3r/GUI/GLCanvas3D.cpp:3245 msgid "Move Object" msgstr "" @@ -3383,137 +2193,18 @@ msgstr "" #: src/slic3r/GUI/GLCanvas3D.cpp:3936 #, possible-c-format, possible-boost-format ->>>>>>> master msgid "Undo %1$d Action" msgid_plural "Undo %1$d Actions" msgstr[0] "" msgstr[1] "" -<<<<<<< HEAD -#: src/slic3r/GUI/GLCanvas3D.cpp:3935 -#, possible-c-format -======= #: src/slic3r/GUI/GLCanvas3D.cpp:3936 #, possible-c-format, possible-boost-format ->>>>>>> master msgid "Redo %1$d Action" msgid_plural "Redo %1$d Actions" msgstr[0] "" msgstr[1] "" -<<<<<<< HEAD -#: src/slic3r/GUI/GLCanvas3D.cpp:3955 src/slic3r/GUI/GLCanvas3D.cpp:4598 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:98 src/slic3r/GUI/Search.cpp:348 -msgid "Search" -msgstr "" - -#: src/slic3r/GUI/GLCanvas3D.cpp:3969 src/slic3r/GUI/GLCanvas3D.cpp:3977 -#: src/slic3r/GUI/Search.cpp:355 -msgid "Enter a search term" -msgstr "" - -#: src/slic3r/GUI/GLCanvas3D.cpp:4008 -msgid "Arrange options" -msgstr "" - -#: src/slic3r/GUI/GLCanvas3D.cpp:4038 -msgid "Press %1%left mouse button to enter the exact value" -msgstr "" - -#: src/slic3r/GUI/GLCanvas3D.cpp:4040 -msgid "Spacing" -msgstr "" - -#: src/slic3r/GUI/GLCanvas3D.cpp:4047 -msgid "Enable rotations (slow)" -msgstr "" - -#: src/slic3r/GUI/GLCanvas3D.cpp:4065 src/slic3r/GUI/GLCanvas3D.cpp:4490 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:120 src/slic3r/GUI/Plater.cpp:1649 -msgid "Arrange" -msgstr "" - -#: src/slic3r/GUI/GLCanvas3D.cpp:4464 -msgid "Add..." -msgstr "" - -#: src/slic3r/GUI/GLCanvas3D.cpp:4472 src/slic3r/GUI/GUI_ObjectList.cpp:1882 -#: src/slic3r/GUI/Plater.cpp:4015 src/slic3r/GUI/Plater.cpp:4039 -#: src/slic3r/GUI/Tab.cpp:3491 -msgid "Delete" -msgstr "" - -#: src/slic3r/GUI/GLCanvas3D.cpp:4481 src/slic3r/GUI/KBShortcutsDialog.cpp:88 -#: src/slic3r/GUI/Plater.cpp:5128 -msgid "Delete all" -msgstr "" - -#: src/slic3r/GUI/GLCanvas3D.cpp:4490 src/slic3r/GUI/KBShortcutsDialog.cpp:121 -msgid "Arrange selection" -msgstr "" - -#: src/slic3r/GUI/GLCanvas3D.cpp:4490 -msgid "Click right mouse button to show arrangement options" -msgstr "" - -#: src/slic3r/GUI/GLCanvas3D.cpp:4512 -msgid "Copy" -msgstr "" - -#: src/slic3r/GUI/GLCanvas3D.cpp:4521 -msgid "Paste" -msgstr "" - -#: src/slic3r/GUI/GLCanvas3D.cpp:4533 src/slic3r/GUI/Plater.cpp:3874 -#: src/slic3r/GUI/Plater.cpp:3886 src/slic3r/GUI/Plater.cpp:4024 -msgid "Add instance" -msgstr "" - -#: src/slic3r/GUI/GLCanvas3D.cpp:4544 src/slic3r/GUI/Plater.cpp:4026 -msgid "Remove instance" -msgstr "" - -#: src/slic3r/GUI/GLCanvas3D.cpp:4557 -msgid "Split to objects" -msgstr "" - -#: src/slic3r/GUI/GLCanvas3D.cpp:4567 src/slic3r/GUI/GUI_ObjectList.cpp:1654 -msgid "Split to parts" -msgstr "" - -#: src/slic3r/GUI/GLCanvas3D.cpp:4669 src/slic3r/GUI/KBShortcutsDialog.cpp:89 -#: src/slic3r/GUI/MainFrame.cpp:1125 -msgid "Undo" -msgstr "" - -#: src/slic3r/GUI/GLCanvas3D.cpp:4669 src/slic3r/GUI/GLCanvas3D.cpp:4708 -msgid "Click right mouse button to open/close History" -msgstr "" - -#: src/slic3r/GUI/GLCanvas3D.cpp:4692 -msgid "Next Undo action: %1%" -msgstr "" - -#: src/slic3r/GUI/GLCanvas3D.cpp:4708 src/slic3r/GUI/KBShortcutsDialog.cpp:90 -#: src/slic3r/GUI/MainFrame.cpp:1128 -msgid "Redo" -msgstr "" - -#: src/slic3r/GUI/GLCanvas3D.cpp:4730 -msgid "Next Redo action: %1%" -msgstr "" - -#: src/slic3r/GUI/GLCanvas3D.cpp:6354 -msgid "Selection-Add from rectangle" -msgstr "" - -#: src/slic3r/GUI/GLCanvas3D.cpp:6373 -msgid "Selection-Remove from rectangle" -msgstr "" - -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:54 -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:151 src/libslic3r/PrintConfig.cpp:3694 -======= #: src/slic3r/GUI/GLCanvas3D.cpp:3956 src/slic3r/GUI/GLCanvas3D.cpp:4606 #: src/slic3r/GUI/KBShortcutsDialog.cpp:106 src/slic3r/GUI/Search.cpp:435 msgid "Search" @@ -3639,7 +2330,6 @@ msgstr "" #: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:50 #: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:160 src/libslic3r/PrintConfig.cpp:4326 ->>>>>>> master msgid "Cut" msgstr "" @@ -3746,14 +2436,9 @@ msgid "Circle" msgstr "" #: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:54 -<<<<<<< HEAD -#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:37 -#: src/slic3r/GUI/GUI_ObjectList.cpp:1599 -======= #: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:123 #: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:43 #: src/slic3r/GUI/GUI_Factories.cpp:461 ->>>>>>> master msgid "Sphere" msgstr "" @@ -3898,13 +2583,8 @@ msgstr "" msgid "Quality" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:44 -#: src/libslic3r/PrintConfig.cpp:3185 -======= #: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:34 #: src/libslic3r/PrintConfig.cpp:3759 ->>>>>>> master msgid "Closing distance" msgstr "" @@ -4006,12 +2686,8 @@ msgstr "" #: src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp:466 #: src/slic3r/GUI/GUI_ObjectManipulation.cpp:543 #: src/slic3r/GUI/GUI_ObjectManipulation.cpp:562 -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:3743 -======= #: src/slic3r/GUI/GUI_ObjectManipulation.cpp:578 #: src/libslic3r/PrintConfig.cpp:4380 ->>>>>>> master msgid "Rotate" msgstr "" @@ -4027,12 +2703,8 @@ msgstr "" #: src/slic3r/GUI/Gizmos/GLGizmoScale.cpp:79 #: src/slic3r/GUI/GUI_ObjectManipulation.cpp:216 #: src/slic3r/GUI/GUI_ObjectManipulation.cpp:563 -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:3758 -======= #: src/slic3r/GUI/GUI_ObjectManipulation.cpp:579 #: src/libslic3r/PrintConfig.cpp:4395 ->>>>>>> master msgid "Scale" msgstr "" @@ -4166,13 +2838,8 @@ msgstr "" msgid "Minimal points distance" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:54 -#: src/libslic3r/PrintConfig.cpp:3015 -======= #: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:46 #: src/libslic3r/PrintConfig.cpp:3589 ->>>>>>> master msgid "Support points density" msgstr "" @@ -4229,18 +2896,7 @@ msgstr "" msgid "Are you sure you want to do it?" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1129 src/slic3r/GUI/GUI.cpp:258 -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:621 -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:645 -#: src/slic3r/GUI/WipeTowerDialog.cpp:45 src/slic3r/GUI/WipeTowerDialog.cpp:366 -msgid "Warning" -msgstr "" - -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1134 -======= #: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1138 ->>>>>>> master msgid "Autogenerate support points" msgstr "" @@ -4379,55 +3035,6 @@ msgid "" "were not recognized." msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI.cpp:305 -msgid "Undefined" -msgstr "" - -#: src/slic3r/GUI/GUI.cpp:330 -msgid "%1% was substituted with %2%" -msgstr "" - -#: src/slic3r/GUI/GUI.cpp:339 -msgid "" -"Most likely the configuration was produced by a newer version of PrusaSlicer " -"or by some PrusaSlicer fork." -msgstr "" - -#: src/slic3r/GUI/GUI.cpp:340 -msgid "The following values were substituted:" -msgstr "" - -#: src/slic3r/GUI/GUI.cpp:341 -msgid "Review the substitutions and adjust them if needed." -msgstr "" - -#: src/slic3r/GUI/GUI.cpp:351 src/slic3r/GUI/Plater.cpp:696 -msgid "SLA print settings" -msgstr "" - -#: src/slic3r/GUI/GUI.cpp:355 src/slic3r/GUI/PhysicalPrinterDialog.cpp:156 -msgid "Physical Printer" -msgstr "" - -#: src/slic3r/GUI/GUI.cpp:368 -msgid "" -"Configuration bundle was loaded, however some configuration values were not " -"recognized." -msgstr "" - -#: src/slic3r/GUI/GUI.cpp:378 -msgid "" -"Configuration file \"%1%\" was loaded, however some configuration values " -"were not recognized." -msgstr "" - -#: src/slic3r/GUI/GUI_App.cpp:247 -msgid "is based on Slic3r by Alessandro Ranellucci and the RepRap community." -msgstr "" - -#: src/slic3r/GUI/GUI_App.cpp:249 -======= #: src/slic3r/GUI/GUI_App.cpp:266 msgid "is based on Slic3r by Alessandro Ranellucci and the RepRap community." msgstr "" @@ -4437,26 +3044,17 @@ msgid "Developed by Prusa Research." msgstr "" #: src/slic3r/GUI/GUI_App.cpp:269 ->>>>>>> master msgid "" "Contributions by Vojtech Bubnik, Enrico Turri, Oleksandra Iushchenko, Tamas " "Meszaros, Lukas Matena, Vojtech Kral, David Kocik and numerous others." msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_App.cpp:250 -msgid "Artwork model by Nora Al-Badri and Jan Nikolai Nelles" -msgstr "" - -#: src/slic3r/GUI/GUI_App.cpp:391 -======= #: src/slic3r/GUI/GUI_App.cpp:270 msgid "Artwork model by M Boyer" msgstr "" #: src/slic3r/GUI/GUI_App.cpp:411 #, possible-boost-format ->>>>>>> master msgid "" "Starting with %1% 2.3, configuration directory on Linux has changed " "(according to XDG Base Directory Specification) to \n" @@ -4475,23 +3073,6 @@ msgid "" "What do you want to do now?" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_App.cpp:399 -#, possible-c-format -msgid "%s - BREAKING CHANGE" -msgstr "" - -#: src/slic3r/GUI/GUI_App.cpp:401 -msgid "Quit, I will move my data now" -msgstr "" - -#: src/slic3r/GUI/GUI_App.cpp:401 -msgid "Start the application" -msgstr "" - -#: src/slic3r/GUI/GUI_App.cpp:591 -#, possible-c-format -======= #: src/slic3r/GUI/GUI_App.cpp:419 #, possible-c-format, possible-boost-format msgid "%s - BREAKING CHANGE" @@ -4507,7 +3088,6 @@ msgstr "" #: src/slic3r/GUI/GUI_App.cpp:698 #, possible-c-format, possible-boost-format ->>>>>>> master msgid "" "%s has encountered an error. It was likely caused by running out of memory. " "If you are sure you have enough RAM on your system, this may also be a bug " @@ -4516,19 +3096,11 @@ msgid "" "The application will now terminate." msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_App.cpp:594 -msgid "Fatal error" -msgstr "" - -#: src/slic3r/GUI/GUI_App.cpp:598 -======= #: src/slic3r/GUI/GUI_App.cpp:701 msgid "Fatal error" msgstr "" #: src/slic3r/GUI/GUI_App.cpp:705 ->>>>>>> master msgid "" "PrusaSlicer has encountered a localization error. Please report to " "PrusaSlicer team, what language was active and in which scenario this issue " @@ -4537,13 +3109,6 @@ msgid "" "The application will now terminate." msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_App.cpp:601 -msgid "Critical error" -msgstr "" - -#: src/slic3r/GUI/GUI_App.cpp:749 -======= #: src/slic3r/GUI/GUI_App.cpp:708 msgid "Critical error" msgstr "" @@ -4554,27 +3119,18 @@ msgid "Internal error: %1%" msgstr "" #: src/slic3r/GUI/GUI_App.cpp:901 src/slic3r/GUI/GUI_App.cpp:999 ->>>>>>> master msgid "" "Error parsing PrusaSlicer config file, it is probably corrupted. Try to " "manually delete the file to recover from the error. Your user profiles will " "not be affected." msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_App.cpp:755 -======= #: src/slic3r/GUI/GUI_App.cpp:907 src/slic3r/GUI/GUI_App.cpp:1005 ->>>>>>> master msgid "" "Error parsing PrusaGCodeViewer config file, it is probably corrupted. Try to " "manually delete the file to recover from the error." msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_App.cpp:809 -#, possible-c-format -======= #: src/slic3r/GUI/GUI_App.cpp:954 #, possible-boost-format msgid "You are opening %1% version %2%." @@ -4625,27 +3181,11 @@ msgstr "" #: src/slic3r/GUI/GUI_App.cpp:1126 #, possible-c-format, possible-boost-format ->>>>>>> master msgid "" "%s\n" "Do you want to continue?" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_App.cpp:811 src/slic3r/GUI/UnsavedChangesDialog.cpp:665 -msgid "Remember my choice" -msgstr "" - -#: src/slic3r/GUI/GUI_App.cpp:846 -msgid "Loading configuration" -msgstr "" - -#: src/slic3r/GUI/GUI_App.cpp:917 -msgid "Preparing settings tabs" -msgstr "" - -#: src/slic3r/GUI/GUI_App.cpp:1134 -======= #: src/slic3r/GUI/GUI_App.cpp:1128 src/slic3r/GUI/GUI_App.cpp:3070 #: src/slic3r/GUI/Plater.cpp:1728 src/slic3r/GUI/UnsavedChangesDialog.cpp:888 msgid "Remember my choice" @@ -4709,125 +3249,24 @@ msgid "Leave \"%1%\" enabled" msgstr "" #: src/slic3r/GUI/GUI_App.cpp:1657 ->>>>>>> master msgid "" "You have the following presets with saved options for \"Print Host upload\"" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_App.cpp:1138 -======= #: src/slic3r/GUI/GUI_App.cpp:1661 ->>>>>>> master msgid "" "But since this version of PrusaSlicer we don't show this information in " "Printer Settings anymore.\n" "Settings will be available in physical printers settings." msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_App.cpp:1140 -======= #: src/slic3r/GUI/GUI_App.cpp:1663 ->>>>>>> master msgid "" "By default new Printer devices will be named as \"Printer N\" during its " "creation.\n" "Note: This name can be changed later from the physical printers settings" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_App.cpp:1143 src/slic3r/GUI/PhysicalPrinterDialog.cpp:691 -msgid "Information" -msgstr "" - -#: src/slic3r/GUI/GUI_App.cpp:1156 src/slic3r/GUI/GUI_App.cpp:1167 -msgid "Recreating" -msgstr "" - -#: src/slic3r/GUI/GUI_App.cpp:1172 -msgid "Loading of current presets" -msgstr "" - -#: src/slic3r/GUI/GUI_App.cpp:1177 -msgid "Loading of a mode view" -msgstr "" - -#: src/slic3r/GUI/GUI_App.cpp:1253 -msgid "Choose one file (3MF/AMF):" -msgstr "" - -#: src/slic3r/GUI/GUI_App.cpp:1265 -msgid "Choose one or more files (STL/OBJ/AMF/3MF/PRUSA):" -msgstr "" - -#: src/slic3r/GUI/GUI_App.cpp:1277 -msgid "Choose one file (GCODE/.GCO/.G/.ngc/NGC):" -msgstr "" - -#: src/slic3r/GUI/GUI_App.cpp:1288 -msgid "Changing of an application language" -msgstr "" - -#: src/slic3r/GUI/GUI_App.cpp:1411 -msgid "Select the language" -msgstr "" - -#: src/slic3r/GUI/GUI_App.cpp:1411 -msgid "Language" -msgstr "" - -#: src/slic3r/GUI/GUI_App.cpp:1560 -msgid "modified" -msgstr "" - -#: src/slic3r/GUI/GUI_App.cpp:1609 -#, possible-c-format -msgid "Run %s" -msgstr "" - -#: src/slic3r/GUI/GUI_App.cpp:1613 -msgid "&Configuration Snapshots" -msgstr "" - -#: src/slic3r/GUI/GUI_App.cpp:1613 -msgid "Inspect / activate configuration snapshots" -msgstr "" - -#: src/slic3r/GUI/GUI_App.cpp:1614 -msgid "Take Configuration &Snapshot" -msgstr "" - -#: src/slic3r/GUI/GUI_App.cpp:1614 -msgid "Capture a configuration snapshot" -msgstr "" - -#: src/slic3r/GUI/GUI_App.cpp:1615 -msgid "Check for updates" -msgstr "" - -#: src/slic3r/GUI/GUI_App.cpp:1615 -msgid "Check for configuration updates" -msgstr "" - -#: src/slic3r/GUI/GUI_App.cpp:1618 -msgid "&Preferences" -msgstr "" - -#: src/slic3r/GUI/GUI_App.cpp:1624 -msgid "Application preferences" -msgstr "" - -#: src/slic3r/GUI/GUI_App.cpp:1629 src/slic3r/GUI/wxExtensions.cpp:685 -msgid "Simple" -msgstr "" - -#: src/slic3r/GUI/GUI_App.cpp:1629 -msgid "Simple View Mode" -msgstr "" - -#: src/slic3r/GUI/GUI_App.cpp:1631 src/slic3r/GUI/wxExtensions.cpp:687 -======= #: src/slic3r/GUI/GUI_App.cpp:1667 src/slic3r/GUI/PhysicalPrinterDialog.cpp:722 msgid "Information" msgstr "" @@ -4918,63 +3357,10 @@ msgid "Simple View Mode" msgstr "" #: src/slic3r/GUI/GUI_App.cpp:2240 src/slic3r/GUI/wxExtensions.cpp:710 ->>>>>>> master msgctxt "Mode" msgid "Advanced" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_App.cpp:1631 -msgid "Advanced View Mode" -msgstr "" - -#: src/slic3r/GUI/GUI_App.cpp:1632 src/slic3r/GUI/wxExtensions.cpp:688 -msgid "Expert" -msgstr "" - -#: src/slic3r/GUI/GUI_App.cpp:1632 -msgid "Expert View Mode" -msgstr "" - -#: src/slic3r/GUI/GUI_App.cpp:1637 -msgid "Mode" -msgstr "" - -#: src/slic3r/GUI/GUI_App.cpp:1637 -#, possible-c-format -msgid "%s View Mode" -msgstr "" - -#: src/slic3r/GUI/GUI_App.cpp:1640 -msgid "&Language" -msgstr "" - -#: src/slic3r/GUI/GUI_App.cpp:1643 -msgid "Flash printer &firmware" -msgstr "" - -#: src/slic3r/GUI/GUI_App.cpp:1643 -msgid "Upload a firmware image into an Arduino based printer" -msgstr "" - -#: src/slic3r/GUI/GUI_App.cpp:1659 -msgid "Taking configuration snapshot" -msgstr "" - -#: src/slic3r/GUI/GUI_App.cpp:1659 -msgid "Snapshot name" -msgstr "" - -#: src/slic3r/GUI/GUI_App.cpp:1697 -msgid "Failed to activate configuration snapshot." -msgstr "" - -#: src/slic3r/GUI/GUI_App.cpp:1747 -msgid "Language selection" -msgstr "" - -#: src/slic3r/GUI/GUI_App.cpp:1749 -======= #: src/slic3r/GUI/GUI_App.cpp:2240 msgid "Advanced View Mode" msgstr "" @@ -5044,61 +3430,11 @@ msgid "Language selection" msgstr "" #: src/slic3r/GUI/GUI_App.cpp:2369 ->>>>>>> master msgid "" "Switching the language will trigger application restart.\n" "You will lose content of the plater." msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_App.cpp:1751 -msgid "Do you want to proceed?" -msgstr "" - -#: src/slic3r/GUI/GUI_App.cpp:1778 -msgid "&Configuration" -msgstr "" - -#: src/slic3r/GUI/GUI_App.cpp:1809 -msgid "The preset(s) modifications are successfully saved" -msgstr "" - -#: src/slic3r/GUI/GUI_App.cpp:1830 -msgid "The uploads are still ongoing" -msgstr "" - -#: src/slic3r/GUI/GUI_App.cpp:1830 -msgid "Stop them and continue anyway?" -msgstr "" - -#: src/slic3r/GUI/GUI_App.cpp:1833 -msgid "Ongoing uploads" -msgstr "" - -#: src/slic3r/GUI/GUI_App.cpp:2061 src/slic3r/GUI/Tab.cpp:3249 -msgid "It's impossible to print multi-part object(s) with SLA technology." -msgstr "" - -#: src/slic3r/GUI/GUI_App.cpp:2062 -msgid "Please check and fix your object list." -msgstr "" - -#: src/slic3r/GUI/GUI_App.cpp:2063 src/slic3r/GUI/Jobs/SLAImportJob.cpp:212 -#: src/slic3r/GUI/Plater.cpp:2361 src/slic3r/GUI/Tab.cpp:3251 -msgid "Attention!" -msgstr "" - -#: src/slic3r/GUI/GUI_App.cpp:2080 -msgid "Select a gcode file:" -msgstr "" - -#: src/slic3r/GUI/GUI_Init.cpp:57 src/slic3r/GUI/GUI_Init.cpp:60 -msgid "PrusaSlicer GUI initialization failed" -msgstr "" - -#: src/slic3r/GUI/GUI_Init.cpp:60 -msgid "Fatal error, exception catched: %1%" -======= #: src/slic3r/GUI/GUI_App.cpp:2371 src/slic3r/GUI/Preferences.cpp:582 msgid "Do you want to proceed?" msgstr "" @@ -5164,7 +3500,6 @@ msgstr "" #: src/slic3r/GUI/GUI_App.cpp:3069 src/slic3r/GUI/GUI_App.cpp:3092 msgid "PrusaSlicer: Open hyperlink" ->>>>>>> master msgstr "" #: src/slic3r/GUI/GUI_App.cpp:3074 src/slic3r/GUI/Preferences.cpp:382 @@ -5186,42 +3521,6 @@ msgid "" "to changes your choice." msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_ObjectList.cpp:34 src/slic3r/GUI/GUI_ObjectList.cpp:92 -#: src/slic3r/GUI/GUI_ObjectList.cpp:667 src/libslic3r/PrintConfig.cpp:74 -#: src/libslic3r/PrintConfig.cpp:189 src/libslic3r/PrintConfig.cpp:231 -#: src/libslic3r/PrintConfig.cpp:240 src/libslic3r/PrintConfig.cpp:464 -#: src/libslic3r/PrintConfig.cpp:530 src/libslic3r/PrintConfig.cpp:538 -#: src/libslic3r/PrintConfig.cpp:970 src/libslic3r/PrintConfig.cpp:1219 -#: src/libslic3r/PrintConfig.cpp:1586 src/libslic3r/PrintConfig.cpp:1652 -#: src/libslic3r/PrintConfig.cpp:1837 src/libslic3r/PrintConfig.cpp:2304 -#: src/libslic3r/PrintConfig.cpp:2363 src/libslic3r/PrintConfig.cpp:2372 -msgid "Layers and Perimeters" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:36 src/slic3r/GUI/GUI_ObjectList.cpp:95 -#: src/slic3r/GUI/GUI_ObjectList.cpp:670 src/slic3r/GUI/GUI_Preview.cpp:240 -#: src/slic3r/GUI/Tab.cpp:1479 src/slic3r/GUI/Tab.cpp:1481 -#: src/libslic3r/ExtrusionEntity.cpp:320 src/libslic3r/ExtrusionEntity.cpp:352 -#: src/libslic3r/PrintConfig.cpp:426 src/libslic3r/PrintConfig.cpp:1717 -#: src/libslic3r/PrintConfig.cpp:2095 src/libslic3r/PrintConfig.cpp:2101 -#: src/libslic3r/PrintConfig.cpp:2109 src/libslic3r/PrintConfig.cpp:2121 -#: src/libslic3r/PrintConfig.cpp:2131 src/libslic3r/PrintConfig.cpp:2139 -#: src/libslic3r/PrintConfig.cpp:2154 src/libslic3r/PrintConfig.cpp:2175 -#: src/libslic3r/PrintConfig.cpp:2187 src/libslic3r/PrintConfig.cpp:2203 -#: src/libslic3r/PrintConfig.cpp:2212 src/libslic3r/PrintConfig.cpp:2221 -#: src/libslic3r/PrintConfig.cpp:2232 src/libslic3r/PrintConfig.cpp:2246 -#: src/libslic3r/PrintConfig.cpp:2254 src/libslic3r/PrintConfig.cpp:2255 -#: src/libslic3r/PrintConfig.cpp:2264 src/libslic3r/PrintConfig.cpp:2272 -#: src/libslic3r/PrintConfig.cpp:2286 -msgid "Support material" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:39 src/slic3r/GUI/GUI_ObjectList.cpp:99 -#: src/slic3r/GUI/GUI_ObjectList.cpp:674 src/libslic3r/PrintConfig.cpp:2482 -#: src/libslic3r/PrintConfig.cpp:2490 -msgid "Wipe options" -======= #: src/slic3r/GUI/GUI_App.cpp:3080 src/slic3r/GUI/Plater.cpp:1740 #: src/slic3r/GUI/UnsavedChangesDialog.cpp:905 msgid "PrusaSlicer: Don't ask me again" @@ -5234,7 +3533,6 @@ msgstr "" #: src/slic3r/GUI/GUI_Init.cpp:60 #, possible-boost-format msgid "Fatal error, exception catched: %1%" ->>>>>>> master msgstr "" #: src/slic3r/GUI/GUI_Factories.cpp:54 src/slic3r/GUI/GUI_Factories.cpp:127 @@ -5290,86 +3588,6 @@ msgstr "" msgid "Ironing" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_ObjectList.cpp:94 src/slic3r/GUI/GUI_ObjectList.cpp:669 -#: src/slic3r/GUI/GUI_Preview.cpp:236 src/slic3r/GUI/Tab.cpp:1449 -#: src/libslic3r/ExtrusionEntity.cpp:316 src/libslic3r/ExtrusionEntity.cpp:344 -#: src/libslic3r/PrintConfig.cpp:1226 src/libslic3r/PrintConfig.cpp:1232 -#: src/libslic3r/PrintConfig.cpp:1246 src/libslic3r/PrintConfig.cpp:1256 -#: src/libslic3r/PrintConfig.cpp:1264 src/libslic3r/PrintConfig.cpp:1266 -msgid "Ironing" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:96 src/slic3r/GUI/GUI_ObjectList.cpp:671 -#: src/slic3r/GUI/GUI_Preview.cpp:217 src/slic3r/GUI/Tab.cpp:1505 -#: src/libslic3r/PrintConfig.cpp:291 src/libslic3r/PrintConfig.cpp:518 -#: src/libslic3r/PrintConfig.cpp:1012 src/libslic3r/PrintConfig.cpp:1192 -#: src/libslic3r/PrintConfig.cpp:1265 src/libslic3r/PrintConfig.cpp:1642 -#: src/libslic3r/PrintConfig.cpp:1918 src/libslic3r/PrintConfig.cpp:1970 -#: src/libslic3r/PrintConfig.cpp:2348 -msgid "Speed" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:97 src/slic3r/GUI/GUI_ObjectList.cpp:672 -#: src/slic3r/GUI/Tab.cpp:1541 src/slic3r/GUI/Tab.cpp:2119 -#: src/libslic3r/PrintConfig.cpp:548 src/libslic3r/PrintConfig.cpp:1146 -#: src/libslic3r/PrintConfig.cpp:1620 src/libslic3r/PrintConfig.cpp:1939 -#: src/libslic3r/PrintConfig.cpp:2167 src/libslic3r/PrintConfig.cpp:2194 -msgid "Extruders" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:98 src/slic3r/GUI/GUI_ObjectList.cpp:673 -#: src/libslic3r/PrintConfig.cpp:507 src/libslic3r/PrintConfig.cpp:616 -#: src/libslic3r/PrintConfig.cpp:957 src/libslic3r/PrintConfig.cpp:1154 -#: src/libslic3r/PrintConfig.cpp:1629 src/libslic3r/PrintConfig.cpp:1959 -#: src/libslic3r/PrintConfig.cpp:2176 src/libslic3r/PrintConfig.cpp:2336 -msgid "Extrusion Width" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:102 src/slic3r/GUI/GUI_ObjectList.cpp:677 -#: src/slic3r/GUI/Tab.cpp:1435 src/slic3r/GUI/Tab.cpp:1459 -#: src/slic3r/GUI/Tab.cpp:1562 src/slic3r/GUI/Tab.cpp:1565 -#: src/slic3r/GUI/Tab.cpp:1862 src/slic3r/GUI/Tab.cpp:2204 -#: src/slic3r/GUI/Tab.cpp:4121 src/libslic3r/PrintConfig.cpp:92 -#: src/libslic3r/PrintConfig.cpp:132 src/libslic3r/PrintConfig.cpp:279 -#: src/libslic3r/PrintConfig.cpp:1097 src/libslic3r/PrintConfig.cpp:1181 -#: src/libslic3r/PrintConfig.cpp:2506 src/libslic3r/PrintConfig.cpp:2678 -msgid "Advanced" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:104 src/slic3r/GUI/GUI_ObjectList.cpp:679 -#: src/slic3r/GUI/Plater.cpp:358 src/slic3r/GUI/Tab.cpp:4055 -#: src/slic3r/GUI/Tab.cpp:4056 src/libslic3r/PrintConfig.cpp:2844 -#: src/libslic3r/PrintConfig.cpp:2851 src/libslic3r/PrintConfig.cpp:2860 -#: src/libslic3r/PrintConfig.cpp:2869 src/libslic3r/PrintConfig.cpp:2879 -#: src/libslic3r/PrintConfig.cpp:2889 src/libslic3r/PrintConfig.cpp:2926 -#: src/libslic3r/PrintConfig.cpp:2933 src/libslic3r/PrintConfig.cpp:2944 -#: src/libslic3r/PrintConfig.cpp:2954 src/libslic3r/PrintConfig.cpp:2963 -#: src/libslic3r/PrintConfig.cpp:2976 src/libslic3r/PrintConfig.cpp:2986 -#: src/libslic3r/PrintConfig.cpp:2995 src/libslic3r/PrintConfig.cpp:3005 -#: src/libslic3r/PrintConfig.cpp:3016 src/libslic3r/PrintConfig.cpp:3024 -msgid "Supports" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:105 src/slic3r/GUI/GUI_ObjectList.cpp:680 -#: src/slic3r/GUI/Plater.cpp:501 src/slic3r/GUI/Tab.cpp:4096 -#: src/slic3r/GUI/Tab.cpp:4097 src/slic3r/GUI/Tab.cpp:4168 -#: src/libslic3r/PrintConfig.cpp:3032 src/libslic3r/PrintConfig.cpp:3039 -#: src/libslic3r/PrintConfig.cpp:3053 src/libslic3r/PrintConfig.cpp:3064 -#: src/libslic3r/PrintConfig.cpp:3074 src/libslic3r/PrintConfig.cpp:3096 -#: src/libslic3r/PrintConfig.cpp:3107 src/libslic3r/PrintConfig.cpp:3114 -#: src/libslic3r/PrintConfig.cpp:3121 src/libslic3r/PrintConfig.cpp:3132 -#: src/libslic3r/PrintConfig.cpp:3141 src/libslic3r/PrintConfig.cpp:3150 -msgid "Pad" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:106 src/slic3r/GUI/Tab.cpp:4114 -#: src/slic3r/GUI/Tab.cpp:4115 src/libslic3r/SLA/Hollowing.cpp:45 -#: src/libslic3r/SLA/Hollowing.cpp:57 src/libslic3r/SLA/Hollowing.cpp:66 -#: src/libslic3r/SLA/Hollowing.cpp:75 src/libslic3r/PrintConfig.cpp:3160 -#: src/libslic3r/PrintConfig.cpp:3167 src/libslic3r/PrintConfig.cpp:3177 -#: src/libslic3r/PrintConfig.cpp:3186 -======= #: src/slic3r/GUI/GUI_Factories.cpp:130 src/libslic3r/PrintConfig.cpp:1260 #: src/libslic3r/PrintConfig.cpp:1261 src/libslic3r/PrintConfig.cpp:1276 #: src/libslic3r/PrintConfig.cpp:1286 @@ -5451,7 +3669,6 @@ msgstr "" #: src/libslic3r/SLA/Hollowing.cpp:100 src/libslic3r/PrintConfig.cpp:3734 #: src/libslic3r/PrintConfig.cpp:3741 src/libslic3r/PrintConfig.cpp:3751 #: src/libslic3r/PrintConfig.cpp:3760 ->>>>>>> master msgid "Hollowing" msgstr "" @@ -5526,205 +3743,6 @@ msgstr "" msgid "Set as a Separated Object" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_ObjectList.cpp:1251 -#: src/slic3r/GUI/GUI_ObjectList.cpp:4378 -msgid "Instances to Separated Objects" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1266 -msgid "Volumes in Object reordered" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1266 -msgid "Object reordered" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1342 -#: src/slic3r/GUI/GUI_ObjectList.cpp:1697 -#: src/slic3r/GUI/GUI_ObjectList.cpp:1703 -#: src/slic3r/GUI/GUI_ObjectList.cpp:2085 -#, possible-c-format -msgid "Quick Add Settings (%s)" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1432 -msgid "Select showing settings" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1481 -msgid "Add Settings for Layers" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1482 -msgid "Add Settings for Sub-object" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1483 -msgid "Add Settings for Object" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1553 -msgid "Add Settings Bundle for Height range" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1554 -msgid "Add Settings Bundle for Sub-object" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1555 -msgid "Add Settings Bundle for Object" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1594 -msgid "Load" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1599 -#: src/slic3r/GUI/GUI_ObjectList.cpp:1631 -#: src/slic3r/GUI/GUI_ObjectList.cpp:1635 -msgid "Box" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1599 -msgid "Cylinder" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1599 -msgid "Slab" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1667 -msgid "Height range Modifier" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1676 -msgid "Add settings" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1754 -msgid "Change type" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1764 -#: src/slic3r/GUI/GUI_ObjectList.cpp:1776 -msgid "Set as a Separated Object" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1776 -msgid "Set as a Separated Objects" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1786 -msgid "Printable" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1801 -msgid "Rename" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1812 -msgid "Fix through the Netfabb" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1822 src/slic3r/GUI/Plater.cpp:4052 -msgid "Export as STL" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1829 -#: src/slic3r/GUI/GUI_ObjectList.cpp:4573 src/slic3r/GUI/Plater.cpp:4018 -msgid "Reload the selected volumes from disk" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1836 -msgid "Set extruder for selected items" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1868 src/libslic3r/PrintConfig.cpp:391 -msgid "Default" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1888 -msgid "Scale to print volume" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1888 -msgid "Scale the selected object to fit the print volume" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1917 src/slic3r/GUI/Plater.cpp:5245 -msgid "Convert from imperial units" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1919 src/slic3r/GUI/Plater.cpp:5245 -msgid "Revert conversion from imperial units" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1948 -#: src/slic3r/GUI/GUI_ObjectList.cpp:1956 -#: src/slic3r/GUI/GUI_ObjectList.cpp:2636 src/libslic3r/PrintConfig.cpp:3734 -msgid "Merge" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1948 -msgid "Merge objects to the one multipart object" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1956 -msgid "Merge objects to the one single object" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2030 -#: src/slic3r/GUI/GUI_ObjectList.cpp:2287 -msgid "Add Shape" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2115 -msgid "Load Part" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2154 -msgid "Error!" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2229 -msgid "Add Generic Subobject" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2258 -msgid "Generic" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2384 -msgid "Delete Settings" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2408 -msgid "Delete All Instances from Object" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2424 -msgid "Delete Height Range" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2456 -msgid "From Object List You can't delete the last solid part from object." -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2460 -msgid "Delete Subobject" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2475 -msgid "Last instance of an object cannot be deleted." -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2479 -msgid "Delete Instance" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2503 src/slic3r/GUI/Plater.cpp:2873 -======= #: src/slic3r/GUI/GUI_Factories.cpp:648 msgid "Set as a Separated Objects" msgstr "" @@ -6121,80 +4139,10 @@ msgid "Delete Instance" msgstr "" #: src/slic3r/GUI/GUI_ObjectList.cpp:2004 ->>>>>>> master msgid "" "The selected object couldn't be split because it contains only one part." msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_ObjectList.cpp:2507 -msgid "Split to Parts" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2643 -msgid "Merged" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2727 -msgid "Merge all parts to the one single object" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2759 -msgid "Add Layers" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2913 -msgid "Group manipulation" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2925 -msgid "Object manipulation" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2938 -msgid "Object Settings to modify" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2942 -msgid "Part Settings to modify" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2947 -msgid "Layer range Settings to modify" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2953 -msgid "Part manipulation" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2959 -msgid "Instance manipulation" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2966 -msgid "Height ranges" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2966 -msgid "Settings for height range" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:3150 -msgid "Delete Selected Item" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:3338 -msgid "Delete Selected" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:3414 -#: src/slic3r/GUI/GUI_ObjectList.cpp:3442 -#: src/slic3r/GUI/GUI_ObjectList.cpp:3462 -msgid "Add Height Range" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:3508 -======= #: src/slic3r/GUI/GUI_ObjectList.cpp:2008 msgid "Split to Parts" msgstr "" @@ -6262,18 +4210,13 @@ msgid "Add Height Range" msgstr "" #: src/slic3r/GUI/GUI_ObjectList.cpp:3104 ->>>>>>> master 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 "" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_ObjectList.cpp:3512 -======= #: src/slic3r/GUI/GUI_ObjectList.cpp:3108 ->>>>>>> master msgid "" "Cannot insert a new layer range between the current and the next layer " "range.\n" @@ -6281,128 +4224,12 @@ msgid "" "is thinner than the minimum layer height allowed." msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_ObjectList.cpp:3517 -======= #: src/slic3r/GUI/GUI_ObjectList.cpp:3113 ->>>>>>> master msgid "" "Cannot insert a new layer range after the current layer range.\n" "Current layer range overlaps with the next layer range." msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_ObjectList.cpp:3576 -msgid "Edit Height Range" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:3871 -msgid "Selection-Remove from list" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:3879 -msgid "Selection-Add from list" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4014 -msgid "Object or Instance" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4015 -#: src/slic3r/GUI/GUI_ObjectList.cpp:4148 -msgid "Part" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4015 -msgid "Layer" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4017 -msgid "Unsupported selection" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4018 -#, possible-c-format -msgid "You started your selection with %s Item." -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4019 -#, possible-c-format -msgid "In this mode you can select only other %s Items%s" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4022 -msgid "of a current Object" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4027 -#: src/slic3r/GUI/GUI_ObjectList.cpp:4102 src/slic3r/GUI/Plater.cpp:144 -msgid "Info" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4143 -msgid "You can't change a type of the last solid part of the object." -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4148 -msgid "Modifier" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4148 -msgid "Support Enforcer" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4148 -msgid "Support Blocker" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4150 -msgid "Select type of part" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4155 -msgid "Change Part Type" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4400 -msgid "Enter new name" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4400 -msgid "Renaming" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4416 -#: src/slic3r/GUI/GUI_ObjectList.cpp:4543 -#: src/slic3r/GUI/SavePresetDialog.cpp:101 -#: src/slic3r/GUI/SavePresetDialog.cpp:109 -msgid "The supplied name is not valid;" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4417 -#: src/slic3r/GUI/GUI_ObjectList.cpp:4544 -#: src/slic3r/GUI/SavePresetDialog.cpp:102 -msgid "the following characters are not allowed:" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4592 -msgid "Select extruder number:" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4593 -msgid "This extruder will be set for selected items" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4618 -msgid "Change Extruders" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4715 src/slic3r/GUI/Selection.cpp:1485 -msgid "Set Printable" -msgstr "" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4715 src/slic3r/GUI/Selection.cpp:1485 -======= #: src/slic3r/GUI/GUI_ObjectList.cpp:3172 msgid "Edit Height Range" msgstr "" @@ -6532,7 +4359,6 @@ msgid "Set Printable" msgstr "" #: src/slic3r/GUI/GUI_ObjectList.cpp:4409 ->>>>>>> master msgid "Set Unprintable" msgstr "" @@ -6672,19 +4498,11 @@ msgstr "" msgid "Height" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_Preview.cpp:216 src/libslic3r/PrintConfig.cpp:2468 -msgid "Width" -msgstr "" - -#: src/slic3r/GUI/GUI_Preview.cpp:218 src/slic3r/GUI/Tab.cpp:1847 -======= #: src/slic3r/GUI/GUI_Preview.cpp:219 src/libslic3r/PrintConfig.cpp:2982 msgid "Width" msgstr "" #: src/slic3r/GUI/GUI_Preview.cpp:221 src/slic3r/GUI/Tab.cpp:2008 ->>>>>>> master msgid "Fan speed" msgstr "" @@ -6724,17 +4542,6 @@ msgstr "" msgid "Internal infill" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_Preview.cpp:234 src/libslic3r/ExtrusionEntity.cpp:314 -#: src/libslic3r/ExtrusionEntity.cpp:340 src/libslic3r/PrintConfig.cpp:1958 -#: src/libslic3r/PrintConfig.cpp:1969 -msgid "Solid infill" -msgstr "" - -#: src/slic3r/GUI/GUI_Preview.cpp:235 src/libslic3r/ExtrusionEntity.cpp:315 -#: src/libslic3r/ExtrusionEntity.cpp:342 src/libslic3r/PrintConfig.cpp:2335 -#: src/libslic3r/PrintConfig.cpp:2347 -======= #: src/slic3r/GUI/GUI_Preview.cpp:243 src/libslic3r/ExtrusionEntity.cpp:322 #: src/libslic3r/ExtrusionEntity.cpp:348 src/libslic3r/PrintConfig.cpp:2342 #: src/libslic3r/PrintConfig.cpp:2354 @@ -6744,7 +4551,6 @@ msgstr "" #: src/slic3r/GUI/GUI_Preview.cpp:244 src/libslic3r/ExtrusionEntity.cpp:323 #: src/libslic3r/ExtrusionEntity.cpp:350 src/libslic3r/PrintConfig.cpp:2839 #: src/libslic3r/PrintConfig.cpp:2852 ->>>>>>> master msgid "Top solid infill" msgstr "" @@ -6758,44 +4564,6 @@ msgstr "" msgid "Gap fill" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_Preview.cpp:239 src/slic3r/GUI/Tab.cpp:1469 -#: src/libslic3r/ExtrusionEntity.cpp:319 src/libslic3r/ExtrusionEntity.cpp:350 -msgid "Skirt" -msgstr "" - -#: src/slic3r/GUI/GUI_Preview.cpp:241 src/libslic3r/ExtrusionEntity.cpp:321 -#: src/libslic3r/ExtrusionEntity.cpp:354 src/libslic3r/PrintConfig.cpp:2220 -msgid "Support material interface" -msgstr "" - -#: src/slic3r/GUI/GUI_Preview.cpp:242 src/slic3r/GUI/Tab.cpp:1552 -#: src/libslic3r/ExtrusionEntity.cpp:322 src/libslic3r/ExtrusionEntity.cpp:356 -msgid "Wipe tower" -msgstr "" - -#: src/slic3r/GUI/GUI_Preview.cpp:1037 -msgid "Shells" -msgstr "" - -#: src/slic3r/GUI/GUI_Preview.cpp:1038 -msgid "Tool marker" -msgstr "" - -#: src/slic3r/GUI/GUI_Preview.cpp:1039 -msgid "Legend/Estimated printing time" -msgstr "" - -#: src/slic3r/GUI/ImGuiWrapper.cpp:804 src/slic3r/GUI/Search.cpp:386 -msgid "Use for search" -msgstr "" - -#: src/slic3r/GUI/ImGuiWrapper.cpp:805 src/slic3r/GUI/Search.cpp:380 -msgid "Category" -msgstr "" - -#: src/slic3r/GUI/ImGuiWrapper.cpp:807 src/slic3r/GUI/Search.cpp:382 -======= #: src/slic3r/GUI/GUI_Preview.cpp:248 src/libslic3r/ExtrusionEntity.cpp:327 #: src/libslic3r/ExtrusionEntity.cpp:358 msgid "Skirt/Brim" @@ -6864,7 +4632,6 @@ msgid "Category" msgstr "" #: src/slic3r/GUI/ImGuiWrapper.cpp:963 src/slic3r/GUI/Search.cpp:474 ->>>>>>> master msgid "Search in English" msgstr "" @@ -6984,27 +4751,6 @@ msgstr "" msgid "Quick" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/Jobs/SLAImportJob.cpp:136 -msgid "Importing SLA archive" -msgstr "" - -#: src/slic3r/GUI/Jobs/SLAImportJob.cpp:160 -msgid "Importing canceled." -msgstr "" - -#: src/slic3r/GUI/Jobs/SLAImportJob.cpp:161 -msgid "Importing done." -msgstr "" - -#: src/slic3r/GUI/Jobs/SLAImportJob.cpp:210 src/slic3r/GUI/Plater.cpp:2359 -msgid "You cannot load SLA project with a multi-part object on the bed" -msgstr "" - -#: src/slic3r/GUI/Jobs/SLAImportJob.cpp:211 src/slic3r/GUI/Plater.cpp:2360 -#: src/slic3r/GUI/Tab.cpp:3250 -msgid "Please check your object list before preset changing." -======= #: src/slic3r/GUI/Jobs/SLAImportJob.cpp:140 msgid "Importing SLA archive" msgstr "" @@ -7035,7 +4781,6 @@ msgstr "" #: src/slic3r/GUI/Jobs/SLAImportJob.cpp:225 src/slic3r/GUI/Plater.cpp:2428 msgid "Attention!" ->>>>>>> master msgstr "" #: src/slic3r/GUI/KBShortcutsDialog.cpp:18 src/slic3r/GUI/MainFrame.cpp:1100 @@ -7074,21 +4819,12 @@ msgstr "" msgid "Load Config from ini/amf/3mf/gcode and merge" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/KBShortcutsDialog.cpp:79 src/slic3r/GUI/Plater.cpp:771 -#: src/slic3r/GUI/Plater.cpp:6075 src/libslic3r/PrintConfig.cpp:3639 -msgid "Export G-code" -msgstr "" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:80 src/slic3r/GUI/Plater.cpp:6076 -======= #: src/slic3r/GUI/KBShortcutsDialog.cpp:87 src/slic3r/GUI/Plater.cpp:912 #: src/slic3r/GUI/Plater.cpp:6492 src/libslic3r/PrintConfig.cpp:4271 msgid "Export G-code" msgstr "" #: src/slic3r/GUI/KBShortcutsDialog.cpp:88 src/slic3r/GUI/Plater.cpp:6493 ->>>>>>> master msgid "Send G-code" msgstr "" @@ -7096,11 +4832,7 @@ msgstr "" msgid "Export config" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/KBShortcutsDialog.cpp:82 src/slic3r/GUI/Plater.cpp:759 -======= #: src/slic3r/GUI/KBShortcutsDialog.cpp:90 src/slic3r/GUI/Plater.cpp:895 ->>>>>>> master msgid "Export to SD card / Flash drive" msgstr "" @@ -7158,13 +4890,8 @@ msgstr "" msgid "Switch to Preview" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/KBShortcutsDialog.cpp:106 -#: src/slic3r/GUI/PrintHostDialogs.cpp:176 -======= #: src/slic3r/GUI/KBShortcutsDialog.cpp:114 #: src/slic3r/GUI/PrintHostDialogs.cpp:217 ->>>>>>> master msgid "Print host upload queue" msgstr "" @@ -7478,13 +5205,8 @@ msgstr "" msgid "Show/Hide G-code window" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/KBShortcutsDialog.cpp:215 src/slic3r/GUI/Plater.cpp:4217 -#: src/slic3r/GUI/Tab.cpp:2609 -======= #: src/slic3r/GUI/KBShortcutsDialog.cpp:230 src/slic3r/GUI/Plater.cpp:4446 #: src/slic3r/GUI/Tab.cpp:2822 ->>>>>>> master msgid "Preview" msgstr "" @@ -7709,13 +5431,8 @@ msgstr "" #. TRN To be shown in the main menu View->Top #. TRN To be shown in Print Settings "Top solid layers" -<<<<<<< HEAD -#: src/slic3r/GUI/MainFrame.cpp:912 src/libslic3r/PrintConfig.cpp:2362 -#: src/libslic3r/PrintConfig.cpp:2371 -======= #: src/slic3r/GUI/MainFrame.cpp:1118 src/libslic3r/PrintConfig.cpp:2867 #: src/libslic3r/PrintConfig.cpp:2876 ->>>>>>> master msgid "Top" msgstr "" @@ -7743,11 +5460,7 @@ msgstr "" msgid "Front View" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/MainFrame.cpp:919 src/libslic3r/PrintConfig.cpp:1847 -======= #: src/slic3r/GUI/MainFrame.cpp:1125 src/libslic3r/PrintConfig.cpp:2224 ->>>>>>> master msgid "Rear" msgstr "" @@ -7797,16 +5510,7 @@ msgid "" "Do you want to remove it from the recent projects list?" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/MainFrame.cpp:953 src/slic3r/GUI/MainFrame.cpp:1344 -#: src/slic3r/GUI/PrintHostDialogs.cpp:274 -msgid "Error" -msgstr "" - -#: src/slic3r/GUI/MainFrame.cpp:978 -======= #: src/slic3r/GUI/MainFrame.cpp:1187 ->>>>>>> master msgid "&Save Project" msgstr "" @@ -7838,19 +5542,11 @@ msgstr "" msgid "Load an model saved with imperial units" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/MainFrame.cpp:1000 -msgid "Import SL1 / SL1S archive" -msgstr "" - -#: src/slic3r/GUI/MainFrame.cpp:1000 -======= #: src/slic3r/GUI/MainFrame.cpp:1209 msgid "Import SL1 / SL1S Archive" msgstr "" #: src/slic3r/GUI/MainFrame.cpp:1209 ->>>>>>> master msgid "Load an SL1 / Sl1S archive" msgstr "" @@ -8173,11 +5869,7 @@ msgstr "" msgid "&Collapse Sidebar" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/MainFrame.cpp:1204 src/slic3r/GUI/Plater.cpp:2248 -======= #: src/slic3r/GUI/MainFrame.cpp:1430 src/slic3r/GUI/Plater.cpp:2319 ->>>>>>> master msgid "Collapse sidebar" msgstr "" @@ -8229,48 +5921,6 @@ msgstr "" msgid "Mate&rial Settings Tab" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/MainFrame.cpp:1332 -msgid "Choose a file to slice (STL/OBJ/AMF/3MF/PRUSA):" -msgstr "" - -#: src/slic3r/GUI/MainFrame.cpp:1343 -msgid "No previously sliced file." -msgstr "" - -#: src/slic3r/GUI/MainFrame.cpp:1349 -msgid "Previously sliced file (" -msgstr "" - -#: src/slic3r/GUI/MainFrame.cpp:1349 -msgid ") not found." -msgstr "" - -#: src/slic3r/GUI/MainFrame.cpp:1350 -msgid "File Not Found" -msgstr "" - -#: src/slic3r/GUI/MainFrame.cpp:1385 -#, possible-c-format -msgid "Save %s file as:" -msgstr "" - -#: src/slic3r/GUI/MainFrame.cpp:1385 -msgid "SVG" -msgstr "" - -#: src/slic3r/GUI/MainFrame.cpp:1385 -msgid "G-code" -msgstr "" - -#: src/slic3r/GUI/MainFrame.cpp:1397 -msgid "Save zip file as:" -msgstr "" - -#: src/slic3r/GUI/MainFrame.cpp:1406 src/slic3r/GUI/Plater.cpp:3017 -#: src/slic3r/GUI/Plater.cpp:5603 src/slic3r/GUI/Tab.cpp:1582 -#: src/slic3r/GUI/Tab.cpp:4122 -======= #: src/slic3r/GUI/MainFrame.cpp:1606 msgid "Choose a file to slice (STL/OBJ/AMF/3MF/PRUSA):" msgstr "" @@ -8311,56 +5961,10 @@ msgstr "" #: src/slic3r/GUI/MainFrame.cpp:1682 src/slic3r/GUI/Plater.cpp:3295 #: src/slic3r/GUI/Plater.cpp:6011 src/slic3r/GUI/Tab.cpp:1666 #: src/slic3r/GUI/Tab.cpp:4674 ->>>>>>> master msgid "Slicing" msgstr "" #. TRN "Processing input_file_basename" -<<<<<<< HEAD -#: src/slic3r/GUI/MainFrame.cpp:1408 -#, possible-c-format -msgid "Processing %s" -msgstr "" - -#: src/slic3r/GUI/MainFrame.cpp:1431 -msgid "%1% was successfully sliced." -msgstr "" - -#: src/slic3r/GUI/MainFrame.cpp:1433 -msgid "Slicing Done!" -msgstr "" - -#: src/slic3r/GUI/MainFrame.cpp:1449 -msgid "Select the STL file to repair:" -msgstr "" - -#: src/slic3r/GUI/MainFrame.cpp:1459 -msgid "Save OBJ file (less prone to coordinate errors than STL) as:" -msgstr "" - -#: src/slic3r/GUI/MainFrame.cpp:1471 -msgid "Your file was repaired." -msgstr "" - -#: src/slic3r/GUI/MainFrame.cpp:1471 src/libslic3r/PrintConfig.cpp:3739 -msgid "Repair" -msgstr "" - -#: src/slic3r/GUI/MainFrame.cpp:1485 -msgid "Save configuration as:" -msgstr "" - -#: src/slic3r/GUI/MainFrame.cpp:1504 src/slic3r/GUI/MainFrame.cpp:1568 -msgid "Select configuration to load:" -msgstr "" - -#: src/slic3r/GUI/MainFrame.cpp:1542 -msgid "Save presets bundle as:" -msgstr "" - -#: src/slic3r/GUI/MainFrame.cpp:1595 -#, possible-c-format -======= #: src/slic3r/GUI/MainFrame.cpp:1684 #, possible-c-format, possible-boost-format msgid "Processing %s" @@ -8423,7 +6027,6 @@ msgstr "" #: src/slic3r/GUI/MainFrame.cpp:1872 #, possible-c-format, possible-boost-format ->>>>>>> master msgid "%d presets successfully imported." msgstr "" @@ -8471,34 +6074,6 @@ msgstr "" msgid "%s has encountered an error" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/MsgDialog.cpp:114 -#, possible-c-format -msgid "%s information" -msgstr "" - -#: src/slic3r/GUI/NotificationManager.cpp:41 -msgid "3D Mouse disconnected." -msgstr "" - -#: src/slic3r/GUI/NotificationManager.cpp:44 -msgid "Configuration update is available." -msgstr "" - -#: src/slic3r/GUI/NotificationManager.cpp:44 -msgid "See more." -msgstr "" - -#: src/slic3r/GUI/NotificationManager.cpp:46 -msgid "New version is available." -msgstr "" - -#: src/slic3r/GUI/NotificationManager.cpp:46 -msgid "See Releases page." -msgstr "" - -#: src/slic3r/GUI/NotificationManager.cpp:49 -======= #: src/slic3r/GUI/MsgDialog.cpp:232 #, possible-c-format, possible-boost-format msgid "%s warning" @@ -8532,50 +6107,12 @@ msgid "See more." msgstr "" #: src/slic3r/GUI/NotificationManager.hpp:761 ->>>>>>> master msgid "" "You have just added a G-code for color change, but its value is empty.\n" "To export the G-code correctly, check the \"Color Change G-code\" in " "\"Printer Settings > Custom G-code\"" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/NotificationManager.cpp:533 -#: src/slic3r/GUI/NotificationManager.cpp:541 -msgid "More" -msgstr "" - -#: src/slic3r/GUI/NotificationManager.cpp:908 -#: src/slic3r/GUI/NotificationManager.cpp:1188 -msgid "Export G-Code." -msgstr "" - -#: src/slic3r/GUI/NotificationManager.cpp:954 -msgid "Open Folder." -msgstr "" - -#: src/slic3r/GUI/NotificationManager.cpp:993 -msgid "Eject drive" -msgstr "" - -#: src/slic3r/GUI/NotificationManager.cpp:1107 -#: src/slic3r/GUI/NotificationManager.cpp:1123 -#: src/slic3r/GUI/NotificationManager.cpp:1134 -msgid "ERROR:" -msgstr "" - -#: src/slic3r/GUI/NotificationManager.cpp:1112 -#: src/slic3r/GUI/NotificationManager.cpp:1127 -#: src/slic3r/GUI/NotificationManager.cpp:1142 -msgid "WARNING:" -msgstr "" - -#: src/slic3r/GUI/NotificationManager.cpp:1191 -msgid "Slicing finished." -msgstr "" - -#: src/slic3r/GUI/NotificationManager.cpp:1233 -======= #: src/slic3r/GUI/NotificationManager.hpp:764 msgid "" "No color change event was added to the print. The print does not look like a " @@ -8689,7 +6226,6 @@ msgid "WARNING:" msgstr "" #: src/slic3r/GUI/NotificationManager.cpp:1598 ->>>>>>> master msgid "Exporting finished." msgstr "" @@ -8711,13 +6247,8 @@ msgstr "" msgid "Instance %d" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/ObjectDataViewModel.cpp:69 src/slic3r/GUI/Tab.cpp:3969 -#: src/slic3r/GUI/Tab.cpp:4051 -======= #: src/slic3r/GUI/ObjectDataViewModel.cpp:105 src/slic3r/GUI/Tab.cpp:4512 #: src/slic3r/GUI/Tab.cpp:4603 ->>>>>>> master msgid "Layers" msgstr "" @@ -8725,61 +6256,35 @@ msgstr "" msgid "Range" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/OpenGLManager.cpp:261 -#, possible-c-format -======= #: src/slic3r/GUI/OpenGLManager.cpp:257 #, possible-c-format, possible-boost-format ->>>>>>> master msgid "" "PrusaSlicer requires OpenGL 2.0 capable graphics driver to run correctly, \n" "while OpenGL version %s, render %s, vendor %s was detected." msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/OpenGLManager.cpp:264 -msgid "You may need to update your graphics card driver." -msgstr "" - -#: src/slic3r/GUI/OpenGLManager.cpp:267 -======= #: src/slic3r/GUI/OpenGLManager.cpp:260 msgid "You may need to update your graphics card driver." msgstr "" #: src/slic3r/GUI/OpenGLManager.cpp:263 ->>>>>>> master msgid "" "As a workaround, you may run PrusaSlicer with a software rendered 3D " "graphics by running prusa-slicer.exe with the --sw-renderer parameter." msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/OpenGLManager.cpp:269 -msgid "Unsupported OpenGL version" -msgstr "" - -#: src/slic3r/GUI/OpenGLManager.cpp:277 -#, possible-c-format -======= #: src/slic3r/GUI/OpenGLManager.cpp:265 msgid "Unsupported OpenGL version" msgstr "" #: src/slic3r/GUI/OpenGLManager.cpp:273 #, possible-c-format, possible-boost-format ->>>>>>> master msgid "" "Unable to load the following shaders:\n" "%s" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/OpenGLManager.cpp:278 -======= #: src/slic3r/GUI/OpenGLManager.cpp:274 ->>>>>>> master msgid "Error loading shaders" msgstr "" @@ -8797,49 +6302,6 @@ msgstr "" msgid "Delete this preset from this printer device" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:82 -msgid "This printer will be shown in the presets list as" -msgstr "" - -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:163 -msgid "Type here the name of your printer device" -msgstr "" - -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:174 -msgid "Descriptive name for the printer" -msgstr "" - -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:178 -msgid "Add preset for this printer device" -msgstr "" - -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:207 src/slic3r/GUI/Tab.cpp:2071 -msgid "Print Host upload" -msgstr "" - -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:262 -msgid "Connection to printers connected via the print host failed." -msgstr "" - -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:304 -msgid "Test" -msgstr "" - -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:309 -msgid "Could not get a valid Printer Host reference" -msgstr "" - -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:321 -msgid "Success!" -msgstr "" - -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:331 -msgid "Refresh Printers" -msgstr "" - -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:358 -======= #: src/slic3r/GUI/PhysicalPrinterDialog.cpp:83 msgid "This printer will be shown in the presets list as" msgstr "" @@ -8881,29 +6343,11 @@ msgid "Refresh Printers" msgstr "" #: src/slic3r/GUI/PhysicalPrinterDialog.cpp:364 ->>>>>>> master msgid "" "HTTPS CA file is optional. It is only needed if you use HTTPS with a self-" "signed certificate." msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:368 -msgid "Certificate files (*.crt, *.pem)|*.crt;*.pem|All files|*.*" -msgstr "" - -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:369 -msgid "Open CA certificate file" -msgstr "" - -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:397 -#: src/libslic3r/PrintConfig.cpp:124 -msgid "HTTPS CA File" -msgstr "" - -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:398 -#, possible-c-format -======= #: src/slic3r/GUI/PhysicalPrinterDialog.cpp:374 msgid "Certificate files (*.crt, *.pem)|*.crt;*.pem|All files|*.*" msgstr "" @@ -8919,41 +6363,17 @@ msgstr "" #: src/slic3r/GUI/PhysicalPrinterDialog.cpp:405 #, possible-c-format, possible-boost-format ->>>>>>> master msgid "" "On this system, %s uses HTTPS certificates from the system Certificate Store " "or Keychain." msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:399 -======= #: src/slic3r/GUI/PhysicalPrinterDialog.cpp:406 ->>>>>>> master msgid "" "To use a custom CA file, please import your CA file into Certificate Store / " "Keychain." msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:607 -msgid "The supplied name is empty. It can't be saved." -msgstr "" - -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:611 -msgid "You should change the name of your printer device." -msgstr "" - -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:619 -msgid "Printer with name \"%1%\" already exists." -msgstr "" - -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:620 -msgid "Replace?" -msgstr "" - -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:643 -======= #: src/slic3r/GUI/PhysicalPrinterDialog.cpp:630 msgid "The supplied name is empty. It can't be saved." msgstr "" @@ -8973,7 +6393,6 @@ msgstr "" #: src/slic3r/GUI/PhysicalPrinterDialog.cpp:670 #, possible-boost-format ->>>>>>> master msgid "" "Following printer preset is duplicated:%1%The above preset for printer \"%2%" "\" will be used just once." @@ -8983,78 +6402,6 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -<<<<<<< HEAD -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:690 -msgid "It's not possible to delete the last related preset for the printer." -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:164 -msgid "Volume" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:165 -msgid "Facets" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:166 -msgid "Materials" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:169 -msgid "Manifold" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:219 -msgid "Sliced Info" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:238 src/slic3r/GUI/Plater.cpp:1152 -msgid "Used Filament (m)" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:239 src/slic3r/GUI/Plater.cpp:1164 -msgid "Used Filament (mm³)" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:240 src/slic3r/GUI/Plater.cpp:1171 -msgid "Used Filament (g)" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:241 -msgid "Used Material (unit)" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:242 -msgid "Cost (money)" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:244 -msgid "Number of tool changes" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:361 -msgid "Select what kind of support do you need" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:363 src/libslic3r/PrintConfig.cpp:2130 -#: src/libslic3r/PrintConfig.cpp:2925 -msgid "Support on build plate only" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:364 src/slic3r/GUI/Plater.cpp:490 -msgid "For support enforcers only" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:365 -msgid "Everywhere" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:397 src/slic3r/GUI/Tab.cpp:1476 -msgid "Brim" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:399 -======= #: src/slic3r/GUI/PhysicalPrinterDialog.cpp:720 msgid "It's not possible to delete the last related preset for the printer." msgstr "" @@ -9136,177 +6483,11 @@ msgid "Brim" msgstr "" #: src/slic3r/GUI/Plater.cpp:469 ->>>>>>> master msgid "" "This flag enables the brim that will be printed around each object on the " "first layer." msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/Plater.cpp:407 -msgid "Purging volumes" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:504 -msgid "Select what kind of pad do you need" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:506 -msgid "Below object" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:507 -msgid "Around object" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:757 src/slic3r/GUI/Plater.cpp:6076 -msgid "Send to printer" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:772 src/slic3r/GUI/Plater.cpp:3017 -#: src/slic3r/GUI/Plater.cpp:5606 -msgid "Slice now" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:927 -msgid "Hold Shift to Slice & Export G-code" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:1072 -#, possible-c-format -msgid "%d (%d shells)" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:1077 -#, possible-c-format -msgid "Auto-repaired (%d errors)" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:1080 -#, possible-c-format -msgid "" -"%d degenerate facets, %d edges fixed, %d facets removed, %d facets added, %d " -"facets reversed, %d backwards edges" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:1090 -msgid "Yes" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:1111 -msgid "Used Material (ml)" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:1114 -msgid "object(s)" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:1114 -msgid "supports and pad" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:1152 -msgid "Used Filament (in)" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:1154 src/slic3r/GUI/Plater.cpp:1207 -msgid "objects" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:1154 src/slic3r/GUI/Plater.cpp:1207 -msgid "wipe tower" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:1164 -msgid "Used Filament (in³)" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:1190 -msgid "Filament at extruder %1%" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:1196 -msgid "(including spool)" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:1205 src/libslic3r/PrintConfig.cpp:822 -#: src/libslic3r/PrintConfig.cpp:2740 src/libslic3r/PrintConfig.cpp:2741 -msgid "Cost" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:1223 -msgid "normal mode" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:1233 -msgid "stealth mode" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:1404 src/slic3r/GUI/Plater.cpp:4940 -#, possible-c-format -msgid "%s - Drop project file" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:1411 src/slic3r/GUI/Plater.cpp:4947 -msgid "Open as project" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:1412 src/slic3r/GUI/Plater.cpp:4948 -msgid "Import geometry only" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:1413 src/slic3r/GUI/Plater.cpp:4949 -msgid "Import config only" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:1416 src/slic3r/GUI/Plater.cpp:4952 -msgid "Select an action to apply to the file" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:1417 src/slic3r/GUI/Plater.cpp:4953 -msgid "Action" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:1425 src/slic3r/GUI/Plater.cpp:4961 -msgid "Don't show again" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:1470 src/slic3r/GUI/Plater.cpp:4998 -msgid "You can open only one .gcode file at a time." -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:1471 src/slic3r/GUI/Plater.cpp:4999 -msgid "Drag and drop G-code file" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:1525 src/slic3r/GUI/Plater.cpp:4815 -#: src/slic3r/GUI/Plater.cpp:5053 -msgid "Import Object" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:1547 src/slic3r/GUI/Plater.cpp:5079 -msgid "Load File" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:1552 src/slic3r/GUI/Plater.cpp:5084 -msgid "Load Files" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:1655 -msgid "Fill bed" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:1661 -msgid "Optimize Rotation" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:1667 -msgid "Import SLA archive" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:2130 -#, possible-c-format -======= #: src/slic3r/GUI/Plater.cpp:477 msgid "Purging volumes" msgstr "" @@ -9425,41 +6606,11 @@ msgstr "" #: src/slic3r/GUI/Plater.cpp:2197 #, possible-c-format, possible-boost-format ->>>>>>> master msgid "" "Successfully unmounted. The device %s(%s) can now be safely removed from the " "computer." msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/Plater.cpp:2135 -#, possible-c-format -msgid "Ejecting of device %s(%s) has failed." -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:2154 -msgid "New Project" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:2247 -msgid "Expand sidebar" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:2320 -msgid "Loading" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:2330 -msgid "Loading file" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:2399 -msgid "Failed loading file \"%1%\" due to an invalid configuration." -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:2423 -#, possible-c-format -======= #: src/slic3r/GUI/Plater.cpp:2202 #, possible-c-format, possible-boost-format msgid "Ejecting of device %s(%s) has failed." @@ -9505,7 +6656,6 @@ msgstr "" #: src/slic3r/GUI/Plater.cpp:2553 #, possible-c-format, possible-boost-format ->>>>>>> master msgid "" "The dimensions of the object from file %s seem to be defined in meters.\n" "The internal unit of PrusaSlicer is a millimeter. Do you want to recalculate " @@ -9521,13 +6671,6 @@ msgstr[1] "" msgid "The object is too small" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/Plater.cpp:2425 -msgid "The object appears to be saved in inches" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:2433 -======= #: src/slic3r/GUI/Plater.cpp:2558 src/slic3r/GUI/Plater.cpp:2580 msgid "Apply to all the remaining small objects being loaded." msgstr "" @@ -9546,394 +6689,46 @@ msgstr[0] "" msgstr[1] "" #: src/slic3r/GUI/Plater.cpp:2593 ->>>>>>> master msgid "" "This file contains several objects positioned at multiple heights.\n" "Instead of considering them as multiple objects, should \n" "the file be loaded as a single object having multiple parts?" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/Plater.cpp:2436 src/slic3r/GUI/Plater.cpp:2489 -msgid "Multi-part object detected" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:2443 -======= #: src/slic3r/GUI/Plater.cpp:2596 src/slic3r/GUI/Plater.cpp:2651 msgid "Multi-part object detected" msgstr "" #: src/slic3r/GUI/Plater.cpp:2604 ->>>>>>> master msgid "" "This file cannot be loaded in a simple mode. Do you want to switch to an " "advanced mode?" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/Plater.cpp:2444 -msgid "Detected advanced data" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:2466 -#, possible-c-format -======= #: src/slic3r/GUI/Plater.cpp:2605 msgid "Detected advanced data" msgstr "" #: src/slic3r/GUI/Plater.cpp:2625 #, possible-c-format, possible-boost-format ->>>>>>> master msgid "" "You can't to add the object(s) from %s because of one or some of them " "is(are) multi-part" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/Plater.cpp:2486 -======= #: src/slic3r/GUI/Plater.cpp:2648 ->>>>>>> master msgid "" "Multiple objects were loaded for a multi-material printer.\n" "Instead of considering them as multiple objects, should I consider\n" "these files to represent a single object having multiple parts?" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/Plater.cpp:2502 -msgid "Loaded" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:2604 -======= #: src/slic3r/GUI/Plater.cpp:2767 ->>>>>>> master msgid "" "Your object appears to be too large, so it was automatically scaled down to " "fit your print bed." msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/Plater.cpp:2605 -msgid "Object too large?" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:2667 -msgid "Export STL file:" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:2674 -msgid "Export AMF file:" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:2680 -msgid "Save file as:" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:2686 -msgid "Export OBJ file:" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:2782 -msgid "Delete Object" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:2793 -msgid "Reset Project" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:2865 -msgid "" -"The selected object can't be split because it contains more than one volume/" -"material." -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:2876 -msgid "Split to Objects" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:3001 src/slic3r/GUI/Plater.cpp:3738 -msgid "Invalid data" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:3011 -msgid "Ready to slice" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:3049 src/slic3r/GUI/PrintHostDialogs.cpp:275 -msgid "Cancelling" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:3068 -msgid "Another export job is currently running." -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:3185 -msgid "Please select the file to reload" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:3220 -msgid "It is not allowed to change the file to reload" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:3220 -msgid "Do you want to retry" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:3238 -msgid "Reload from:" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:3331 -msgid "Unable to reload:" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:3336 -msgid "Error during reload" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:3355 -msgid "Reload all from disk" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:3382 -msgid "" -"ERROR: Please close all manipulators available from the left toolbar before " -"fixing the mesh." -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:3388 -msgid "Fix through NetFabb" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:3405 -msgid "Custom supports and seams were removed after repairing the mesh." -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:3696 -msgid "There are active warnings concerning sliced models:" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:3706 -msgid "generated warnings" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:3746 src/slic3r/GUI/PrintHostDialogs.cpp:276 -msgid "Cancelled" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:4015 src/slic3r/GUI/Plater.cpp:4039 -msgid "Remove the selected object" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:4024 -msgid "Add one more instance of the selected object" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:4026 -msgid "Remove one instance of the selected object" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:4028 -msgid "Set number of instances" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:4028 -msgid "Change the number of instances of the selected object" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:4030 -msgid "Fill bed with instances" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:4030 -msgid "Fill the remaining area of bed with instances of the selected object" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:4049 -msgid "Reload the selected object from disk" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:4052 -msgid "Export the selected object as STL file" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:4082 -msgid "Along X axis" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:4082 -msgid "Mirror the selected object along the X axis" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:4084 -msgid "Along Y axis" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:4084 -msgid "Mirror the selected object along the Y axis" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:4086 -msgid "Along Z axis" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:4086 -msgid "Mirror the selected object along the Z axis" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:4089 -msgid "Mirror" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:4089 -msgid "Mirror the selected object" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:4101 -msgid "To objects" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:4101 src/slic3r/GUI/Plater.cpp:4121 -msgid "Split the selected object into individual objects" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:4103 -msgid "To parts" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:4103 src/slic3r/GUI/Plater.cpp:4139 -msgid "Split the selected object into individual sub-parts" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:4106 src/slic3r/GUI/Plater.cpp:4121 -#: src/slic3r/GUI/Plater.cpp:4139 src/libslic3r/PrintConfig.cpp:3763 -msgid "Split" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:4106 -msgid "Split the selected object" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:4128 -msgid "Optimize orientation" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:4129 -msgid "Optimize the rotation of the object for better print results." -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:4209 -msgid "3D editor view" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:4581 -msgid "" -"%1% printer was active at the time the target Undo / Redo snapshot was " -"taken. Switching to %1% printer requires reloading of %1% presets." -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:4787 -msgid "Load Project" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:4819 -msgid "Import Objects" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:4885 -msgid "The selected file" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:4885 -msgid "does not contain valid gcode." -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:4886 -msgid "Error while loading .gcode file" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:5128 -msgid "All objects will be removed, continue?" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:5136 -msgid "Delete Selected Objects" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:5144 -msgid "Increase Instances" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:5178 -msgid "Decrease Instances" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:5209 -msgid "Enter the number of copies:" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:5210 -msgid "Copies of the selected object" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:5214 -#, possible-c-format -msgid "Set numbers of copies to %d" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:5280 -msgid "Cut by Plane" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:5338 -msgid "Save G-code file as:" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:5338 -msgid "Save SL1 / SL1S file as:" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:5485 -#, possible-c-format -msgid "STL file exported to %s" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:5502 -#, possible-c-format -msgid "AMF file exported to %s" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:5505 -#, possible-c-format -msgid "Error exporting AMF file %s" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:5534 -#, possible-c-format -msgid "3MF file exported to %s" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:5539 -#, possible-c-format -msgid "Error exporting 3MF file %s" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:6075 -msgid "Export" -msgstr "" - -#: src/slic3r/GUI/Plater.cpp:6170 -msgid "Paste From Clipboard" -msgstr "" - -#: src/slic3r/GUI/Preferences.cpp:56 src/slic3r/GUI/Tab.cpp:2105 -#: src/slic3r/GUI/Tab.cpp:2292 src/slic3r/GUI/Tab.cpp:2400 -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:1080 -======= #: src/slic3r/GUI/Plater.cpp:2768 msgid "Object too large?" msgstr "" @@ -10239,7 +7034,6 @@ msgstr "" #: src/slic3r/GUI/Tab.cpp:2508 src/slic3r/GUI/Tab.cpp:2614 #: src/slic3r/GUI/UnsavedChangesDialog.cpp:1283 #: src/slic3r/GUI/UnsavedChangesDialog.cpp:1671 ->>>>>>> master msgid "General" msgstr "" @@ -10626,40 +7420,6 @@ msgstr "" msgid "Layout Options" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/PresetComboBoxes.cpp:224 -#: src/slic3r/GUI/PresetComboBoxes.cpp:262 -#: src/slic3r/GUI/PresetComboBoxes.cpp:788 -#: src/slic3r/GUI/PresetComboBoxes.cpp:838 -#: src/slic3r/GUI/PresetComboBoxes.cpp:959 -#: src/slic3r/GUI/PresetComboBoxes.cpp:1003 -msgid "System presets" -msgstr "" - -#: src/slic3r/GUI/PresetComboBoxes.cpp:266 -#: src/slic3r/GUI/PresetComboBoxes.cpp:842 -#: src/slic3r/GUI/PresetComboBoxes.cpp:1007 -msgid "User presets" -msgstr "" - -#: src/slic3r/GUI/PresetComboBoxes.cpp:277 -msgid "Incompatible presets" -msgstr "" - -#: src/slic3r/GUI/PresetComboBoxes.cpp:312 -msgid "Are you sure you want to delete \"%1%\" printer?" -msgstr "" - -#: src/slic3r/GUI/PresetComboBoxes.cpp:314 -msgid "Delete Physical Printer" -msgstr "" - -#: src/slic3r/GUI/PresetComboBoxes.cpp:651 -msgid "Click to edit preset" -msgstr "" - -#: src/slic3r/GUI/PresetComboBoxes.cpp:707 -======= #: src/slic3r/GUI/Preferences.cpp:806 msgid "Text colors" msgstr "" @@ -10697,23 +7457,10 @@ msgid "Click to edit preset" msgstr "" #: src/slic3r/GUI/PresetComboBoxes.cpp:697 ->>>>>>> master #: src/slic3r/GUI/PresetComboBoxes.cpp:737 msgid "Add/Remove presets" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/PresetComboBoxes.cpp:712 -#: src/slic3r/GUI/PresetComboBoxes.cpp:742 src/slic3r/GUI/Tab.cpp:2997 -msgid "Add physical printer" -msgstr "" - -#: src/slic3r/GUI/PresetComboBoxes.cpp:726 -msgid "Edit preset" -msgstr "" - -#: src/slic3r/GUI/PresetComboBoxes.cpp:730 src/slic3r/GUI/Tab.cpp:2997 -======= #: src/slic3r/GUI/PresetComboBoxes.cpp:702 #: src/slic3r/GUI/PresetComboBoxes.cpp:742 src/slic3r/GUI/Tab.cpp:3241 msgid "Add physical printer" @@ -10728,7 +7475,6 @@ msgid "Change extruder color" msgstr "" #: src/slic3r/GUI/PresetComboBoxes.cpp:730 src/slic3r/GUI/Tab.cpp:3241 ->>>>>>> master msgid "Edit physical printer" msgstr "" @@ -10736,23 +7482,6 @@ msgstr "" msgid "Delete physical printer" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/PresetComboBoxes.cpp:853 -#: src/slic3r/GUI/PresetComboBoxes.cpp:1021 -msgid "Physical printers" -msgstr "" - -#: src/slic3r/GUI/PresetComboBoxes.cpp:877 -msgid "Add/Remove filaments" -msgstr "" - -#: src/slic3r/GUI/PresetComboBoxes.cpp:879 -msgid "Add/Remove materials" -msgstr "" - -#: src/slic3r/GUI/PresetComboBoxes.cpp:881 -#: src/slic3r/GUI/PresetComboBoxes.cpp:1045 -======= #: src/slic3r/GUI/PresetComboBoxes.cpp:864 #: src/slic3r/GUI/PresetComboBoxes.cpp:1051 msgid "Physical printers" @@ -10768,7 +7497,6 @@ msgstr "" #: src/slic3r/GUI/PresetComboBoxes.cpp:892 #: src/slic3r/GUI/PresetComboBoxes.cpp:1075 ->>>>>>> master msgid "Add/Remove printers" msgstr "" @@ -10958,54 +7686,6 @@ msgstr "" msgid "Group" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/PrintHostDialogs.cpp:187 -msgid "ID" -msgstr "" - -#: src/slic3r/GUI/PrintHostDialogs.cpp:188 -msgid "Progress" -msgstr "" - -#: src/slic3r/GUI/PrintHostDialogs.cpp:189 -msgid "Status" -msgstr "" - -#: src/slic3r/GUI/PrintHostDialogs.cpp:190 -msgid "Host" -msgstr "" - -#: src/slic3r/GUI/PrintHostDialogs.cpp:191 -msgid "Filename" -msgstr "" - -#: src/slic3r/GUI/PrintHostDialogs.cpp:192 -msgid "Error Message" -msgstr "" - -#: src/slic3r/GUI/PrintHostDialogs.cpp:195 -msgid "Cancel selected" -msgstr "" - -#: src/slic3r/GUI/PrintHostDialogs.cpp:197 -msgid "Show error message" -msgstr "" - -#: src/slic3r/GUI/PrintHostDialogs.cpp:239 -#: src/slic3r/GUI/PrintHostDialogs.cpp:272 -msgid "Enqueued" -msgstr "" - -#: src/slic3r/GUI/PrintHostDialogs.cpp:273 -msgid "Uploading" -msgstr "" - -#: src/slic3r/GUI/PrintHostDialogs.cpp:277 -msgid "Completed" -msgstr "" - -#: src/slic3r/GUI/PrintHostDialogs.cpp:315 -======= #: src/slic3r/GUI/PrintHostDialogs.cpp:84 #, possible-c-format, possible-boost-format msgid "Upload filename doesn't end with \"%s\". Do you wish to continue?" @@ -11082,7 +7762,6 @@ msgid "Completed" msgstr "" #: src/slic3r/GUI/PrintHostDialogs.cpp:424 ->>>>>>> master msgid "Error uploading to print host:" msgstr "" @@ -11090,15 +7769,6 @@ msgstr "" msgid "NO RAMMING AT ALL" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/RammingChart.cpp:76 src/slic3r/GUI/WipeTowerDialog.cpp:83 -#: src/libslic3r/PrintConfig.cpp:706 src/libslic3r/PrintConfig.cpp:750 -#: src/libslic3r/PrintConfig.cpp:765 src/libslic3r/PrintConfig.cpp:2638 -#: src/libslic3r/PrintConfig.cpp:2647 src/libslic3r/PrintConfig.cpp:2757 -#: src/libslic3r/PrintConfig.cpp:2765 src/libslic3r/PrintConfig.cpp:2773 -#: src/libslic3r/PrintConfig.cpp:2780 src/libslic3r/PrintConfig.cpp:2788 -#: src/libslic3r/PrintConfig.cpp:2796 -======= #: src/slic3r/GUI/RammingChart.cpp:90 src/slic3r/GUI/WipeTowerDialog.cpp:114 #: src/libslic3r/PrintConfig.cpp:929 src/libslic3r/PrintConfig.cpp:973 #: src/libslic3r/PrintConfig.cpp:988 src/libslic3r/PrintConfig.cpp:3160 @@ -11106,7 +7776,6 @@ msgstr "" #: src/libslic3r/PrintConfig.cpp:3318 src/libslic3r/PrintConfig.cpp:3326 #: src/libslic3r/PrintConfig.cpp:3333 src/libslic3r/PrintConfig.cpp:3341 #: src/libslic3r/PrintConfig.cpp:3349 ->>>>>>> master msgid "s" msgstr "" @@ -11214,13 +7883,6 @@ msgstr "" msgid "Just switch to \"%1%\" preset" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/Search.cpp:77 src/slic3r/GUI/Tab.cpp:2428 -msgid "Stealth" -msgstr "" - -#: src/slic3r/GUI/Search.cpp:77 src/slic3r/GUI/Tab.cpp:2422 -======= #: src/slic3r/GUI/Search.cpp:90 src/slic3r/GUI/Search.cpp:345 #: src/slic3r/GUI/Tab.cpp:2642 msgid "Stealth" @@ -11228,7 +7890,6 @@ msgstr "" #: src/slic3r/GUI/Search.cpp:90 src/slic3r/GUI/Search.cpp:345 #: src/slic3r/GUI/Tab.cpp:2636 ->>>>>>> master msgid "Normal" msgstr "" @@ -11393,70 +8054,21 @@ msgstr "" msgid "Search in settings [%1%]" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:1244 -msgid "Detach from system preset" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:1257 -======= #: src/slic3r/GUI/Tab.cpp:1302 msgid "Detach from system preset" msgstr "" #: src/slic3r/GUI/Tab.cpp:1315 ->>>>>>> master msgid "" "A copy of the current system preset will be created, which will be detached " "from the system preset." msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:1258 -======= #: src/slic3r/GUI/Tab.cpp:1316 ->>>>>>> master msgid "" "The current custom preset will be detached from the parent system preset." msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:1261 -msgid "Modifications to the current profile will be saved." -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:1264 -msgid "" -"This action is not revertable.\n" -"Do you want to proceed?" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:1266 -msgid "Detach preset" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:1292 -msgid "This is a default preset." -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:1294 -msgid "This is a system preset." -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:1296 -msgid "Current preset is inherited from the default preset." -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:1300 -msgid "Current preset is inherited from" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:1304 -msgid "It can't be deleted or modified." -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:1305 -======= #: src/slic3r/GUI/Tab.cpp:1319 msgid "Modifications to the current profile will be saved." msgstr "" @@ -11486,246 +8098,10 @@ msgid "It can't be deleted or modified." msgstr "" #: src/slic3r/GUI/Tab.cpp:1364 ->>>>>>> master msgid "" "Any modifications should be saved as a new preset inherited from this one." msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:1306 -msgid "To do that please specify a new name for the preset." -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:1310 -msgid "Additional information:" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:1316 -msgid "printer model" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:1324 -msgid "default print profile" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:1327 -msgid "default filament profile" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:1341 -msgid "default SLA material profile" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:1345 -msgid "default SLA print profile" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:1353 -msgid "full profile name" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:1354 -msgid "symbolic profile name" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:1392 src/slic3r/GUI/Tab.cpp:4049 -msgid "Layers and perimeters" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:1398 -msgid "Vertical shells" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:1410 -msgid "Horizontal shells" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:1411 src/libslic3r/PrintConfig.cpp:1982 -msgid "Solid layers" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:1416 -msgid "Minimum shell thickness" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:1427 -msgid "Quality (slower slicing)" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:1455 -msgid "Reducing printing time" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:1467 -msgid "Skirt and brim" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:1487 -msgid "Raft" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:1491 -msgid "Options for support material and raft" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:1506 -msgid "Speed for print moves" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:1519 -msgid "Speed for non-print moves" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:1522 -msgid "Modifiers" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:1525 -msgid "Acceleration control (advanced)" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:1532 -msgid "Autospeed (advanced)" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:1540 -msgid "Multiple Extruders" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:1548 -msgid "Ooze prevention" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:1566 -msgid "Extrusion width" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:1576 -msgid "Overlap" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:1579 -msgid "Flow" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:1588 -msgid "Other" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:1591 src/slic3r/GUI/Tab.cpp:4125 -msgid "Output options" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:1592 -msgid "Sequential printing" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:1594 -msgid "Extruder clearance" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:1599 src/slic3r/GUI/Tab.cpp:4126 -msgid "Output file" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:1606 src/libslic3r/PrintConfig.cpp:1664 -msgid "Post-processing scripts" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:1612 src/slic3r/GUI/Tab.cpp:1613 -#: src/slic3r/GUI/Tab.cpp:1934 src/slic3r/GUI/Tab.cpp:1935 -#: src/slic3r/GUI/Tab.cpp:2273 src/slic3r/GUI/Tab.cpp:2274 -#: src/slic3r/GUI/Tab.cpp:2349 src/slic3r/GUI/Tab.cpp:2350 -#: src/slic3r/GUI/Tab.cpp:3992 src/slic3r/GUI/Tab.cpp:3993 -msgid "Notes" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:1619 src/slic3r/GUI/Tab.cpp:1942 -#: src/slic3r/GUI/Tab.cpp:2280 src/slic3r/GUI/Tab.cpp:2356 -#: src/slic3r/GUI/Tab.cpp:4000 src/slic3r/GUI/Tab.cpp:4131 -msgid "Dependencies" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:1620 src/slic3r/GUI/Tab.cpp:1943 -#: src/slic3r/GUI/Tab.cpp:2281 src/slic3r/GUI/Tab.cpp:2357 -#: src/slic3r/GUI/Tab.cpp:4001 src/slic3r/GUI/Tab.cpp:4132 -msgid "Profile dependencies" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:1700 -msgid "Filament Overrides" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:1822 -msgid "Temperature" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:1823 -msgid "Nozzle" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:1828 -msgid "Bed" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:1833 -msgid "Cooling" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:1835 src/libslic3r/PrintConfig.cpp:1567 -#: src/libslic3r/PrintConfig.cpp:2430 -msgid "Enable" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:1846 -msgid "Fan settings" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:1857 -msgid "Cooling thresholds" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:1863 -msgid "Filament properties" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:1870 -msgid "Print speed override" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:1880 -msgid "Wipe tower parameters" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:1883 -msgid "Toolchange parameters with single extruder MM printers" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:1896 -msgid "Ramming settings" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:1919 src/slic3r/GUI/Tab.cpp:2212 -#: src/libslic3r/PrintConfig.cpp:2065 -msgid "Custom G-code" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:1920 src/slic3r/GUI/Tab.cpp:2213 -#: src/libslic3r/PrintConfig.cpp:2015 src/libslic3r/PrintConfig.cpp:2030 -msgid "Start G-code" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:1927 src/slic3r/GUI/Tab.cpp:2220 -#: src/libslic3r/PrintConfig.cpp:441 src/libslic3r/PrintConfig.cpp:451 -msgid "End G-code" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:1977 -msgid "Volumetric flow hints not available" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:2073 -======= #: src/slic3r/GUI/Tab.cpp:1365 msgid "To do that please specify a new name for the preset." msgstr "" @@ -11983,7 +8359,6 @@ msgid "Volumetric flow hints not available" msgstr "" #: src/slic3r/GUI/Tab.cpp:2249 ->>>>>>> master msgid "" "Note: All parameters from this group are moved to the Physical Printer " "settings (see changelog).\n" @@ -11996,21 +8371,6 @@ msgid "" "physical_printer directory." msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:2106 src/slic3r/GUI/Tab.cpp:2293 -msgid "Size and coordinates" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:2115 src/slic3r/GUI/UnsavedChangesDialog.cpp:1080 -msgid "Capabilities" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:2120 -msgid "Number of extruders of the printer." -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:2148 -======= #: src/slic3r/GUI/Tab.cpp:2283 src/slic3r/GUI/Tab.cpp:2509 msgid "Size and coordinates" msgstr "" @@ -12025,7 +8385,6 @@ msgid "Number of extruders of the printer." msgstr "" #: src/slic3r/GUI/Tab.cpp:2326 ->>>>>>> master msgid "" "Single Extruder Multi Material is selected, \n" "and all extruders must have the same diameter.\n" @@ -12033,102 +8392,6 @@ msgid "" "nozzle diameter value?" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:2151 src/slic3r/GUI/Tab.cpp:2559 -#: src/libslic3r/PrintConfig.cpp:1534 -msgid "Nozzle diameter" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:2227 src/libslic3r/PrintConfig.cpp:209 -msgid "Before layer change G-code" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:2234 src/libslic3r/PrintConfig.cpp:1273 -msgid "After layer change G-code" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:2241 src/libslic3r/PrintConfig.cpp:2323 -msgid "Tool change G-code" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:2248 -msgid "Between objects G-code (for sequential printing)" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:2255 -msgid "Color Change G-code" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:2261 src/libslic3r/PrintConfig.cpp:2056 -msgid "Pause Print G-code" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:2267 -msgid "Template Custom G-code" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:2300 -msgid "Display" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:2315 -msgid "Tilt" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:2316 -msgid "Tilt time" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:2322 src/slic3r/GUI/Tab.cpp:3976 -msgid "Corrections" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:2339 src/slic3r/GUI/Tab.cpp:3972 -msgid "Exposure" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:2398 src/slic3r/GUI/Tab.cpp:2492 -#: src/libslic3r/PrintConfig.cpp:1302 src/libslic3r/PrintConfig.cpp:1337 -#: src/libslic3r/PrintConfig.cpp:1354 src/libslic3r/PrintConfig.cpp:1371 -#: src/libslic3r/PrintConfig.cpp:1387 src/libslic3r/PrintConfig.cpp:1397 -#: src/libslic3r/PrintConfig.cpp:1407 src/libslic3r/PrintConfig.cpp:1417 -msgid "Machine limits" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:2421 -msgid "Values in this column are for Normal mode" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:2427 -msgid "Values in this column are for Stealth mode" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:2436 -msgid "Maximum feedrates" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:2441 -msgid "Maximum accelerations" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:2448 -msgid "Jerk limits" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:2453 -msgid "Minimum feedrates" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:2517 src/slic3r/GUI/Tab.cpp:2525 -msgid "Single extruder MM setup" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:2526 -msgid "Single extruder multimaterial parameters" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:2557 -======= #: src/slic3r/GUI/Tab.cpp:2330 src/slic3r/GUI/Tab.cpp:2772 #: src/libslic3r/PrintConfig.cpp:1858 msgid "Nozzle diameter" @@ -12228,27 +8491,11 @@ msgid "Single extruder multimaterial parameters" msgstr "" #: src/slic3r/GUI/Tab.cpp:2769 ->>>>>>> master msgid "" "This is a single extruder multimaterial printer, diameters of all extruders " "will be set to the new value. Do you want to proceed?" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:2581 -msgid "Layer height limits" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:2586 -msgid "Position (for multi-extruder printers)" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:2592 -msgid "Only lift Z" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:2605 -======= #: src/slic3r/GUI/Tab.cpp:2794 msgid "Layer height limits" msgstr "" @@ -12262,54 +8509,22 @@ msgid "Only lift Z" msgstr "" #: src/slic3r/GUI/Tab.cpp:2818 ->>>>>>> master msgid "" "Retraction when tool is disabled (advanced settings for multi-extruder " "setups)" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:2612 -msgid "Reset to Filament Color" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:2790 -======= #: src/slic3r/GUI/Tab.cpp:2825 msgid "Reset to Filament Color" msgstr "" #: src/slic3r/GUI/Tab.cpp:3005 ->>>>>>> master msgid "" "The Wipe option is not available when using the Firmware Retraction mode.\n" "\n" "Shall I disable it in order to enable Firmware Retraction?" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:2792 -msgid "Firmware Retraction" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:3383 -msgid "Detached" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:3446 -msgid "remove" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:3446 -msgid "delete" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:3455 -msgid "It's a last preset for this physical printer." -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:3460 -======= #: src/slic3r/GUI/Tab.cpp:3007 msgid "Firmware Retraction" msgstr "" @@ -12336,17 +8551,12 @@ msgstr "" #: src/slic3r/GUI/Tab.cpp:3699 #, possible-boost-format ->>>>>>> master msgid "" "Are you sure you want to delete \"%1%\" preset from the physical printer " "\"%2%\"?" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3472 -======= #: src/slic3r/GUI/Tab.cpp:3711 ->>>>>>> master msgid "" "The physical printer below is based on the preset, you are going to delete." msgid_plural "" @@ -12354,14 +8564,6 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3476 -msgid "" -"Note, that selected preset will be deleted from this/those printer(s) too." -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:3480 -======= #: src/slic3r/GUI/Tab.cpp:3716 msgid "Note, that the selected preset will be deleted from this printer too." msgid_plural "" @@ -12370,7 +8572,6 @@ msgstr[0] "" msgstr[1] "" #: src/slic3r/GUI/Tab.cpp:3721 ->>>>>>> master msgid "" "The physical printer below is based only on the preset, you are going to " "delete." @@ -12380,11 +8581,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3484 -======= #: src/slic3r/GUI/Tab.cpp:3726 ->>>>>>> master msgid "" "Note, that this printer will be deleted after deleting the selected preset." msgid_plural "" @@ -12392,27 +8589,12 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3488 -======= #: src/slic3r/GUI/Tab.cpp:3731 #, possible-boost-format ->>>>>>> master msgid "Are you sure you want to %1% the selected preset?" msgstr "" #. TRN Remove/Delete -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3493 -msgid "%1% Preset" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:3574 src/slic3r/GUI/Tab.cpp:3646 -msgid "Set" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:3710 -======= #: src/slic3r/GUI/Tab.cpp:3736 #, possible-boost-format msgid "%1% Preset" @@ -12447,65 +8629,40 @@ msgid "Match single line" msgstr "" #: src/slic3r/GUI/Tab.cpp:4236 ->>>>>>> master msgid "" "Machine limits will be emitted to G-code and used to estimate print time." msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3713 -======= #: src/slic3r/GUI/Tab.cpp:4239 ->>>>>>> master msgid "" "Machine limits will NOT be emitted to G-code, however they will be used to " "estimate print time, which may therefore not be accurate as the printer may " "apply a different set of machine limits." msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3717 -======= #: src/slic3r/GUI/Tab.cpp:4243 ->>>>>>> master msgid "" "Machine limits are not set, therefore the print time estimate may not be " "accurate." msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3739 -======= #: src/slic3r/GUI/Tab.cpp:4265 ->>>>>>> master msgid "LOCKED LOCK" msgstr "" #. TRN Description for "LOCKED LOCK" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3741 -======= #: src/slic3r/GUI/Tab.cpp:4267 ->>>>>>> master msgid "" "indicates that the settings are the same as the system (or default) values " "for the current option group" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3743 -======= #: src/slic3r/GUI/Tab.cpp:4269 ->>>>>>> master msgid "UNLOCKED LOCK" msgstr "" #. TRN Description for "UNLOCKED LOCK" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3745 -======= #: src/slic3r/GUI/Tab.cpp:4271 ->>>>>>> master msgid "" "indicates that some settings were changed and are not equal to the system " "(or default) values for the current option group.\n" @@ -12513,39 +8670,23 @@ msgid "" "to the system (or default) values." msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3750 -======= #: src/slic3r/GUI/Tab.cpp:4276 ->>>>>>> master msgid "WHITE BULLET" msgstr "" #. TRN Description for "WHITE BULLET" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3752 -======= #: src/slic3r/GUI/Tab.cpp:4278 ->>>>>>> master msgid "" "for the left button: indicates a non-system (or non-default) preset,\n" "for the right button: indicates that the settings hasn't been modified." msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3755 -======= #: src/slic3r/GUI/Tab.cpp:4281 ->>>>>>> master msgid "BACK ARROW" msgstr "" #. TRN Description for "BACK ARROW" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3757 -======= #: src/slic3r/GUI/Tab.cpp:4283 ->>>>>>> master msgid "" "indicates that the settings were changed and are not equal to the last saved " "preset for the current option group.\n" @@ -12553,21 +8694,13 @@ msgid "" "to the last saved preset." msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3767 -======= #: src/slic3r/GUI/Tab.cpp:4293 ->>>>>>> master msgid "" "LOCKED LOCK icon indicates that the settings are the same as the system (or " "default) values for the current option group" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3769 -======= #: src/slic3r/GUI/Tab.cpp:4295 ->>>>>>> master msgid "" "UNLOCKED LOCK icon indicates that some settings were changed and are not " "equal to the system (or default) values for the current option group.\n" @@ -12575,29 +8708,17 @@ msgid "" "default) values." msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3772 -msgid "WHITE BULLET icon indicates a non system (or non default) preset." -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:3775 -======= #: src/slic3r/GUI/Tab.cpp:4298 msgid "WHITE BULLET icon indicates a non system (or non default) preset." msgstr "" #: src/slic3r/GUI/Tab.cpp:4301 ->>>>>>> master msgid "" "WHITE BULLET icon indicates that the settings are the same as in the last " "saved preset for the current option group." msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3777 -======= #: src/slic3r/GUI/Tab.cpp:4303 ->>>>>>> master msgid "" "BACK ARROW icon indicates that the settings were changed and are not equal " "to the last saved preset for the current option group.\n" @@ -12605,71 +8726,32 @@ msgid "" "preset." msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3783 -======= #: src/slic3r/GUI/Tab.cpp:4309 ->>>>>>> master msgid "" "LOCKED LOCK icon indicates that the value is the same as the system (or " "default) value." msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3784 -======= #: src/slic3r/GUI/Tab.cpp:4310 ->>>>>>> master msgid "" "UNLOCKED LOCK icon indicates that the value was changed and is not equal to " "the system (or default) value.\n" "Click to reset current value to the system (or default) value." msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3790 -======= #: src/slic3r/GUI/Tab.cpp:4316 ->>>>>>> master msgid "" "WHITE BULLET icon indicates that the value is the same as in the last saved " "preset." msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3791 -======= #: src/slic3r/GUI/Tab.cpp:4317 ->>>>>>> master msgid "" "BACK ARROW icon indicates that the value was changed and is not equal to the " "last saved preset.\n" "Click to reset current value to the last saved preset." msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3935 src/slic3r/GUI/Tab.cpp:3937 -msgid "Material" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:4059 -msgid "Support head" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:4064 -msgid "Support pillar" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:4087 -msgid "Connection of the support sticks and junctions" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:4092 -msgid "Automatic generation" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:4166 -======= #: src/slic3r/GUI/Tab.cpp:4471 src/slic3r/GUI/Tab.cpp:4473 msgid "Material" msgstr "" @@ -12696,25 +8778,16 @@ msgstr "" #: src/slic3r/GUI/Tab.cpp:4719 #, possible-boost-format ->>>>>>> master msgid "" "\"%1%\" is disabled because \"%2%\" is on in \"%3%\" category.\n" "To enable \"%1%\", please switch off \"%2%\"" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:4168 src/libslic3r/PrintConfig.cpp:3004 -msgid "Object elevation" -msgstr "" - -#: src/slic3r/GUI/Tab.cpp:4168 src/libslic3r/PrintConfig.cpp:3106 -======= #: src/slic3r/GUI/Tab.cpp:4721 src/libslic3r/PrintConfig.cpp:3578 msgid "Object elevation" msgstr "" #: src/slic3r/GUI/Tab.cpp:4721 src/libslic3r/PrintConfig.cpp:3680 ->>>>>>> master msgid "Pad around object" msgstr "" @@ -12924,13 +8997,8 @@ msgstr "" msgid "Changelog & Download" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/UpdateDialogs.cpp:60 src/slic3r/GUI/UpdateDialogs.cpp:128 -#: src/slic3r/GUI/UpdateDialogs.cpp:192 -======= #: src/slic3r/GUI/UpdateDialogs.cpp:59 src/slic3r/GUI/UpdateDialogs.cpp:133 #: src/slic3r/GUI/UpdateDialogs.cpp:191 ->>>>>>> master msgid "Open changelog page" msgstr "" @@ -12942,28 +9010,6 @@ msgstr "" msgid "Don't notify about new releases any more" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/UpdateDialogs.cpp:89 -msgid "Opening Configuration Wizard" -msgstr "" - -#: src/slic3r/GUI/UpdateDialogs.cpp:89 src/slic3r/GUI/UpdateDialogs.cpp:275 -msgid "Configuration update" -msgstr "" - -#: src/slic3r/GUI/UpdateDialogs.cpp:90 -msgid "" -"PrusaSlicer is not using the newest configuration available.\n" -"Configuration Wizard may not offer the latest printers, filaments and SLA " -"materials to be installed. " -msgstr "" - -#: src/slic3r/GUI/UpdateDialogs.cpp:92 -msgid "Configuration update is available" -msgstr "" - -#: src/slic3r/GUI/UpdateDialogs.cpp:95 -======= #: src/slic3r/GUI/UpdateDialogs.cpp:94 msgid "Opening Configuration Wizard" msgstr "" @@ -12984,7 +9030,6 @@ msgid "Configuration update is available" msgstr "" #: src/slic3r/GUI/UpdateDialogs.cpp:100 ->>>>>>> master msgid "" "Would you like to install it?\n" "\n" @@ -12994,22 +9039,6 @@ msgid "" "Updated configuration bundles:" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/UpdateDialogs.cpp:116 src/slic3r/GUI/UpdateDialogs.cpp:182 -msgid "Comment:" -msgstr "" - -#: src/slic3r/GUI/UpdateDialogs.cpp:136 -msgid "Install" -msgstr "" - -#: src/slic3r/GUI/UpdateDialogs.cpp:140 -msgid "Don't install" -msgstr "" - -#: src/slic3r/GUI/UpdateDialogs.cpp:157 src/slic3r/GUI/UpdateDialogs.cpp:219 -#, possible-c-format -======= #: src/slic3r/GUI/UpdateDialogs.cpp:121 src/slic3r/GUI/UpdateDialogs.cpp:181 msgid "Comment:" msgstr "" @@ -13024,7 +9053,6 @@ msgstr "" #: src/slic3r/GUI/UpdateDialogs.cpp:157 src/slic3r/GUI/UpdateDialogs.cpp:212 #, possible-c-format, possible-boost-format ->>>>>>> master msgid "%s incompatibility" msgstr "" @@ -13033,11 +9061,7 @@ msgid "You must install a configuration update." msgstr "" #: src/slic3r/GUI/UpdateDialogs.cpp:160 -<<<<<<< HEAD -#, possible-c-format -======= #, possible-c-format, possible-boost-format ->>>>>>> master msgid "" "%s will now start updates. Otherwise it won't be able to start.\n" "\n" @@ -13047,20 +9071,6 @@ msgid "" "Updated configuration bundles:" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/UpdateDialogs.cpp:200 src/slic3r/GUI/UpdateDialogs.cpp:255 -#, possible-c-format -msgid "Exit %s" -msgstr "" - -#: src/slic3r/GUI/UpdateDialogs.cpp:220 -#, possible-c-format -msgid "%s configuration is incompatible" -msgstr "" - -#: src/slic3r/GUI/UpdateDialogs.cpp:225 -#, possible-c-format -======= #: src/slic3r/GUI/UpdateDialogs.cpp:200 src/slic3r/GUI/UpdateDialogs.cpp:247 #, possible-c-format, possible-boost-format msgid "Exit %s" @@ -13073,7 +9083,6 @@ msgstr "" #: src/slic3r/GUI/UpdateDialogs.cpp:216 #, possible-c-format, possible-boost-format ->>>>>>> master msgid "" "This version of %s is not compatible with currently installed configuration " "bundles.\n" @@ -13085,35 +9094,21 @@ msgid "" "existing configuration before installing files compatible with this %s." msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/UpdateDialogs.cpp:234 -#, possible-c-format -======= #: src/slic3r/GUI/UpdateDialogs.cpp:225 #, possible-c-format, possible-boost-format ->>>>>>> master msgid "This %s version: %s" msgstr "" -#: src/slic3r/GUI/UpdateDialogs.cpp:239 +#: src/slic3r/GUI/UpdateDialogs.cpp:230 msgid "Incompatible bundles:" msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/UpdateDialogs.cpp:258 -msgid "Re-configure" -msgstr "" - -#: src/slic3r/GUI/UpdateDialogs.cpp:279 -#, possible-c-format -======= #: src/slic3r/GUI/UpdateDialogs.cpp:246 msgid "Re-configure" msgstr "" #: src/slic3r/GUI/UpdateDialogs.cpp:265 #, possible-c-format, possible-boost-format ->>>>>>> master msgid "" "%s now uses an updated configuration structure.\n" "\n" @@ -13128,22 +9123,6 @@ msgid "" "choose whether to enable automatic preset updates." msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/UpdateDialogs.cpp:296 -msgid "For more information please visit our wiki page:" -msgstr "" - -#: src/slic3r/GUI/UpdateDialogs.cpp:313 -msgid "Configuration updates" -msgstr "" - -#: src/slic3r/GUI/UpdateDialogs.cpp:313 -msgid "No updates available" -msgstr "" - -#: src/slic3r/GUI/UpdateDialogs.cpp:318 -#, possible-c-format -======= #: src/slic3r/GUI/UpdateDialogs.cpp:282 msgid "For more information please visit our wiki page:" msgstr "" @@ -13158,7 +9137,6 @@ msgstr "" #: src/slic3r/GUI/UpdateDialogs.cpp:304 #, possible-c-format, possible-boost-format ->>>>>>> master msgid "%s has no configuration updates available." msgstr "" @@ -13333,49 +9311,6 @@ msgstr "" msgid "Export of a temporary 3mf file failed" msgstr "" -<<<<<<< HEAD -#: src/slic3r/Utils/FixModelByWin10.cpp:384 -msgid "Import of the repaired 3mf file failed" -msgstr "" - -#: src/slic3r/Utils/FixModelByWin10.cpp:386 -msgid "Repaired 3MF file does not contain any object" -msgstr "" - -#: src/slic3r/Utils/FixModelByWin10.cpp:388 -msgid "Repaired 3MF file contains more than one object" -msgstr "" - -#: src/slic3r/Utils/FixModelByWin10.cpp:390 -msgid "Repaired 3MF file does not contain any volume" -msgstr "" - -#: src/slic3r/Utils/FixModelByWin10.cpp:392 -msgid "Repaired 3MF file contains more than one volume" -msgstr "" - -#: src/slic3r/Utils/FixModelByWin10.cpp:401 -msgid "Model repair finished" -msgstr "" - -#: src/slic3r/Utils/FixModelByWin10.cpp:407 -msgid "Model repair canceled" -msgstr "" - -#: src/slic3r/Utils/FixModelByWin10.cpp:424 -msgid "Model repaired successfully" -msgstr "" - -#: src/slic3r/Utils/FixModelByWin10.cpp:424 -#: src/slic3r/Utils/FixModelByWin10.cpp:427 -msgid "Model Repair by the Netfabb service" -msgstr "" - -#: src/slic3r/Utils/FixModelByWin10.cpp:427 -msgid "Model repair failed:" -msgstr "" - -======= #: src/slic3r/Utils/FixModelByWin10.cpp:395 msgid "Import of the repaired 3mf file failed" msgstr "" @@ -13404,7 +9339,6 @@ msgstr "" msgid "Model repair canceled" msgstr "" ->>>>>>> master #: src/slic3r/Utils/FlashAir.cpp:58 msgid "Upload not enabled on FlashAir card." msgstr "" @@ -13435,11 +9369,7 @@ msgstr "" msgid "Note: OctoPrint version at least 1.1.0 is required." msgstr "" -<<<<<<< HEAD -#: src/slic3r/Utils/OctoPrint.cpp:185 -======= #: src/slic3r/Utils/OctoPrint.cpp:292 ->>>>>>> master msgid "Connection to Prusa SL1 / SL1S works correctly." msgstr "" @@ -13447,32 +9377,6 @@ msgstr "" msgid "Could not connect to Prusa SLA" msgstr "" -<<<<<<< HEAD -#: src/slic3r/Utils/OctoPrint.cpp:229 -msgid "Connection to PrusaLink works correctly." -msgstr "" - -#: src/slic3r/Utils/OctoPrint.cpp:235 -msgid "Could not connect to PrusaLink" -msgstr "" - -#: src/slic3r/Utils/PresetUpdater.cpp:65 -msgid "Copying of file %1% to %2% failed: %3%" -msgstr "" - -#: src/slic3r/Utils/PresetUpdater.cpp:744 -#, possible-c-format -msgid "requires min. %s and max. %s" -msgstr "" - -#: src/slic3r/Utils/PresetUpdater.cpp:748 -#, possible-c-format -msgid "requires min. %s" -msgstr "" - -#: src/slic3r/Utils/PresetUpdater.cpp:751 -#, possible-c-format -======= #: src/slic3r/Utils/OctoPrint.cpp:336 msgid "Connection to PrusaLink works correctly." msgstr "" @@ -13513,7 +9417,6 @@ msgstr "" #: src/slic3r/Utils/PresetUpdater.cpp:815 #, possible-c-format, possible-boost-format ->>>>>>> master msgid "requires max. %s" msgstr "" @@ -13647,11 +9550,7 @@ msgstr "" msgid "No extrusions were generated for objects." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/GCode.cpp:1274 -======= #: src/libslic3r/GCode.cpp:1445 ->>>>>>> master msgid "" "Your print is very close to the priming regions. Make sure there is no " "collision." @@ -13667,20 +9566,13 @@ msgid "" "Cannot calculate extrusion width for %1%: Variable \"%2%\" not accessible." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/Format/3mf.cpp:1693 -======= #: src/libslic3r/Format/3mf.cpp:1734 #, possible-boost-format ->>>>>>> master msgid "" "The selected 3mf file has been saved with a newer version of %1% and is not " "compatible." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/Format/AMF.cpp:979 -======= #: src/libslic3r/Format/3mf.cpp:1745 msgid "" "The selected 3MF contains FDM supports painted object using a newer version " @@ -13701,7 +9593,6 @@ msgstr "" #: src/libslic3r/Format/AMF.cpp:993 #, possible-boost-format ->>>>>>> master msgid "" "The selected amf file has been saved with a newer version of %1% and is not " "compatible." @@ -13843,15 +9734,7 @@ msgstr "" msgid "write calledback failed" msgstr "" -<<<<<<< HEAD -#: src/libslic3r/Preset.cpp:1307 -msgid "filament" -msgstr "" - -#: src/libslic3r/Print.cpp:1251 -======= #: src/libslic3r/Print.cpp:449 ->>>>>>> master msgid "All objects are outside of the print volume." msgstr "" @@ -14271,11 +10154,7 @@ msgstr "" msgid "mm or % (zero to disable)" msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:199 src/libslic3r/PrintConfig.cpp:2293 -======= #: src/libslic3r/PrintConfig.cpp:392 src/libslic3r/PrintConfig.cpp:2789 ->>>>>>> master msgid "Other layers" msgstr "" @@ -14338,18 +10217,11 @@ msgid "" "disable acceleration control for bridges." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:252 src/libslic3r/PrintConfig.cpp:395 -#: src/libslic3r/PrintConfig.cpp:940 src/libslic3r/PrintConfig.cpp:1079 -#: src/libslic3r/PrintConfig.cpp:1360 src/libslic3r/PrintConfig.cpp:1409 -#: src/libslic3r/PrintConfig.cpp:1419 src/libslic3r/PrintConfig.cpp:1614 -======= #: src/libslic3r/PrintConfig.cpp:445 src/libslic3r/PrintConfig.cpp:616 #: src/libslic3r/PrintConfig.cpp:1169 src/libslic3r/PrintConfig.cpp:1178 #: src/libslic3r/PrintConfig.cpp:1378 src/libslic3r/PrintConfig.cpp:1671 #: src/libslic3r/PrintConfig.cpp:1722 src/libslic3r/PrintConfig.cpp:1733 #: src/libslic3r/PrintConfig.cpp:1743 src/libslic3r/PrintConfig.cpp:1941 ->>>>>>> master msgid "mm/s²" msgstr "" @@ -14364,19 +10236,11 @@ msgid "" "bridges. Use 180° for zero angle." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:263 src/libslic3r/PrintConfig.cpp:852 -#: src/libslic3r/PrintConfig.cpp:1855 src/libslic3r/PrintConfig.cpp:1865 -#: src/libslic3r/PrintConfig.cpp:2123 src/libslic3r/PrintConfig.cpp:2278 -#: src/libslic3r/PrintConfig.cpp:2477 src/libslic3r/PrintConfig.cpp:2978 -#: src/libslic3r/PrintConfig.cpp:3099 -======= #: src/libslic3r/PrintConfig.cpp:456 src/libslic3r/PrintConfig.cpp:1075 #: src/libslic3r/PrintConfig.cpp:2232 src/libslic3r/PrintConfig.cpp:2242 #: src/libslic3r/PrintConfig.cpp:2533 src/libslic3r/PrintConfig.cpp:2774 #: src/libslic3r/PrintConfig.cpp:2991 src/libslic3r/PrintConfig.cpp:3552 #: src/libslic3r/PrintConfig.cpp:3673 ->>>>>>> master msgid "°" msgstr "" @@ -14388,19 +10252,11 @@ msgstr "" msgid "This fan speed is enforced during all bridges and overhangs." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:271 src/libslic3r/PrintConfig.cpp:864 -#: src/libslic3r/PrintConfig.cpp:1248 src/libslic3r/PrintConfig.cpp:1427 -#: src/libslic3r/PrintConfig.cpp:1490 src/libslic3r/PrintConfig.cpp:1747 -#: src/libslic3r/PrintConfig.cpp:2655 src/libslic3r/PrintConfig.cpp:2892 -#: src/libslic3r/PrintConfig.cpp:3018 -======= #: src/libslic3r/PrintConfig.cpp:464 src/libslic3r/PrintConfig.cpp:1087 #: src/libslic3r/PrintConfig.cpp:1559 src/libslic3r/PrintConfig.cpp:1751 #: src/libslic3r/PrintConfig.cpp:1814 src/libslic3r/PrintConfig.cpp:2065 #: src/libslic3r/PrintConfig.cpp:2124 src/libslic3r/PrintConfig.cpp:3177 #: src/libslic3r/PrintConfig.cpp:3466 src/libslic3r/PrintConfig.cpp:3592 ->>>>>>> master msgid "%" msgstr "" @@ -14424,20 +10280,6 @@ msgstr "" msgid "Speed for printing bridges." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:293 src/libslic3r/PrintConfig.cpp:671 -#: src/libslic3r/PrintConfig.cpp:679 src/libslic3r/PrintConfig.cpp:688 -#: src/libslic3r/PrintConfig.cpp:696 src/libslic3r/PrintConfig.cpp:723 -#: src/libslic3r/PrintConfig.cpp:742 src/libslic3r/PrintConfig.cpp:1015 -#: src/libslic3r/PrintConfig.cpp:1194 src/libslic3r/PrintConfig.cpp:1267 -#: src/libslic3r/PrintConfig.cpp:1343 src/libslic3r/PrintConfig.cpp:1377 -#: src/libslic3r/PrintConfig.cpp:1389 src/libslic3r/PrintConfig.cpp:1399 -#: src/libslic3r/PrintConfig.cpp:1449 src/libslic3r/PrintConfig.cpp:1508 -#: src/libslic3r/PrintConfig.cpp:1644 src/libslic3r/PrintConfig.cpp:1822 -#: src/libslic3r/PrintConfig.cpp:1831 src/libslic3r/PrintConfig.cpp:2257 -#: src/libslic3r/PrintConfig.cpp:2384 -msgid "mm/s" -======= #: src/libslic3r/PrintConfig.cpp:486 src/libslic3r/PrintConfig.cpp:894 #: src/libslic3r/PrintConfig.cpp:902 src/libslic3r/PrintConfig.cpp:911 #: src/libslic3r/PrintConfig.cpp:919 src/libslic3r/PrintConfig.cpp:946 @@ -14487,7 +10329,6 @@ msgstr "" #: src/libslic3r/PrintConfig.cpp:515 msgid "Outer and inner brim" ->>>>>>> master msgstr "" #: src/libslic3r/PrintConfig.cpp:520 @@ -14601,13 +10442,8 @@ msgstr "" msgid "Default print profile" msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:409 src/libslic3r/PrintConfig.cpp:2822 -#: src/libslic3r/PrintConfig.cpp:2833 -======= #: src/libslic3r/PrintConfig.cpp:630 src/libslic3r/PrintConfig.cpp:3396 #: src/libslic3r/PrintConfig.cpp:3407 ->>>>>>> master msgid "" "Default print profile associated with the current printer profile. On " "selection of the current printer profile, this print profile will be " @@ -14677,13 +10513,8 @@ msgid "" "not its adjacent solid shells." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:483 src/libslic3r/PrintConfig.cpp:918 -#: src/libslic3r/PrintConfig.cpp:2238 -======= #: src/libslic3r/PrintConfig.cpp:704 src/libslic3r/PrintConfig.cpp:1144 #: src/libslic3r/PrintConfig.cpp:2704 src/libslic3r/PrintConfig.cpp:2721 ->>>>>>> master msgid "Rectilinear" msgstr "" @@ -14734,21 +10565,12 @@ msgid "" "(for example 200%), it will be computed over layer height." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:511 src/libslic3r/PrintConfig.cpp:621 -#: src/libslic3r/PrintConfig.cpp:962 src/libslic3r/PrintConfig.cpp:975 -#: src/libslic3r/PrintConfig.cpp:1104 src/libslic3r/PrintConfig.cpp:1159 -#: src/libslic3r/PrintConfig.cpp:1185 src/libslic3r/PrintConfig.cpp:1634 -#: src/libslic3r/PrintConfig.cpp:1963 src/libslic3r/PrintConfig.cpp:2112 -#: src/libslic3r/PrintConfig.cpp:2180 src/libslic3r/PrintConfig.cpp:2341 -======= #: src/libslic3r/PrintConfig.cpp:732 src/libslic3r/PrintConfig.cpp:843 #: src/libslic3r/PrintConfig.cpp:1200 src/libslic3r/PrintConfig.cpp:1403 #: src/libslic3r/PrintConfig.cpp:1460 src/libslic3r/PrintConfig.cpp:1487 #: src/libslic3r/PrintConfig.cpp:1961 src/libslic3r/PrintConfig.cpp:2347 #: src/libslic3r/PrintConfig.cpp:2521 src/libslic3r/PrintConfig.cpp:2610 #: src/libslic3r/PrintConfig.cpp:2845 ->>>>>>> master msgid "mm or %" msgstr "" @@ -14759,16 +10581,10 @@ msgid "" "calculated on the perimeters speed setting above. Set to zero for auto." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:522 src/libslic3r/PrintConfig.cpp:984 -#: src/libslic3r/PrintConfig.cpp:1922 src/libslic3r/PrintConfig.cpp:1974 -#: src/libslic3r/PrintConfig.cpp:2224 src/libslic3r/PrintConfig.cpp:2354 -======= #: src/libslic3r/PrintConfig.cpp:744 src/libslic3r/PrintConfig.cpp:1222 #: src/libslic3r/PrintConfig.cpp:1233 src/libslic3r/PrintConfig.cpp:2306 #: src/libslic3r/PrintConfig.cpp:2359 src/libslic3r/PrintConfig.cpp:2690 #: src/libslic3r/PrintConfig.cpp:2859 ->>>>>>> master msgid "mm/s or %" msgstr "" @@ -14892,11 +10708,7 @@ msgid "" "maximum speeds." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:637 src/libslic3r/PrintConfig.cpp:1910 -======= #: src/libslic3r/PrintConfig.cpp:860 src/libslic3r/PrintConfig.cpp:2294 ->>>>>>> master msgid "approximate seconds" msgstr "" @@ -15051,13 +10863,8 @@ msgid "" "average." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:779 src/libslic3r/PrintConfig.cpp:2733 -#: src/libslic3r/PrintConfig.cpp:2734 -======= #: src/libslic3r/PrintConfig.cpp:1002 src/libslic3r/PrintConfig.cpp:3286 #: src/libslic3r/PrintConfig.cpp:3287 ->>>>>>> master msgid "Density" msgstr "" @@ -15115,11 +10922,7 @@ msgstr "" msgid "g" msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:843 src/libslic3r/PrintConfig.cpp:2817 -======= #: src/libslic3r/PrintConfig.cpp:1066 src/libslic3r/PrintConfig.cpp:3391 ->>>>>>> master msgid "(Unknown)" msgstr "" @@ -15166,11 +10969,7 @@ msgstr "" msgid "Line" msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:926 src/libslic3r/PrintConfig.cpp:2240 -======= #: src/libslic3r/PrintConfig.cpp:1152 src/libslic3r/PrintConfig.cpp:2706 ->>>>>>> master msgid "Honeycomb" msgstr "" @@ -15903,48 +11702,28 @@ msgid "" "the kind of the host." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1560 -msgid "Only retract when crossing perimeters" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:1561 -======= #: src/libslic3r/PrintConfig.cpp:1887 msgid "Only retract when crossing perimeters" msgstr "" #: src/libslic3r/PrintConfig.cpp:1888 ->>>>>>> master msgid "" "Disables retraction when the travel path does not exceed the upper layer's " "perimeters (and thus any ooze will be probably invisible)." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1568 -======= #: src/libslic3r/PrintConfig.cpp:1895 ->>>>>>> master msgid "" "This option will drop the temperature of the inactive extruders to prevent " "oozing. It will enable a tall skirt automatically and move extruders outside " "such skirt when changing temperatures." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1575 -msgid "Output filename format" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:1576 -======= #: src/libslic3r/PrintConfig.cpp:1902 msgid "Output filename format" msgstr "" #: src/libslic3r/PrintConfig.cpp:1903 ->>>>>>> master msgid "" "You can use all configuration options as variables inside this template. For " "example: [layer_height], [fill_density] etc. You can also use [timestamp], " @@ -15952,55 +11731,31 @@ msgid "" "[input_filename], [input_filename_base]." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1585 -msgid "Detect bridging perimeters" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:1587 -======= #: src/libslic3r/PrintConfig.cpp:1912 msgid "Detect bridging perimeters" msgstr "" #: src/libslic3r/PrintConfig.cpp:1914 ->>>>>>> master msgid "" "Experimental option to adjust flow for overhangs (bridge flow will be used), " "to apply bridge speed to them and enable fan." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1593 -msgid "Filament parking position" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:1594 -======= #: src/libslic3r/PrintConfig.cpp:1920 msgid "Filament parking position" msgstr "" #: src/libslic3r/PrintConfig.cpp:1921 ->>>>>>> master msgid "" "Distance of the extruder tip from the position where the filament is parked " "when unloaded. This should match the value in printer firmware." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1602 -msgid "Extra loading distance" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:1603 -======= #: src/libslic3r/PrintConfig.cpp:1929 msgid "Extra loading distance" msgstr "" #: src/libslic3r/PrintConfig.cpp:1930 ->>>>>>> master msgid "" "When set to zero, the distance the filament is moved from parking position " "during load is exactly the same as it was moved back during unload. When " @@ -16008,48 +11763,27 @@ msgid "" "than unloading." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1611 src/libslic3r/PrintConfig.cpp:1628 -#: src/libslic3r/PrintConfig.cpp:1641 src/libslic3r/PrintConfig.cpp:1651 -msgid "Perimeters" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:1612 -======= #: src/libslic3r/PrintConfig.cpp:1938 src/libslic3r/PrintConfig.cpp:1955 #: src/libslic3r/PrintConfig.cpp:1969 src/libslic3r/PrintConfig.cpp:1979 msgid "Perimeters" msgstr "" #: src/libslic3r/PrintConfig.cpp:1939 ->>>>>>> master msgid "" "This is the acceleration your printer will use for perimeters. Set zero to " "disable acceleration control for perimeters." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1619 -msgid "Perimeter extruder" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:1621 -======= #: src/libslic3r/PrintConfig.cpp:1946 msgid "Perimeter extruder" msgstr "" #: src/libslic3r/PrintConfig.cpp:1948 ->>>>>>> master msgid "" "The extruder to use when printing perimeters and brim. First extruder is 1." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1630 -======= #: src/libslic3r/PrintConfig.cpp:1957 ->>>>>>> master msgid "" "Set this to a non-zero value to set a manual extrusion width for perimeters. " "You may want to use thinner extrudates to get more accurate surfaces. If " @@ -16058,20 +11792,12 @@ msgid "" "it will be computed over layer height." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1643 -======= #: src/libslic3r/PrintConfig.cpp:1971 ->>>>>>> master msgid "" "Speed for perimeters (contours, aka vertical shells). Set to zero for auto." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1653 -======= #: src/libslic3r/PrintConfig.cpp:1981 ->>>>>>> master msgid "" "This option sets the number of perimeters to generate for each layer. Note " "that Slic3r may increase this number automatically when it detects sloping " @@ -16079,19 +11805,11 @@ msgid "" "Perimeters option is enabled." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1657 -msgid "(minimum)" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:1665 -======= #: src/libslic3r/PrintConfig.cpp:1985 msgid "(minimum)" msgstr "" #: src/libslic3r/PrintConfig.cpp:1993 ->>>>>>> master msgid "" "If you want to process the output G-code through custom scripts, just list " "their absolute paths here. Separate multiple scripts with a semicolon. " @@ -16100,37 +11818,6 @@ msgid "" "environment variables." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1677 -msgid "Printer type" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:1678 -msgid "Type of the printer." -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:1683 -msgid "Printer notes" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:1684 -msgid "You can put your notes regarding the printer here." -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:1692 -msgid "Printer vendor" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:1693 -msgid "Name of the printer vendor." -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:1698 -msgid "Printer variant" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:1699 -======= #: src/libslic3r/PrintConfig.cpp:2005 msgid "Printer type" msgstr "" @@ -16160,19 +11847,11 @@ msgid "Printer variant" msgstr "" #: src/libslic3r/PrintConfig.cpp:2027 ->>>>>>> master msgid "" "Name of the printer variant. For example, the printer variants may be " "differentiated by a nozzle diameter." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1716 -msgid "Raft layers" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:1718 -======= #: src/libslic3r/PrintConfig.cpp:2044 msgid "Raft contact Z distance" msgstr "" @@ -16213,25 +11892,16 @@ msgid "Raft layers" msgstr "" #: src/libslic3r/PrintConfig.cpp:2083 ->>>>>>> master msgid "" "The object will be raised by this number of layers, and support material " "will be generated under it." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1726 -msgid "Resolution" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:1727 -======= #: src/libslic3r/PrintConfig.cpp:2091 msgid "Slice resolution" msgstr "" #: src/libslic3r/PrintConfig.cpp:2092 ->>>>>>> master msgid "" "Minimum detail resolution, used to simplify the input file for speeding up " "the slicing job and reducing memory usage. High-resolution models often " @@ -16239,13 +11909,6 @@ msgid "" "simplification and use full resolution from input." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1737 -msgid "Minimum travel after retraction" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:1738 -======= #: src/libslic3r/PrintConfig.cpp:2102 msgid "G-code resolution" msgstr "" @@ -16266,48 +11929,20 @@ msgid "Minimum travel after retraction" msgstr "" #: src/libslic3r/PrintConfig.cpp:2115 ->>>>>>> master msgid "" "Retraction is not triggered when travel moves are shorter than this length." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1744 -msgid "Retract amount before wipe" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:1745 -======= #: src/libslic3r/PrintConfig.cpp:2121 msgid "Retract amount before wipe" msgstr "" #: src/libslic3r/PrintConfig.cpp:2122 ->>>>>>> master msgid "" "With bowden extruders, it may be wise to do some amount of quick retract " "before doing the wipe movement." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1752 -msgid "Retract on layer change" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:1753 -msgid "This flag enforces a retraction whenever a Z move is done." -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:1758 src/libslic3r/PrintConfig.cpp:1766 -msgid "Length" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:1759 -msgid "Retraction Length" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:1760 -======= #: src/libslic3r/PrintConfig.cpp:2129 msgid "Retract on layer change" msgstr "" @@ -16325,66 +11960,34 @@ msgid "Retraction Length" msgstr "" #: src/libslic3r/PrintConfig.cpp:2137 ->>>>>>> master msgid "" "When retraction is triggered, filament is pulled back by the specified " "amount (the length is measured on raw filament, before it enters the " "extruder)." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1762 src/libslic3r/PrintConfig.cpp:1771 -msgid "mm (zero to disable)" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:1767 -msgid "Retraction Length (Toolchange)" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:1768 -======= #: src/libslic3r/PrintConfig.cpp:2144 msgid "Retraction Length (Toolchange)" msgstr "" #: src/libslic3r/PrintConfig.cpp:2145 ->>>>>>> master msgid "" "When retraction is triggered before changing tool, filament is pulled back " "by the specified amount (the length is measured on raw filament, before it " "enters the extruder)." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1776 -msgid "Lift Z" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:1777 -======= #: src/libslic3r/PrintConfig.cpp:2153 msgid "Lift Z" msgstr "" #: src/libslic3r/PrintConfig.cpp:2154 ->>>>>>> master msgid "" "If you set this to a positive value, Z is quickly raised every time a " "retraction is triggered. When using multiple extruders, only the setting for " "the first extruder will be considered." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1784 -msgid "Above Z" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:1785 -msgid "Only lift Z above" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:1786 -======= #: src/libslic3r/PrintConfig.cpp:2161 msgid "Above Z" msgstr "" @@ -16394,24 +11997,12 @@ msgid "Only lift Z above" msgstr "" #: src/libslic3r/PrintConfig.cpp:2163 ->>>>>>> master msgid "" "If you set this to a positive value, Z lift will only take place above the " "specified absolute Z. You can tune this setting for skipping lift on the " "first layers." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1793 -msgid "Below Z" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:1794 -msgid "Only lift Z below" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:1795 -======= #: src/libslic3r/PrintConfig.cpp:2170 msgid "Below Z" msgstr "" @@ -16421,56 +12012,28 @@ msgid "Only lift Z below" msgstr "" #: src/libslic3r/PrintConfig.cpp:2172 ->>>>>>> master msgid "" "If you set this to a positive value, Z lift will only take place below the " "specified absolute Z. You can tune this setting for limiting lift to the " "first layers." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1803 src/libslic3r/PrintConfig.cpp:1811 -msgid "Extra length on restart" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:1804 -======= #: src/libslic3r/PrintConfig.cpp:2180 src/libslic3r/PrintConfig.cpp:2188 msgid "Extra length on restart" msgstr "" #: src/libslic3r/PrintConfig.cpp:2181 ->>>>>>> master msgid "" "When the retraction is compensated after the travel move, the extruder will " "push this additional amount of filament. This setting is rarely needed." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1812 -======= #: src/libslic3r/PrintConfig.cpp:2189 ->>>>>>> master msgid "" "When the retraction is compensated after changing tool, the extruder will " "push this additional amount of filament." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1819 src/libslic3r/PrintConfig.cpp:1820 -msgid "Retraction Speed" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:1821 -msgid "The speed for retractions (it only applies to the extruder motor)." -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:1827 src/libslic3r/PrintConfig.cpp:1828 -msgid "Deretraction Speed" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:1829 -======= #: src/libslic3r/PrintConfig.cpp:2196 src/libslic3r/PrintConfig.cpp:2197 msgid "Retraction Speed" msgstr "" @@ -16484,64 +12047,12 @@ msgid "Deretraction Speed" msgstr "" #: src/libslic3r/PrintConfig.cpp:2206 ->>>>>>> master msgid "" "The speed for loading of a filament into extruder after retraction (it only " "applies to the extruder motor). If left to zero, the retraction speed is " "used." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1836 -msgid "Seam position" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:1838 -msgid "Position of perimeters starting points." -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:1844 -msgid "Random" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:1845 -msgid "Nearest" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:1846 -msgid "Aligned" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:1854 -msgid "Direction" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:1856 -msgid "Preferred direction of the seam" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:1857 -msgid "Seam preferred direction" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:1864 -msgid "Jitter" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:1866 -msgid "Seam preferred direction jitter" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:1867 -msgid "Preferred direction of the seam - jitter" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:1874 -msgid "Distance from object" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:1875 -======= #: src/libslic3r/PrintConfig.cpp:2213 msgid "Seam position" msgstr "" @@ -16591,28 +12102,10 @@ msgid "Distance from brim/object" msgstr "" #: src/libslic3r/PrintConfig.cpp:2252 ->>>>>>> master msgid "" "Distance between skirt and brim (when draft shield is not used) or objects." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1882 -msgid "Skirt height" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:1883 -msgid "" -"Height of skirt expressed in layers. Set this to a tall value to use skirt " -"as a shield against drafts." -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:1890 -msgid "Draft shield" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:1891 -======= #: src/libslic3r/PrintConfig.cpp:2258 msgid "Skirt height" msgstr "" @@ -16626,7 +12119,6 @@ msgid "Draft shield" msgstr "" #: src/libslic3r/PrintConfig.cpp:2266 ->>>>>>> master msgid "" "With draft shield active, the skirt will be printed skirt_distance from the " "object, possibly intersecting brim.\n" @@ -16636,17 +12128,6 @@ msgid "" "from print bed due to wind draft." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1897 -msgid "Loops (minimum)" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:1898 -msgid "Skirt Loops" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:1899 -======= #: src/libslic3r/PrintConfig.cpp:2274 msgid "Disabled" msgstr "" @@ -16668,87 +12149,43 @@ msgid "Skirt Loops" msgstr "" #: src/libslic3r/PrintConfig.cpp:2283 ->>>>>>> master msgid "" "Number of loops for the skirt. If the Minimum Extrusion Length option is " "set, the number of loops might be greater than the one configured here. Set " "this to zero to disable skirt completely." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1907 -msgid "Slow down if layer print time is below" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:1908 -======= #: src/libslic3r/PrintConfig.cpp:2291 msgid "Slow down if layer print time is below" msgstr "" #: src/libslic3r/PrintConfig.cpp:2292 ->>>>>>> master msgid "" "If layer print time is estimated below this number of seconds, print moves " "speed will be scaled down to extend duration to this value." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1917 -msgid "Small perimeters" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:1919 -======= #: src/libslic3r/PrintConfig.cpp:2301 msgid "Small perimeters" msgstr "" #: src/libslic3r/PrintConfig.cpp:2303 ->>>>>>> master msgid "" "This separate setting will affect the speed of perimeters having radius <= " "6.5mm (usually holes). If expressed as percentage (for example: 80%) it will " "be calculated on the perimeters speed setting above. Set to zero for auto." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1929 -msgid "Solid infill threshold area" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:1931 -======= #: src/libslic3r/PrintConfig.cpp:2313 msgid "Solid infill threshold area" msgstr "" #: src/libslic3r/PrintConfig.cpp:2315 ->>>>>>> master msgid "" "Force solid infill for regions having a smaller area than the specified " "threshold." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1932 -msgid "mm²" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:1938 -msgid "Solid infill extruder" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:1940 -msgid "The extruder to use when printing solid infill." -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:1946 -msgid "Solid infill every" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:1948 -======= #: src/libslic3r/PrintConfig.cpp:2316 msgid "mm²" msgstr "" @@ -16766,7 +12203,6 @@ msgid "Solid infill every" msgstr "" #: src/libslic3r/PrintConfig.cpp:2332 ->>>>>>> master msgid "" "This feature allows to force a solid layer every given number of layers. " "Zero to disable. You can set this to any value (for example 9999); Slic3r " @@ -16774,11 +12210,7 @@ msgid "" "according to nozzle diameter and layer height." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1960 -======= #: src/libslic3r/PrintConfig.cpp:2344 ->>>>>>> master msgid "" "Set this to a non-zero value to set a manual extrusion width for infill for " "solid surfaces. If left zero, default extrusion width will be used if set, " @@ -16786,32 +12218,13 @@ msgid "" "(for example 90%) it will be computed over layer height." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1971 -======= #: src/libslic3r/PrintConfig.cpp:2356 ->>>>>>> master msgid "" "Speed for printing solid regions (top/bottom/internal horizontal shells). " "This can be expressed as a percentage (for example: 80%) over the default " "infill speed above. Set to zero for auto." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1983 -msgid "Number of solid layers to generate on top and bottom surfaces." -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:1989 src/libslic3r/PrintConfig.cpp:1990 -msgid "Minimum thickness of a top / bottom shell" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:1996 -msgid "Spiral vase" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:1997 -======= #: src/libslic3r/PrintConfig.cpp:2368 msgid "Number of solid layers to generate on top and bottom surfaces." msgstr "" @@ -16825,7 +12238,6 @@ msgid "Spiral vase" msgstr "" #: src/libslic3r/PrintConfig.cpp:2382 ->>>>>>> master msgid "" "This feature will raise Z gradually while printing a single-walled object in " "order to remove any visible seam. This option requires a single perimeter, " @@ -16834,30 +12246,18 @@ msgid "" "when printing more than one single object." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2005 -msgid "Temperature variation" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2006 -======= #: src/libslic3r/PrintConfig.cpp:2390 msgid "Temperature variation" msgstr "" #: src/libslic3r/PrintConfig.cpp:2391 ->>>>>>> master msgid "" "Temperature difference to be applied when an extruder is not active. Enables " "a full-height \"sacrificial\" skirt on which the nozzles are periodically " "wiped." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2016 -======= #: src/libslic3r/PrintConfig.cpp:2401 ->>>>>>> master msgid "" "This start procedure is inserted at the beginning, after bed has reached the " "target temperature and extruder just started heating, and before extruder " @@ -16868,11 +12268,7 @@ msgid "" "put a \"M109 S[first_layer_temperature]\" command wherever you want." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2031 -======= #: src/libslic3r/PrintConfig.cpp:2416 ->>>>>>> master msgid "" "This start procedure is inserted at the beginning, after any printer start " "gcode (and after any toolchange to this filament in case of multi-material " @@ -16885,37 +12281,6 @@ msgid "" "extruders, the gcode is processed in extruder order." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2047 -msgid "Color change G-code" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2048 -msgid "This G-code will be used as a code for the color change" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2057 -msgid "This G-code will be used as a code for the pause print" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2066 -msgid "This G-code will be used as a custom code" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2074 -msgid "Single Extruder Multi Material" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2075 -msgid "The printer multiplexes filaments into a single hot end." -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2080 -msgid "Prime all printing extruders" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2081 -======= #: src/libslic3r/PrintConfig.cpp:2432 msgid "Color change G-code" msgstr "" @@ -16945,25 +12310,16 @@ msgid "Prime all printing extruders" msgstr "" #: src/libslic3r/PrintConfig.cpp:2466 ->>>>>>> master msgid "" "If enabled, all printing extruders will be primed at the front edge of the " "print bed at the start of the print." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2086 -msgid "No sparse layers (EXPERIMENTAL)" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2087 -======= #: src/libslic3r/PrintConfig.cpp:2471 msgid "No sparse layers (EXPERIMENTAL)" msgstr "" #: src/libslic3r/PrintConfig.cpp:2472 ->>>>>>> master msgid "" "If enabled, the wipe tower will not be printed on layers with no " "toolchanges. On layers with a toolchange, extruder will travel downward to " @@ -16971,21 +12327,6 @@ msgid "" "with the print." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2094 -msgid "Generate support material" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2096 -msgid "Enable support material generation." -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2100 -msgid "Auto generated supports" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2102 -======= #: src/libslic3r/PrintConfig.cpp:2479 msgid "Slice gap closing radius" msgstr "" @@ -17032,93 +12373,49 @@ msgid "Auto generated supports" msgstr "" #: src/libslic3r/PrintConfig.cpp:2511 ->>>>>>> master msgid "" "If checked, supports will be generated automatically based on the overhang " "threshold value. If unchecked, supports will be generated inside the " "\"Support Enforcer\" volumes only." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2108 -msgid "XY separation between an object and its support" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2110 -======= #: src/libslic3r/PrintConfig.cpp:2517 msgid "XY separation between an object and its support" msgstr "" #: src/libslic3r/PrintConfig.cpp:2519 ->>>>>>> master msgid "" "XY separation between an object and its support. If expressed as percentage " "(for example 50%), it will be calculated over external perimeter width." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2120 -msgid "Pattern angle" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2122 -======= #: src/libslic3r/PrintConfig.cpp:2530 msgid "Pattern angle" msgstr "" #: src/libslic3r/PrintConfig.cpp:2532 ->>>>>>> master msgid "" "Use this setting to rotate the support material pattern on the horizontal " "plane." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2132 src/libslic3r/PrintConfig.cpp:2927 -======= #: src/libslic3r/PrintConfig.cpp:2542 src/libslic3r/PrintConfig.cpp:3501 ->>>>>>> master msgid "" "Only create support if it lies on a build plate. Don't create support on a " "print." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2138 -msgid "Contact Z distance" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2140 -======= #: src/libslic3r/PrintConfig.cpp:2548 msgid "Top contact Z distance" msgstr "" #: src/libslic3r/PrintConfig.cpp:2550 ->>>>>>> master msgid "" "The vertical distance between object and support material interface. Setting " "this to 0 will also prevent Slic3r from using bridge flow and speed for the " "first object layer." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2147 -msgid "0 (soluble)" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2148 -msgid "0.2 (detachable)" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2153 -msgid "Enforce support for the first" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2155 -======= #: src/libslic3r/PrintConfig.cpp:2558 msgid "0 (soluble)" msgstr "" @@ -17153,7 +12450,6 @@ msgid "Enforce support for the first" msgstr "" #: src/libslic3r/PrintConfig.cpp:2585 ->>>>>>> master msgid "" "Generate support material for the specified number of layers counting from " "bottom, regardless of whether normal support material is enabled or not and " @@ -17161,17 +12457,6 @@ msgid "" "of objects having a very thin or poor footprint on the build plate." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2160 -msgid "Enforce support for the first n layers" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2166 -msgid "Support material/raft/skirt extruder" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2168 -======= #: src/libslic3r/PrintConfig.cpp:2590 msgid "Enforce support for the first n layers" msgstr "" @@ -17181,17 +12466,12 @@ msgid "Support material/raft/skirt extruder" msgstr "" #: src/libslic3r/PrintConfig.cpp:2598 ->>>>>>> master msgid "" "The extruder to use when printing support material, raft and skirt (1+, 0 to " "use the current extruder to minimize tool changes)." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2177 -======= #: src/libslic3r/PrintConfig.cpp:2607 ->>>>>>> master msgid "" "Set this to a non-zero value to set a manual extrusion width for support " "material. If left zero, default extrusion width will be used if set, " @@ -17199,70 +12479,35 @@ msgid "" "example 90%) it will be computed over layer height." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2186 -msgid "Interface loops" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2188 -======= #: src/libslic3r/PrintConfig.cpp:2617 msgid "Interface loops" msgstr "" #: src/libslic3r/PrintConfig.cpp:2619 ->>>>>>> master msgid "" "Cover the top contact layer of the supports with loops. Disabled by default." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2193 -msgid "Support material/raft interface extruder" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2195 -======= #: src/libslic3r/PrintConfig.cpp:2624 msgid "Support material/raft interface extruder" msgstr "" #: src/libslic3r/PrintConfig.cpp:2626 ->>>>>>> master msgid "" "The extruder to use when printing support material interface (1+, 0 to use " "the current extruder to minimize tool changes). This affects raft too." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2202 -msgid "Interface layers" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2204 -======= #: src/libslic3r/PrintConfig.cpp:2634 msgid "Top interface layers" msgstr "" #: src/libslic3r/PrintConfig.cpp:2636 ->>>>>>> master msgid "" "Number of interface layers to insert between the object(s) and support " "material." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2211 -msgid "Interface pattern spacing" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2213 -msgid "Spacing between interface lines. Set zero to get a solid interface." -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2222 -======= #: src/libslic3r/PrintConfig.cpp:2643 msgid "0 (off)" msgstr "" @@ -17308,44 +12553,12 @@ msgid "Spacing between interface lines. Set zero to get a solid interface." msgstr "" #: src/libslic3r/PrintConfig.cpp:2688 ->>>>>>> master msgid "" "Speed for printing support material interface layers. If expressed as " "percentage (for example 50%) it will be calculated over support material " "speed." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2231 -msgid "Pattern" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2233 -msgid "Pattern used to generate support material." -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2239 -msgid "Rectilinear grid" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2245 -msgid "Pattern spacing" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2247 -msgid "Spacing between support material lines." -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2256 -msgid "Speed for printing support material." -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2263 -msgid "Synchronize with object layers" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2265 -======= #: src/libslic3r/PrintConfig.cpp:2697 msgid "Pattern" msgstr "" @@ -17401,25 +12614,16 @@ msgid "Synchronize with object layers" msgstr "" #: src/libslic3r/PrintConfig.cpp:2761 ->>>>>>> master msgid "" "Synchronize support layers with the object print layers. This is useful with " "multi-material printers, where the extruder switch is expensive." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2271 -msgid "Overhang threshold" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2273 -======= #: src/libslic3r/PrintConfig.cpp:2767 msgid "Overhang threshold" msgstr "" #: src/libslic3r/PrintConfig.cpp:2769 ->>>>>>> master msgid "" "Support material will not be generated for overhangs whose slope angle (90° " "= vertical) is above the given threshold. In other words, this value " @@ -17428,45 +12632,22 @@ msgid "" "detection (recommended)." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2285 -msgid "With sheath around the support" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2287 -======= #: src/libslic3r/PrintConfig.cpp:2781 msgid "With sheath around the support" msgstr "" #: src/libslic3r/PrintConfig.cpp:2783 ->>>>>>> master msgid "" "Add a sheath (a single perimeter line) around the base support. This makes " "the support more reliable, but also more difficult to remove." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2294 -======= #: src/libslic3r/PrintConfig.cpp:2790 ->>>>>>> master msgid "" "Nozzle temperature for layers after the first one. Set this to zero to " "disable temperature control commands in the output G-code." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2297 -msgid "Nozzle temperature" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2303 -msgid "Detect thin walls" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2305 -======= #: src/libslic3r/PrintConfig.cpp:2793 msgid "Nozzle temperature" msgstr "" @@ -17487,35 +12668,22 @@ msgid "Detect thin walls" msgstr "" #: src/libslic3r/PrintConfig.cpp:2809 ->>>>>>> master msgid "" "Detect single-width walls (parts where two extrusions don't fit and we need " "to collapse them into a single trace)." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2311 -msgid "Threads" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2312 -======= #: src/libslic3r/PrintConfig.cpp:2815 msgid "Threads" msgstr "" #: src/libslic3r/PrintConfig.cpp:2816 ->>>>>>> master msgid "" "Threads are used to parallelize long-running tasks. Optimal threads number " "is slightly above the number of available cores/processors." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2324 -======= #: src/libslic3r/PrintConfig.cpp:2828 ->>>>>>> master msgid "" "This custom code is inserted before every toolchange. Placeholder variables " "for all PrusaSlicer settings as well as {toolchange_z}, {previous_extruder} " @@ -17525,11 +12693,7 @@ msgid "" "behaviour both before and after the toolchange." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2337 -======= #: src/libslic3r/PrintConfig.cpp:2841 ->>>>>>> master msgid "" "Set this to a non-zero value to set a manual extrusion width for infill for " "top surfaces. You may want to use thinner extrudates to fill all narrow " @@ -17538,11 +12702,7 @@ msgid "" "percentage (for example 90%) it will be computed over layer height." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2349 -======= #: src/libslic3r/PrintConfig.cpp:2854 ->>>>>>> master msgid "" "Speed for printing top solid layers (it only applies to the uppermost " "external layers and not to their internal solid layers). You may want to " @@ -17551,17 +12711,6 @@ msgid "" "for auto." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2364 -msgid "Number of solid layers to generate on top surfaces." -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2365 -msgid "Top solid layers" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2373 -======= #: src/libslic3r/PrintConfig.cpp:2869 msgid "Number of solid layers to generate on top surfaces." msgstr "" @@ -17571,28 +12720,12 @@ msgid "Top solid layers" msgstr "" #: src/libslic3r/PrintConfig.cpp:2878 ->>>>>>> master msgid "" "The number of top solid layers is increased above top_solid_layers if " "necessary to satisfy minimum thickness of top shell. This is useful to " "prevent pillowing effect when printing with variable layer height." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2376 -msgid "Minimum top shell thickness" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2383 -msgid "Speed for travel moves (jumps between distant extrusion points)." -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2391 -msgid "Use firmware retraction" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2392 -======= #: src/libslic3r/PrintConfig.cpp:2881 msgid "Minimum top shell thickness" msgstr "" @@ -17617,43 +12750,26 @@ msgid "Use firmware retraction" msgstr "" #: src/libslic3r/PrintConfig.cpp:2906 ->>>>>>> master msgid "" "This experimental setting uses G10 and G11 commands to have the firmware " "handle the retraction. This is only supported in recent Marlin." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2398 -msgid "Use relative E distances" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2399 -======= #: src/libslic3r/PrintConfig.cpp:2912 msgid "Use relative E distances" msgstr "" #: src/libslic3r/PrintConfig.cpp:2913 ->>>>>>> master msgid "" "If your firmware requires relative E values, check this, otherwise leave it " "unchecked. Most firmwares use absolute values." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2405 -msgid "Use volumetric E" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2406 -======= #: src/libslic3r/PrintConfig.cpp:2919 msgid "Use volumetric E" msgstr "" #: src/libslic3r/PrintConfig.cpp:2920 ->>>>>>> master msgid "" "This experimental setting uses outputs the E values in cubic millimeters " "instead of linear millimeters. If your firmware doesn't already know " @@ -17663,124 +12779,53 @@ msgid "" "only supported in recent Marlin." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2416 -msgid "Enable variable layer height feature" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2417 -======= #: src/libslic3r/PrintConfig.cpp:2930 msgid "Enable variable layer height feature" msgstr "" #: src/libslic3r/PrintConfig.cpp:2931 ->>>>>>> master msgid "" "Some printers or printer setups may have difficulties printing with a " "variable layer height. Enabled by default." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2423 -msgid "Wipe while retracting" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2424 -======= #: src/libslic3r/PrintConfig.cpp:2937 msgid "Wipe while retracting" msgstr "" #: src/libslic3r/PrintConfig.cpp:2938 ->>>>>>> master msgid "" "This flag will move the nozzle while retracting to minimize the possible " "blob on leaky extruders." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2431 -======= #: src/libslic3r/PrintConfig.cpp:2945 ->>>>>>> master msgid "" "Multi material printers may need to prime or purge extruders on tool " "changes. Extrude the excess material into the wipe tower." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2437 -msgid "Purging volumes - load/unload volumes" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2438 -======= #: src/libslic3r/PrintConfig.cpp:2951 msgid "Purging volumes - load/unload volumes" msgstr "" #: src/libslic3r/PrintConfig.cpp:2952 ->>>>>>> master msgid "" "This vector saves required volumes to change from/to each tool used on the " "wipe tower. These values are used to simplify creation of the full purging " "volumes below." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2444 -msgid "Purging volumes - matrix" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2445 -======= #: src/libslic3r/PrintConfig.cpp:2958 msgid "Purging volumes - matrix" msgstr "" #: src/libslic3r/PrintConfig.cpp:2959 ->>>>>>> master msgid "" "This matrix describes volumes (in cubic milimetres) required to purge the " "new filament on the wipe tower for any given pair of tools." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2454 -msgid "Position X" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2455 -msgid "X coordinate of the left front corner of a wipe tower" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2461 -msgid "Position Y" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2462 -msgid "Y coordinate of the left front corner of a wipe tower" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2469 -msgid "Width of a wipe tower" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2475 -msgid "Wipe tower rotation angle" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2476 -msgid "Wipe tower rotation angle with respect to x-axis." -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2483 -msgid "Wipe into this object's infill" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2484 -======= #: src/libslic3r/PrintConfig.cpp:2968 msgid "Position X" msgstr "" @@ -17818,47 +12863,23 @@ msgid "Wipe into this object's infill" msgstr "" #: src/libslic3r/PrintConfig.cpp:3006 ->>>>>>> master msgid "" "Purging after toolchange will be done inside this object's infills. This " "lowers the amount of waste but may result in longer print time due to " "additional travel moves." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2491 -msgid "Wipe into this object" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2492 -======= #: src/libslic3r/PrintConfig.cpp:3013 msgid "Wipe into this object" msgstr "" #: src/libslic3r/PrintConfig.cpp:3014 ->>>>>>> master msgid "" "Object will be used to purge the nozzle after a toolchange to save material " "that would otherwise end up in the wipe tower and decrease print time. " "Colours of the objects will be mixed as a result." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2498 -msgid "Maximal bridging distance" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2499 -msgid "Maximal distance between supports on sparse infill sections." -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2505 -msgid "XY Size Compensation" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2507 -======= #: src/libslic3r/PrintConfig.cpp:3020 msgid "Maximal bridging distance" msgstr "" @@ -17872,26 +12893,17 @@ msgid "XY Size Compensation" msgstr "" #: src/libslic3r/PrintConfig.cpp:3029 ->>>>>>> master msgid "" "The object will be grown/shrunk in the XY plane by the configured value " "(negative = inwards, positive = outwards). This might be useful for fine-" "tuning hole sizes." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2515 -msgid "Z offset" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2516 -======= #: src/libslic3r/PrintConfig.cpp:3037 msgid "Z offset" msgstr "" #: src/libslic3r/PrintConfig.cpp:3038 ->>>>>>> master msgid "" "This value will be added (or subtracted) from all the Z coordinates in the " "output G-code. It is used to compensate for bad Z endstop position: for " @@ -17899,65 +12911,6 @@ msgid "" "print bed, set this to -0.3 (or fix your endstop)." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2583 -msgid "Display width" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2584 -msgid "Width of the display" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2589 -msgid "Display height" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2590 -msgid "Height of the display" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2595 -msgid "Number of pixels in" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2597 -msgid "Number of pixels in X" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2603 -msgid "Number of pixels in Y" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2608 -msgid "Display horizontal mirroring" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2609 -msgid "Mirror horizontally" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2610 -msgid "Enable horizontal mirroring of output images" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2615 -msgid "Display vertical mirroring" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2616 -msgid "Mirror vertically" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2617 -msgid "Enable vertical mirroring of output images" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2622 -msgid "Display orientation" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2623 -======= #: src/libslic3r/PrintConfig.cpp:3105 msgid "Display width" msgstr "" @@ -18015,52 +12968,12 @@ msgid "Display orientation" msgstr "" #: src/libslic3r/PrintConfig.cpp:3145 ->>>>>>> master msgid "" "Set the actual LCD display orientation inside the SLA printer. Portrait mode " "will flip the meaning of display width and height parameters and the output " "images will be rotated by 90 degrees." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2629 -msgid "Landscape" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2630 -msgid "Portrait" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2635 -msgid "Fast" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2636 -msgid "Fast tilt" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2637 -msgid "Time of the fast tilt" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2644 -msgid "Slow" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2645 -msgid "Slow tilt" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2646 -msgid "Time of the slow tilt" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2653 -msgid "Area fill" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2654 -======= #: src/libslic3r/PrintConfig.cpp:3151 msgid "Landscape" msgstr "" @@ -18098,25 +13011,12 @@ msgid "Area fill" msgstr "" #: src/libslic3r/PrintConfig.cpp:3176 ->>>>>>> master msgid "" "The percentage of the bed area. \n" "If the print area exceeds the specified value, \n" "then a slow tilt will be used, otherwise - a fast tilt" msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2661 src/libslic3r/PrintConfig.cpp:2662 -#: src/libslic3r/PrintConfig.cpp:2663 -msgid "Printer scaling correction" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2669 src/libslic3r/PrintConfig.cpp:2670 -msgid "Printer absolute correction" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2671 -======= #: src/libslic3r/PrintConfig.cpp:3183 src/libslic3r/PrintConfig.cpp:3184 #: src/libslic3r/PrintConfig.cpp:3185 msgid "Printer scaling correction" @@ -18151,87 +13051,31 @@ msgid "Printer absolute correction" msgstr "" #: src/libslic3r/PrintConfig.cpp:3217 ->>>>>>> master msgid "" "Will inflate or deflate the sliced 2D polygons according to the sign of the " "correction." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2677 -msgid "Elephant foot minimum width" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2679 -======= #: src/libslic3r/PrintConfig.cpp:3223 msgid "Elephant foot minimum width" msgstr "" #: src/libslic3r/PrintConfig.cpp:3225 ->>>>>>> master msgid "" "Minimum width of features to maintain when doing elephant foot compensation." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2686 src/libslic3r/PrintConfig.cpp:2687 -msgid "Printer gamma correction" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2688 -======= #: src/libslic3r/PrintConfig.cpp:3232 src/libslic3r/PrintConfig.cpp:3233 msgid "Printer gamma correction" msgstr "" #: src/libslic3r/PrintConfig.cpp:3234 ->>>>>>> master msgid "" "This will apply a gamma correction to the rasterized 2D polygons. A gamma " "value of zero means thresholding with the threshold in the middle. This " "behaviour eliminates antialiasing without losing holes in polygons." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2700 src/libslic3r/PrintConfig.cpp:2701 -msgid "SLA material type" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2712 src/libslic3r/PrintConfig.cpp:2713 -msgid "Initial layer height" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2719 src/libslic3r/PrintConfig.cpp:2720 -msgid "Bottle volume" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2721 -msgid "ml" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2726 src/libslic3r/PrintConfig.cpp:2727 -msgid "Bottle weight" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2728 -msgid "kg" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2735 -msgid "g/ml" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2742 -msgid "money/bottle" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2747 -msgid "Faded layers" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2748 -======= #: src/libslic3r/PrintConfig.cpp:3253 src/libslic3r/PrintConfig.cpp:3254 msgid "SLA material type" msgstr "" @@ -18269,99 +13113,11 @@ msgid "Faded layers" msgstr "" #: src/libslic3r/PrintConfig.cpp:3301 ->>>>>>> master msgid "" "Number of the layers needed for the exposure time fade from initial exposure " "time to the exposure time" msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2755 src/libslic3r/PrintConfig.cpp:2756 -msgid "Minimum exposure time" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2763 src/libslic3r/PrintConfig.cpp:2764 -msgid "Maximum exposure time" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2771 src/libslic3r/PrintConfig.cpp:2772 -msgid "Exposure time" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2778 src/libslic3r/PrintConfig.cpp:2779 -msgid "Minimum initial exposure time" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2786 src/libslic3r/PrintConfig.cpp:2787 -msgid "Maximum initial exposure time" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2794 src/libslic3r/PrintConfig.cpp:2795 -msgid "Initial exposure time" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2801 src/libslic3r/PrintConfig.cpp:2802 -msgid "Correction for expansion" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2808 -msgid "SLA print material notes" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2809 -msgid "You can put your notes regarding the SLA print material here." -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2821 src/libslic3r/PrintConfig.cpp:2832 -msgid "Default SLA material profile" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2843 -msgid "Generate supports" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2845 -msgid "Generate supports for the models" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2850 -msgid "Pinhead front diameter" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2852 -msgid "Diameter of the pointing side of the head" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2859 -msgid "Head penetration" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2861 -msgid "How much the pinhead has to penetrate the model surface" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2868 -msgid "Pinhead width" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2870 -msgid "Width from the back sphere center to the front sphere center" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2878 -msgid "Pillar diameter" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2880 -msgid "Diameter in mm of the support pillars" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2888 -msgid "Small pillar diameter percent" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2890 -======= #: src/libslic3r/PrintConfig.cpp:3308 src/libslic3r/PrintConfig.cpp:3309 msgid "Minimum exposure time" msgstr "" @@ -18459,68 +13215,32 @@ msgid "Small pillar diameter percent" msgstr "" #: src/libslic3r/PrintConfig.cpp:3464 ->>>>>>> master msgid "" "The percentage of smaller pillars compared to the normal pillar diameter " "which are used in problematic areas where a normal pilla cannot fit." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2899 -msgid "Max bridges on a pillar" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2901 -======= #: src/libslic3r/PrintConfig.cpp:3473 msgid "Max bridges on a pillar" msgstr "" #: src/libslic3r/PrintConfig.cpp:3475 ->>>>>>> master msgid "" "Maximum number of bridges that can be placed on a pillar. Bridges hold " "support point pinheads and connect to pillars as small branches." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2909 -msgid "Pillar connection mode" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2910 -======= #: src/libslic3r/PrintConfig.cpp:3483 msgid "Pillar connection mode" msgstr "" #: src/libslic3r/PrintConfig.cpp:3484 ->>>>>>> master msgid "" "Controls the bridge type between two neighboring pillars. Can be zig-zag, " "cross (double zig-zag) or dynamic which will automatically switch between " "the first two depending on the distance of the two pillars." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2918 -msgid "Zig-Zag" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2919 -msgid "Cross" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2920 -msgid "Dynamic" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2932 -msgid "Pillar widening factor" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2934 -======= #: src/libslic3r/PrintConfig.cpp:3492 msgid "Zig-Zag" msgstr "" @@ -18538,35 +13258,11 @@ msgid "Pillar widening factor" msgstr "" #: src/libslic3r/PrintConfig.cpp:3508 ->>>>>>> master msgid "" "Merging bridges or pillars into another pillars can increase the radius. " "Zero means no increase, one means full increase." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2943 -msgid "Support base diameter" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2945 -msgid "Diameter in mm of the pillar base" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2953 -msgid "Support base height" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2955 -msgid "The height of the pillar base cone" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2962 -msgid "Support base safety distance" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2965 -======= #: src/libslic3r/PrintConfig.cpp:3517 msgid "Support base diameter" msgstr "" @@ -18588,36 +13284,12 @@ msgid "Support base safety distance" msgstr "" #: src/libslic3r/PrintConfig.cpp:3539 ->>>>>>> master msgid "" "The minimum distance of the pillar base from the model in mm. Makes sense in " "zero elevation mode where a gap according to this parameter is inserted " "between the model and the pad." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2975 -msgid "Critical angle" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2977 -msgid "The default angle for connecting support sticks and junctions." -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2985 -msgid "Max bridge length" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2987 -msgid "The max length of a bridge" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2994 -msgid "Max pillar linking distance" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:2996 -======= #: src/libslic3r/PrintConfig.cpp:3549 msgid "Critical angle" msgstr "" @@ -18639,57 +13311,17 @@ msgid "Max pillar linking distance" msgstr "" #: src/libslic3r/PrintConfig.cpp:3570 ->>>>>>> master msgid "" "The max distance of two pillars to get linked with each other. A zero value " "will prohibit pillar cascading." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:3006 -======= #: src/libslic3r/PrintConfig.cpp:3580 ->>>>>>> master msgid "" "How much the supports should lift up the supported object. If \"Pad around " "object\" is enabled, this value is ignored." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:3017 -msgid "This is a relative measure of support points density." -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3023 -msgid "Minimal distance of the support points" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3025 -msgid "No support points will be placed closer than this threshold." -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3031 -msgid "Use pad" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3033 -msgid "Add a pad underneath the supported model" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3038 -msgid "Pad wall thickness" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3040 -msgid "The thickness of the pad and its optional cavity walls." -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3048 -msgid "Pad wall height" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3049 -======= #: src/libslic3r/PrintConfig.cpp:3591 msgid "This is a relative measure of support points density." msgstr "" @@ -18723,7 +13355,6 @@ msgid "Pad wall height" msgstr "" #: src/libslic3r/PrintConfig.cpp:3623 ->>>>>>> master msgid "" "Defines the pad cavity depth. Set to zero to disable the cavity. Be careful " "when enabling this feature, as some resins may produce an extreme suction " @@ -18731,21 +13362,6 @@ msgid "" "difficult." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:3062 -msgid "Pad brim size" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3063 -msgid "How far should the pad extend around the contained geometry" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3073 -msgid "Max merge distance" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3075 -======= #: src/libslic3r/PrintConfig.cpp:3636 msgid "Pad brim size" msgstr "" @@ -18759,50 +13375,22 @@ msgid "Max merge distance" msgstr "" #: src/libslic3r/PrintConfig.cpp:3649 ->>>>>>> master msgid "" "Some objects can get along with a few smaller pads instead of a single big " "one. This parameter defines how far the center of two smaller pads should " "be. If theyare closer, they will get merged into one pad." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:3095 -msgid "Pad wall slope" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3097 -======= #: src/libslic3r/PrintConfig.cpp:3669 msgid "Pad wall slope" msgstr "" #: src/libslic3r/PrintConfig.cpp:3671 ->>>>>>> master msgid "" "The slope of the pad wall relative to the bed plane. 90 degrees means " "straight walls." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:3108 -msgid "Create pad around object and ignore the support elevation" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3113 -msgid "Pad around object everywhere" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3115 -msgid "Force pad around object everywhere" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3120 -msgid "Pad object gap" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3122 -======= #: src/libslic3r/PrintConfig.cpp:3682 msgid "Create pad around object and ignore the support elevation" msgstr "" @@ -18820,78 +13408,30 @@ msgid "Pad object gap" msgstr "" #: src/libslic3r/PrintConfig.cpp:3696 ->>>>>>> master msgid "" "The gap between the object bottom and the generated pad in zero elevation " "mode." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:3131 -msgid "Pad object connector stride" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3133 -======= #: src/libslic3r/PrintConfig.cpp:3705 msgid "Pad object connector stride" msgstr "" #: src/libslic3r/PrintConfig.cpp:3707 ->>>>>>> master msgid "" "Distance between two connector sticks which connect the object and the " "generated pad." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:3140 -msgid "Pad object connector width" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3142 -======= #: src/libslic3r/PrintConfig.cpp:3714 msgid "Pad object connector width" msgstr "" #: src/libslic3r/PrintConfig.cpp:3716 ->>>>>>> master msgid "" "Width of the connector sticks which connect the object and the generated pad." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:3149 -msgid "Pad object connector penetration" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3152 -msgid "How much should the tiny connectors penetrate into the model body." -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3159 -msgid "Enable hollowing" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3161 -msgid "Hollow out a model to have an empty interior" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3166 -msgid "Wall thickness" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3168 -msgid "Minimum wall thickness of a hollowed model." -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3176 -msgid "Accuracy" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3178 -======= #: src/libslic3r/PrintConfig.cpp:3723 msgid "Pad object connector penetration" msgstr "" @@ -18921,17 +13461,12 @@ msgid "Accuracy" msgstr "" #: src/libslic3r/PrintConfig.cpp:3752 ->>>>>>> master msgid "" "Performance vs accuracy of calculation. Lower values may produce unwanted " "artifacts." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:3188 -======= #: src/libslic3r/PrintConfig.cpp:3762 ->>>>>>> master msgid "" "Hollowing is done in two steps: first, an imaginary interior is calculated " "deeper (offset plus the closing distance) in the object and then it's " @@ -18940,65 +13475,6 @@ msgid "" "most." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:3606 -msgid "Export OBJ" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3607 -msgid "Export the model(s) as OBJ." -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3618 -msgid "Export SLA" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3619 -msgid "Slice the model and export SLA printing layers as PNG." -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3624 -msgid "Export 3MF" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3625 -msgid "Export the model(s) as 3MF." -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3629 -msgid "Export AMF" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3630 -msgid "Export the model(s) as AMF." -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3634 -msgid "Export STL" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3635 -msgid "Export the model(s) as STL." -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3640 -msgid "Slice the model and export toolpaths as G-code." -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3645 -msgid "G-code viewer" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3646 -msgid "Visualize an already sliced and saved G-code" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3651 -msgid "Slice" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3652 -======= #: src/libslic3r/PrintConfig.cpp:3774 msgid "Print speed" msgstr "" @@ -19067,79 +13543,11 @@ msgid "Slice" msgstr "" #: src/libslic3r/PrintConfig.cpp:4284 ->>>>>>> master msgid "" "Slice the model as FFF or SLA based on the printer_technology configuration " "value." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:3657 -msgid "Help" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3658 -msgid "Show this help." -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3663 -msgid "Help (FFF options)" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3664 -msgid "Show the full list of print/G-code configuration options." -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3668 -msgid "Help (SLA options)" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3669 -msgid "Show the full list of SLA print configuration options." -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3673 -msgid "Output Model Info" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3674 -msgid "Write information about the model to the console." -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3678 -msgid "Save config file" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3679 -msgid "Save configuration to the specified file." -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3689 -msgid "Align XY" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3690 -msgid "Align the model to the given point." -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3695 -msgid "Cut model at the given Z." -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3716 -msgid "Center" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3717 -msgid "Center the print around the given center." -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3721 -msgid "Don't arrange" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3722 -======= #: src/libslic3r/PrintConfig.cpp:4289 msgid "Help" msgstr "" @@ -19205,31 +13613,11 @@ msgid "Don't arrange" msgstr "" #: src/libslic3r/PrintConfig.cpp:4354 ->>>>>>> master msgid "" "Do not rearrange the given models before merging and keep their original XY " "coordinates." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:3725 -msgid "Duplicate" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3726 -msgid "Multiply copies by this factor." -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3730 -msgid "Duplicate by grid" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3731 -msgid "Multiply copies by creating a grid." -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3735 -======= #: src/libslic3r/PrintConfig.cpp:4357 msgid "Ensure on bed" msgstr "" @@ -19257,49 +13645,17 @@ msgid "Multiply copies by creating a grid." msgstr "" #: src/libslic3r/PrintConfig.cpp:4372 ->>>>>>> master msgid "" "Arrange the supplied models in a plate and merge them in a single model in " "order to perform actions once." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:3740 -======= #: src/libslic3r/PrintConfig.cpp:4377 ->>>>>>> master msgid "" "Try to repair any non-manifold meshes (this option is implicitly added " "whenever we need to slice the model to perform the requested action)." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:3744 -msgid "Rotation angle around the Z axis in degrees." -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3748 -msgid "Rotate around X" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3749 -msgid "Rotation angle around the X axis in degrees." -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3753 -msgid "Rotate around Y" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3754 -msgid "Rotation angle around the Y axis in degrees." -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3759 -msgid "Scaling factor or percentage." -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3764 -======= #: src/libslic3r/PrintConfig.cpp:4381 msgid "Rotation angle around the Z axis in degrees." msgstr "" @@ -19325,22 +13681,11 @@ msgid "Scaling factor or percentage." msgstr "" #: src/libslic3r/PrintConfig.cpp:4401 ->>>>>>> master msgid "" "Detect unconnected parts in the given model(s) and split them into separate " "objects." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:3767 -msgid "Scale to Fit" -msgstr "" - -#: src/libslic3r/PrintConfig.cpp:3768 -msgid "Scale to fit the given volume." -msgstr "" - -======= #: src/libslic3r/PrintConfig.cpp:4404 msgid "Scale to Fit" msgstr "" @@ -19450,7 +13795,6 @@ msgid "" "loaded instead of the default OpenGL driver." msgstr "" ->>>>>>> master #: src/libslic3r/Zipper.cpp:27 msgid "Error with zip archive" msgstr "" diff --git a/resources/localization/cs/PrusaSlicer.mo b/resources/localization/cs/PrusaSlicer.mo Binary files differindex 092fad919..7523c895e 100644 --- a/resources/localization/cs/PrusaSlicer.mo +++ b/resources/localization/cs/PrusaSlicer.mo diff --git a/resources/localization/cs/PrusaSlicer_cs.po b/resources/localization/cs/PrusaSlicer_cs.po index ecf23e55c..a0f176d9b 100644 --- a/resources/localization/cs/PrusaSlicer_cs.po +++ b/resources/localization/cs/PrusaSlicer_cs.po @@ -4,12 +4,6 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -<<<<<<< HEAD -"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Phrase (phrase.com)\n" - -#: src/slic3r/GUI/Tab.cpp:4124 -======= "Plural-Forms: nplurals=4; plural=(n == 1) ? 0 : ((n%10 >= 2 && n%10 <=4 && (n" "%100 < 12 || n%100 > 14)) ? 1 : ((n%10 == 0 || n%10 == 1 || (n%10 >= 5 && n" "%10 <=9)) || (n%100 >= 12 && n%100 <= 14)) ? 2 : 3);\n" @@ -17,7 +11,6 @@ msgstr "" #: src/slic3r/GUI/Tab.cpp:4707 #, boost-format ->>>>>>> master msgid "" "\"%1%\" is disabled because \"%2%\" is on in \"%3%\" category.\n" "To enable \"%1%\", please switch off \"%2%\"" @@ -25,19 +18,11 @@ msgstr "" "\"%1%\" je deaktivováno, protože \"%2%\" je zapnuto v kategorii \"%3%\".\n" "Chcete-li povolit \"%1%\",, vypnÄ›te \"%2%\"" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:249 src/libslic3r/PrintConfig.cpp:828 -#: src/libslic3r/PrintConfig.cpp:1148 src/libslic3r/PrintConfig.cpp:1327 -#: src/libslic3r/PrintConfig.cpp:1390 src/libslic3r/PrintConfig.cpp:1640 -#: src/libslic3r/PrintConfig.cpp:2568 src/libslic3r/PrintConfig.cpp:2805 -#: src/libslic3r/PrintConfig.cpp:2931 -======= #: src/libslic3r/PrintConfig.cpp:464 src/libslic3r/PrintConfig.cpp:1087 #: src/libslic3r/PrintConfig.cpp:1559 src/libslic3r/PrintConfig.cpp:1751 #: src/libslic3r/PrintConfig.cpp:1814 src/libslic3r/PrintConfig.cpp:2065 #: src/libslic3r/PrintConfig.cpp:2124 src/libslic3r/PrintConfig.cpp:3177 #: src/libslic3r/PrintConfig.cpp:3466 src/libslic3r/PrintConfig.cpp:3592 ->>>>>>> master msgid "%" msgstr "%" @@ -169,16 +154,8 @@ msgstr "%1% PÅ™ednastavenÃ" msgid "%1% was substituted with %2%" msgstr "%2% bylo nahrazeno hodnotou %1%" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI.cpp:330 -msgid "%1% was substituted with %2%" -msgstr "%1% bylo nahrazeno hodnotou %2%" - -#: src/slic3r/GUI/MainFrame.cpp:1585 -======= #: src/slic3r/GUI/MainFrame.cpp:1707 #, boost-format ->>>>>>> master msgid "%1% was successfully sliced." msgstr "%1% byl úspěšnÄ› naslicován." @@ -204,10 +181,6 @@ msgstr "%d perimetry: %.2f mm" msgid "%d presets successfully imported." msgstr "%d pÅ™ednastavenà úspěšnÄ› importováno." -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_App.cpp:718 -#, possible-c-format -======= #: src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:304 #, c-format, boost-format msgid "%d triangles" @@ -215,7 +188,6 @@ msgstr "%d trojúhelnÃků" #: src/slic3r/GUI/GUI_App.cpp:1126 #, c-format, boost-format ->>>>>>> master msgid "" "%s\n" "Do you want to continue?" @@ -268,23 +240,6 @@ msgstr "%s obsahuje varovánÃ" msgid "%s has encountered an error" msgstr "DoÅ¡lo k chybÄ› v programu %s" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_App.cpp:528 -#, possible-c-format -msgid "" -"%s has encountered an error. It was likely caused by running out of memory. If you are sure you have enough RAM on your system, this may also be a bug and we would be glad if you reported it.\n" -"\n" -"The application will now terminate." -msgstr "" -"%s zaznamenal chybu. Bylo to pravdÄ›podobnÄ› způsobeno nedostatkem pamÄ›ti. Pokud jste si jisti, že máte v systému dostatek pamÄ›ti RAM, může to být také chyba programu a v takovém pÅ™ÃpadÄ› bychom byli rádi, kdybyste nám to nahlásili.\n" -"\n" -"Aplikace se nynà ukonÄÃ." - -#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:62 -#, possible-c-format -msgid "%s has encountered an error. It was likely caused by running out of memory. If you are sure you have enough RAM on your system, this may also be a bug and we would be glad if you reported it." -msgstr "%s zaznamenal chybu. Bylo to pravdÄ›podobnÄ› způsobeno nedostatkem pamÄ›ti. Pokud jste si jisti, že máte v systému dostatek pamÄ›ti RAM, může to být také chyba programu a v takovém pÅ™ÃpadÄ› bychom byli rádi, kdybyste nám to nahlásili." -======= #: src/slic3r/GUI/GUI_App.cpp:698 #, c-format, boost-format msgid "" @@ -312,7 +267,6 @@ msgstr "" "Pokud jste si jisti, že máte v systému dostatek pamÄ›ti RAM, může to být také " "chyba programu a v takovém pÅ™ÃpadÄ› bychom byli rádi, kdybyste nám to " "nahlásili." ->>>>>>> master #: src/slic3r/GUI/UpdateDialogs.cpp:304 #, c-format, boost-format @@ -324,29 +278,6 @@ msgstr "%s nemá k dispozici žádné aktualizace konfigurace." msgid "%s incompatibility" msgstr "Nenà kompatibilnà s %s" -<<<<<<< HEAD -#: src/slic3r/GUI/MsgDialog.cpp:114 -#, possible-c-format -msgid "%s information" -msgstr "%s informace" - -#: src/slic3r/GUI/UpdateDialogs.cpp:270 -#, possible-c-format -msgid "" -"%s now uses an updated configuration structure.\n" -"\n" -"So called 'System presets' have been introduced, which hold the built-in default settings for various printers. These System presets cannot be modified, instead, users now may create their own presets inheriting settings from one of the System presets.\n" -"An inheriting preset may either inherit a particular value from its parent or override it with a customized value.\n" -"\n" -"Please proceed with the %s that follows to set up the new presets and to choose whether to enable automatic preset updates." -msgstr "" -"%s nynà použÃvá aktualizovanou konfiguraÄnà strukturu.\n" -"\n" -"Byly uvedeny takzvaná \"Systémová pÅ™ednastavenÃ\", která obsahujà výchozà nastavenà pro rozliÄné tiskárny. Tato systémová pÅ™ednastavenà nemohou být upravena, mÃsto toho si nynà uživatel může vytvoÅ™it svá vlastnà pÅ™ednastavenà tÃm, že zdÄ›dà nastavenà z jednoho ze systémových pÅ™ednastavenÃ.\n" -"NovÄ› vytvoÅ™ené pÅ™ednastavenà může buÄ zdÄ›dit urÄitou hodnotu od svého pÅ™edchůdce nebo ji pÅ™epsat upravenou hodnotou.\n" -"\n" -"PÅ™i nastavovánà nových pÅ™edvoleb postupujte podle pokynů v %s a vyberte, zda chcete povolit automatické pÅ™ednastavené aktualizace." -======= #: src/slic3r/GUI/MsgDialog.cpp:246 src/slic3r/GUI/MsgDialog.cpp:259 #, c-format, boost-format msgid "%s info" @@ -356,7 +287,6 @@ msgstr "%s info" #, c-format, boost-format msgid "%s information" msgstr "%s informace" ->>>>>>> master #: src/slic3r/GUI/UpdateDialogs.cpp:265 #, c-format, boost-format @@ -391,27 +321,10 @@ msgstr "" msgid "%s View Mode" msgstr "%s Režim zobrazenÃ" -<<<<<<< HEAD -#: src/slic3r/GUI/UpdateDialogs.cpp:151 -#, possible-c-format -msgid "" -"%s will now start updates. Otherwise it won't be able to start.\n" -"\n" -"Note that a full configuration snapshot will be created first. It can then be restored at any time should there be a problem with the new version.\n" -"\n" -"Updated configuration bundles:" -msgstr "" -"%s nynà spustà aktualizaci. Jinak nebude moci být spuÅ¡tÄ›n.\n" -"\n" -"Nejprve bude vytvoÅ™en kompletnà snÃmek konfigurace a v pÅ™ÃpadÄ› problému s novou verzà lze provést obnovu.\n" -"\n" -"Aktualizované balÃÄky konfigurace:" -======= #: src/slic3r/GUI/MsgDialog.cpp:232 #, c-format, boost-format msgid "%s warning" msgstr "%s varovánÃ" ->>>>>>> master #: src/slic3r/GUI/UpdateDialogs.cpp:160 #, c-format, boost-format @@ -1296,11 +1209,7 @@ msgstr "" "Na objektu jsou definované vynucené podpÄ›ry, které nebudou použity, protože " "podpÄ›ry jsou zakázány." -<<<<<<< HEAD -#: src/slic3r/GUI/GLCanvas3D.cpp:638 -======= #: src/slic3r/GUI/GLCanvas3D.cpp:6372 ->>>>>>> master msgid "" "An object outside the print area was detected.\n" "Resolve the current problem to continue slicing." @@ -1379,11 +1288,7 @@ msgstr "archiv je moc velký" msgid "Are you sure you want to %1% the selected preset?" msgstr "Opravdu chcete %1% vybrané pÅ™ednastavenÃ?" -<<<<<<< HEAD -#: src/slic3r/GUI/FirmwareDialog.cpp:902 -======= #: src/slic3r/GUI/FirmwareDialog.cpp:915 ->>>>>>> master msgid "" "Are you sure you want to cancel firmware flashing?\n" "This could leave your printer in an unusable state!" @@ -1625,22 +1530,6 @@ msgstr "Vyhnout se pÅ™ejÞdÄ›nà perimetrů - maximálnà délka objÃzdné ce msgid "BACK ARROW" msgstr "Å IPKA ZPÄšT" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3727 -msgid "" -"BACK ARROW icon indicates that the settings were changed and are not equal to the last saved preset for the current option group.\n" -"Click to reset all settings for the current option group to the last saved preset." -msgstr "" -"Ikona Å IPKY ZPÄšT indikuje, že doÅ¡lo ke zmÄ›nÄ› nastavenÃ, které nenà shodné s naposledy uloženým pÅ™ednastavenÃm pro aktuálnà skupinu nastavenÃ.\n" -"KliknÄ›te pro reset vÅ¡ech nastavenà pro aktuálnà skupinu nastavenà na naposledy uložené pÅ™ednastavenÃ." - -#: src/slic3r/GUI/Tab.cpp:3741 -msgid "" -"BACK ARROW icon indicates that the value was changed and is not equal to the last saved preset.\n" -"Click to reset current value to the last saved preset." -msgstr "" -"Ikona Å IPKY ZPÄšT indikuje, že se hodnota zmÄ›nila a nenà shodná s naposledy uloženým pÅ™ednastavenÃm.\n" -======= #: src/slic3r/GUI/Tab.cpp:4291 msgid "" "BACK ARROW icon indicates that the settings were changed and are not equal " @@ -1661,7 +1550,6 @@ msgid "" msgstr "" "Ikona Å IPKY ZPÄšT indikuje, že se hodnota zmÄ›nila a nenà shodná s naposledy " "uloženým pÅ™ednastavenÃm.\n" ->>>>>>> master "KliknÄ›te pro reset souÄasné hodnoty na naposledy uložené pÅ™ednastavenÃ." #: src/slic3r/GUI/Preferences.cpp:137 @@ -1922,14 +1810,6 @@ msgstr "Vylità barvou" msgid "buffer too small" msgstr "buffer je pÅ™ÃliÅ¡ malý" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_App.cpp:1152 -msgid "" -"But since this version of PrusaSlicer we don't show this information in Printer Settings anymore.\n" -"Settings will be available in physical printers settings." -msgstr "" -"Ale od této verze PrusaSliceru již nebudeme tyto informace zobrazovat v Nastavenà tiskárny.\n" -======= #: src/slic3r/GUI/GUI_App.cpp:1660 msgid "" "But since this version of PrusaSlicer we don't show this information in " @@ -1938,21 +1818,12 @@ msgid "" msgstr "" "Ale od této verze PrusaSliceru již nebudeme tyto informace zobrazovat v " "Nastavenà tiskárny.\n" ->>>>>>> master "Nastavenà bude k dispozici v nastavenà fyzických tiskáren." #: src/slic3r/GUI/ButtonsDescription.cpp:62 msgid "Buttons And Text Colors Description" msgstr "Barvy pro textové popisky a tlaÄÃtka" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_App.cpp:1084 -msgid "" -"By default new Printer devices will be named as \"Printer N\" during its creation.\n" -"Note: This name can be changed later from the physical printers settings" -msgstr "" -"Ve výchozÃm stavu budou pÅ™i vytvářenà nové tiskárny pojmenovány jako „Printer N“.\n" -======= #: src/slic3r/GUI/GUI_App.cpp:1662 msgid "" "By default new Printer devices will be named as \"Printer N\" during its " @@ -1961,7 +1832,6 @@ msgid "" msgstr "" "Ve výchozÃm stavu budou pÅ™i vytvářenà nové tiskárny pojmenovány jako " "„Printer N“.\n" ->>>>>>> master "Poznámka: Tento název lze pozdÄ›ji zmÄ›nit v nastavenà fyzických tiskáren" #: src/slic3r/GUI/PresetHints.cpp:191 @@ -2031,11 +1901,7 @@ msgid "" msgstr "" "Nelze vypoÄÃtat Å¡ÃÅ™ku extrudovánà pro %1%: PromÄ›nná \"%2%\" nenà dostupná." -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_ObjectList.cpp:3400 -======= #: src/slic3r/GUI/GUI_ObjectList.cpp:3113 ->>>>>>> master msgid "" "Cannot insert a new layer range after the current layer range.\n" "Current layer range overlaps with the next layer range." @@ -2043,11 +1909,7 @@ msgstr "" "Nelze vložit nový rozsah vrstev za aktuálnà rozsah vrstev.\n" "Aktuálnà rozsah vrstev se pÅ™ekrývá s dalÅ¡Ãm rozsahem vrstev." -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_ObjectList.cpp:3391 -======= #: src/slic3r/GUI/GUI_ObjectList.cpp:3104 ->>>>>>> master 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" @@ -2057,16 +1919,10 @@ msgstr "" "DalÅ¡Ã rozsah vrstev je pÅ™ÃliÅ¡ tenký na to, aby byl rozdÄ›len na dva\n" "bez poruÅ¡enà minimálnà výšky vrstvy." -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_ObjectList.cpp:3395 -msgid "" -"Cannot insert a new layer range between the current and the next layer range.\n" -======= #: src/slic3r/GUI/GUI_ObjectList.cpp:3108 msgid "" "Cannot insert a new layer range between the current and the next layer " "range.\n" ->>>>>>> master "The gap between the current layer range and the next layer range\n" "is thinner than the minimum layer height allowed." msgstr "" @@ -2493,17 +2349,6 @@ msgstr "Průvodce &nastavenÃm" msgid "Configuration Assistant" msgstr "Průvodce nastavenà tiskárny" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI.cpp:368 -msgid "Configuration bundle was loaded, however some configuration values were not recognized." -msgstr "Byl naÄten konfiguraÄnà balÃk, ale nÄ›které konfiguraÄnà hodnoty nebyly rozpoznány." - -#: src/slic3r/GUI/GUI.cpp:378 -msgid "Configuration file \"%1%\" was loaded, however some configuration values were not recognized." -msgstr "Byl naÄten konfiguraÄnà soubor \"%1%\", ale nÄ›které konfiguraÄnà hodnoty nebyly rozpoznány." - -#: src/libslic3r/PrintConfig.cpp:1424 -======= #: src/slic3r/GUI/GUI.cpp:355 msgid "" "Configuration bundle was loaded, however some configuration values were not " @@ -2530,7 +2375,6 @@ msgid "Configuration is editing from ConfigWizard" msgstr "Konfigurace se upravuje z nástroje Průvodce nastavenÃm" #: src/libslic3r/PrintConfig.cpp:1848 ->>>>>>> master msgid "Configuration notes" msgstr "Poznámky k nastavenÃ" @@ -2662,23 +2506,6 @@ msgstr "PÅ™ipojenà k PrusaLinku funguje správnÄ›." msgid "Connection to Repetier works correctly." msgstr "PÅ™ipojenà k Repetieru funguje správnÄ›." -<<<<<<< HEAD -#: src/slic3r/Utils/OctoPrint.cpp:185 -msgid "Connection to Prusa SL1 / SL1S works correctly." -msgstr "PÅ™ipojenà k tiskárnÄ› Prusa SL1 /SL1S funguje správnÄ›." - -#: src/slic3r/Utils/OctoPrint.cpp:185 -msgid "Connection to Prusa SL1 works correctly." -msgstr "PÅ™ipojenà k tiskárnÄ› Prusa SL1 funguje správnÄ›." - -#: src/slic3r/Utils/OctoPrint.cpp:229 -msgid "Connection to PrusaLink works correctly." -msgstr "PÅ™ipojenà k PrusaLinku funguje správnÄ›." - -#: src/libslic3r/PrintConfig.cpp:2051 -msgid "Contact Z distance" -msgstr "Mezera mezi podpÄ›rami a objektem v ose Z" -======= #: src/slic3r/GUI/DoubleSlider.cpp:1458 msgid "continue" msgstr "pokraÄovat" @@ -2686,7 +2513,6 @@ msgstr "pokraÄovat" #: src/slic3r/Config/Snapshot.cpp:601 msgid "Continue" msgstr "PokraÄovat" ->>>>>>> master #: src/slic3r/GUI/GUI_App.cpp:982 msgid "Continue and import newer configuration?" @@ -2786,45 +2612,6 @@ msgstr "KopÃrovat do Schránky" msgid "Copy Version Info" msgstr "ZkopÃrovat ÄÃslo verze" -<<<<<<< HEAD -#: src/slic3r/Utils/PresetUpdater.cpp:84 -msgid "" -"Copying of file %1% to %2% failed.\n" -"Error message : %3%\n" -"Copying was triggered by function: %4%" -msgstr "" -"KopÃrovánà souboru %1% do %2% se nezdaÅ™ilo.\n" -"Chybová zpráva: %3%\n" -"Tato chyba nastala ve funkci: %4%" - -#: src/slic3r/Utils/PresetUpdater.cpp:91 -msgid "" -"Copying of file %1% to %2% failed. Permissions fail at target file after copying.\n" -"Error message : %3%\n" -"Copying was triggered by function: %4%" -msgstr "" -"KopÃrovánà souboru %1% do %2% se nezdaÅ™ilo. Pro kopÃrovánà z/do cÃlového souboru nemáte dostateÄná oprávnÄ›nÃ.\n" -"Chybová zpráva: %3%\n" -"Tato chyba nastala ve funkci: %4%" - -#: src/slic3r/Utils/PresetUpdater.cpp:70 -msgid "" -"Copying of file %1% to %2% failed. Permissions fail at target file before copying.\n" -"Error message : %3%\n" -"This error happend during %4% phase." -msgstr "" -"KopÃrovánà souboru %1% do %2% se nezdaÅ™ilo. Pro kopÃrovánà z/do cÃlového souboru nemáte dostateÄná oprávnÄ›nÃ.\n" -"Chybová zpráva: %3%\n" -"Tato chyba nastala ve funkci: %4%" - -#: src/slic3r/Utils/PresetUpdater.cpp:65 -msgid "Copying of file %1% to %2% failed: %3%" -msgstr "KopÃrovánà souboru %1% do %2% selhalo: %3%" - -#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:156 -msgid "Copying of the temporary G-code has finished but the exported code couldn't be opened during copy check. The output G-code is at %1%.tmp." -msgstr "KopÃrovánà doÄasného G-codu bylo dokonÄeno, ale exportovaný G-code nemohl být bÄ›hem kontroly kopÃrovánà otevÅ™en. Výstupnà G-cod je v %1%.tmp." -======= #: src/slic3r/Utils/PresetUpdater.cpp:61 #, boost-format msgid "Copying of file %1% to %2% failed: %3%" @@ -2838,7 +2625,6 @@ msgid "" msgstr "" "KopÃrovánà doÄasného G-codu bylo dokonÄeno, ale exportovaný G-code nemohl " "být bÄ›hem kontroly kopÃrovánà otevÅ™en. Výstupnà G-cod je v %1%.tmp." ->>>>>>> master #: src/slic3r/GUI/BackgroundSlicingProcess.cpp:704 #, boost-format @@ -2853,14 +2639,6 @@ msgstr "" msgid "Copying of the temporary G-code to the output G-code failed" msgstr "KopÃrovánà doÄasného G-codu do výstupnÃho G-codu selhalo" -<<<<<<< HEAD -#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:163 -msgid "" -"Copying of the temporary G-code to the output G-code failed. Maybe the SD card is write locked?\n" -"Error message: %1%" -msgstr "" -"KopÃrovánà doÄasného G-codu do výstupnÃho G-codu se nezdaÅ™ilo. Nenà SD karta chránÄ›ná proti zápisu?\n" -======= #: src/slic3r/GUI/BackgroundSlicingProcess.cpp:695 #, boost-format msgid "" @@ -2870,7 +2648,6 @@ msgid "" msgstr "" "KopÃrovánà doÄasného G-codu do výstupnÃho G-codu se nezdaÅ™ilo. Nenà SD karta " "chránÄ›ná proti zápisu?\n" ->>>>>>> master "Chybová hláška: %1%" #: src/slic3r/GUI/BackgroundSlicingProcess.cpp:698 @@ -2941,12 +2718,6 @@ msgstr "Nelze se spojit s OctoPrintem" msgid "Could not connect to Prusa SLA" msgstr "Nelze se pÅ™ipojit k Prusa SLA" -<<<<<<< HEAD -#: src/slic3r/Utils/OctoPrint.cpp:235 -msgid "Could not connect to PrusaLink" -msgstr "Nelze se pÅ™ipojit k PrusaLinku" - -======= #: src/slic3r/Utils/OctoPrint.cpp:342 msgid "Could not connect to PrusaLink" msgstr "Nelze se pÅ™ipojit k PrusaLinku" @@ -2955,7 +2726,6 @@ msgstr "Nelze se pÅ™ipojit k PrusaLinku" msgid "Could not connect to Repetier" msgstr "Nelze se pÅ™ipojit k Repetieru" ->>>>>>> master #: src/slic3r/Utils/Http.cpp:73 msgid "" "Could not detect system SSL certificate store. PrusaSlicer will be unable to " @@ -3709,22 +3479,9 @@ msgstr "" "Vyberte ANO, pokud chcete zmÄ›nit tuto hodnotu na %s%%,\n" "nebo NE, pokud jste si jisti, že %s %s je správná hodnota." -<<<<<<< HEAD -#: src/slic3r/GUI/Field.cpp:288 -#, possible-c-format -msgid "" -"Do you mean %s%% instead of %s %s?\n" -"Select YES if you want to change this value to %s%%, \n" -"or NO if you are sure that %s %s is a correct value." -msgstr "" -"MyslÃte %s%% namÃsto %s %s?\n" -"Vyberte ANO, pokud chcete zmÄ›nit tuto hodnotu na %s%%,\n" -"nebo NE, pokud jste si jisti, že %s %s je správná hodnota." -======= #: src/slic3r/GUI/ConfigWizard.cpp:2625 msgid "Do you want to continue changing the configuration?" msgstr "Chcete pokraÄovat v provádÄ›nà zmÄ›n konfigurace?" ->>>>>>> master #: src/slic3r/GUI/DoubleSlider.cpp:2535 msgid "Do you want to delete all saved tool changes?" @@ -3763,13 +3520,6 @@ msgstr "neobsahuje platný G-code." msgid "Don't arrange" msgstr "Neuspořádávat" -<<<<<<< HEAD -# Don't install -msgid "Don't install" -msgstr "Neinstalovat" - -#: src/slic3r/GUI/UpdateDialogs.cpp:71 -======= #: src/slic3r/GUI/GUI_App.cpp:974 msgid "Don't import" msgstr "Neimportovat" @@ -3779,7 +3529,6 @@ msgid "Don't install" msgstr "Neinstalovat" #: src/slic3r/GUI/UpdateDialogs.cpp:72 ->>>>>>> master msgid "Don't notify about new releases any more" msgstr "Neupozorňovat na nové verze" @@ -4701,20 +4450,12 @@ msgstr "Vrstvy poÄáteÄnÃho osvitu" msgid "failed finding central directory" msgstr "selhalo nalezenà koÅ™enového adresáře" -<<<<<<< HEAD -#: src/slic3r/GUI/Plater.cpp:2399 -msgid "Failed loading file \"%1%\" due to an invalid configuration." -msgstr "NaÄtenà souboru \"%1%\" se nezdaÅ™ilo z důvodu neplatné konfigurace." - -#: src/slic3r/Utils/FixModelByWin10.cpp:235 -======= #: src/slic3r/GUI/Plater.cpp:2516 #, boost-format msgid "Failed loading file \"%1%\" due to an invalid configuration." msgstr "NaÄtenà souboru \"%1%\" se nezdaÅ™ilo z důvodu neplatné konfigurace." #: src/slic3r/Utils/FixModelByWin10.cpp:237 ->>>>>>> master msgid "Failed loading the input model." msgstr "NaÄtenà vstupnÃho modelu se nezdaÅ™ilo." @@ -5215,11 +4956,7 @@ msgid "For support enforcers only" msgstr "Pouze pro vynucené podpÄ›ry" #. TRN Description for "WHITE BULLET" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3702 -======= #: src/slic3r/GUI/Tab.cpp:4266 ->>>>>>> master msgid "" "for the left button: indicates a non-system (or non-default) preset,\n" "for the right button: indicates that the settings hasn't been modified." @@ -5227,11 +4964,7 @@ msgstr "" "na levé stranÄ›: indikuje nesystémové (jiné než výchozÃ) pÅ™ednastavenÃ,\n" "na pravé stranÄ›: indikuje, že nastavenà nebylo zmÄ›nÄ›no." -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigManipulation.cpp:135 -======= #: src/slic3r/GUI/ConfigManipulation.cpp:142 ->>>>>>> master msgid "" "For the Wipe Tower to work with the soluble supports, the support layers\n" "need to be synchronized with the object layers." @@ -5239,15 +4972,10 @@ msgstr "" "U ÄistÃcà věže pokud pracujte s rozpustnými materiály, je tÅ™eba\n" "synchronizovat vrstvy podpÄ›r s vrstvami objektů." -<<<<<<< HEAD -#: src/libslic3r/Print.cpp:1422 -msgid "For the Wipe Tower to work with the soluble supports, the support layers need to be synchronized with the object layers." -======= #: src/libslic3r/Print.cpp:594 msgid "" "For the Wipe Tower to work with the soluble supports, the support layers " "need to be synchronized with the object layers." ->>>>>>> master msgstr "" "U ÄistÃcà věže pokud pracujte s rozpustnými materiály, je tÅ™eba\n" "synchronizovat vrstvy podpÄ›r s vrstvami objektů." @@ -5370,11 +5098,7 @@ msgstr "g" msgid "G-code" msgstr "G-code" -<<<<<<< HEAD -#: src/slic3r/GUI/DoubleSlider.cpp:1146 -======= #: src/slic3r/GUI/DoubleSlider.cpp:1482 ->>>>>>> master msgid "" "G-code associated to this tick mark is in a conflict with print mode.\n" "Editing it will cause changes of Slider data." @@ -5844,11 +5568,7 @@ msgstr "Název serveru" msgid "Hostname, IP or URL" msgstr "Název serveru, IP nebo URL" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:210 -======= #: src/slic3r/GUI/Tab.cpp:223 ->>>>>>> master msgid "" "Hover the cursor over buttons to find more information \n" "or click this button." @@ -5957,15 +5677,6 @@ msgstr "" msgid "If enabled, a repetition of the next random color will be allowed." msgstr "Pokud je povoleno, bude povoleno opakovánà dalÅ¡Ã náhodné barvy." -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigWizard.cpp:1164 -msgid "" -"If enabled, allows the Reload from disk command to automatically find and load the files when invoked.\n" -"If not enabled, the Reload from disk command will ask to select each file using an open file dialog." -msgstr "" -"Pokud je povoleno, v pÅ™ÃpadÄ› vyžádánÃ, umožňuje funkci „Znovu naÄÃst z disku“ automaticky vyhledat a naÄÃst soubory.\n" -"Pokud nenà povoleno, funkce „Znovu naÄÃst z disku“ požádá o zadánà cest ke každému souboru pomocà dialogového okna." -======= #: src/libslic3r/PrintConfig.cpp:2466 msgid "" "If enabled, all printing extruders will be primed at the front edge of the " @@ -5973,7 +5684,6 @@ msgid "" msgstr "" "Pokud je tato možnost povolena, vÅ¡echny tiskové extrudery na zaÄátku tisku " "vytlaÄà na pÅ™ednÃm okraji podložky malé množstvà materiálu." ->>>>>>> master #: src/slic3r/GUI/ConfigWizard.cpp:1250 msgid "" @@ -6460,19 +6170,9 @@ msgstr "Import opraveného 3MF souboru selhal" msgid "Import profile only" msgstr "Importovat pouze profil" -<<<<<<< HEAD -#: src/slic3r/GUI/MainFrame.cpp:1000 -msgid "Import SL1 / SL1S archive" -msgstr "Importovat SL1 / SL1S archiv" - -#: src/slic3r/GUI/MainFrame.cpp:1050 -msgid "Import SL1 archive" -msgstr "Importovat SL1 archiv" -======= #: src/slic3r/GUI/MainFrame.cpp:1209 msgid "Import SL1 / SL1S Archive" msgstr "Importovat SL1 / SL1S Archiv" ->>>>>>> master #: src/slic3r/GUI/Plater.cpp:1684 msgid "Import SLA archive" @@ -6545,15 +6245,6 @@ msgid "Increase/decrease edit area" msgstr "ZvÄ›tÅ¡it / zmenÅ¡it oblast úprav" #. TRN Description for "UNLOCKED LOCK" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3695 -msgid "" -"indicates that some settings were changed and are not equal to the system (or default) values for the current option group.\n" -"Click the UNLOCKED LOCK icon to reset all settings for current option group to the system (or default) values." -msgstr "" -"indikuje, že nÄ›která nastavenà byla zmÄ›nÄ›na a nejsou shodná se systémovými (výchozÃmi) hodnotami pro danou skupinu nastavenÃ.\n" -"KliknÄ›te na ikonu ODEMKNUTÉHO ZÃMKU pro reset vÅ¡ech nastavenà aktuálnà skupiny nastavenà na systémové (nebo výchozÃ) hodnoty." -======= #: src/slic3r/GUI/Tab.cpp:4259 msgid "" "indicates that some settings were changed and are not equal to the system " @@ -6565,7 +6256,6 @@ msgstr "" "(výchozÃmi) hodnotami pro danou skupinu nastavenÃ.\n" "KliknÄ›te na ikonu ODEMKNUTÉHO ZÃMKU pro reset vÅ¡ech nastavenà aktuálnà " "skupiny nastavenà na systémové (nebo výchozÃ) hodnoty." ->>>>>>> master #. TRN Description for "LOCKED LOCK" #: src/slic3r/GUI/Tab.cpp:4255 @@ -6577,27 +6267,6 @@ msgstr "" "aktuálnà skupinu nastavenÃ" #. TRN Description for "BACK ARROW" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3707 -msgid "" -"indicates that the settings were changed and are not equal to the last saved preset for the current option group.\n" -"Click the BACK ARROW icon to reset all settings for the current option group to the last saved preset." -msgstr "" -"indikuje, že doÅ¡lo ke zmÄ›nÄ› nastavenÃ, které nenà shodné s naposledy uloženým pÅ™ednastavenÃm pro aktuálnà skupinu nastavenÃ.\n" -"KliknÄ›te na ikonu Å IPKY ZPÄšT pro reset vÅ¡ech nastavenà pro aktuálnà skupinu nastavenà na naposledy uložené pÅ™ednastavenÃ." - -#: src/slic3r/GUI/ConfigManipulation.cpp:210 -#: src/slic3r/GUI/GUI_ObjectList.cpp:35 src/slic3r/GUI/GUI_ObjectList.cpp:93 -#: src/slic3r/GUI/GUI_ObjectList.cpp:652 src/slic3r/GUI/Plater.cpp:393 -#: src/slic3r/GUI/Tab.cpp:1413 src/slic3r/GUI/Tab.cpp:1414 -#: src/libslic3r/PrintConfig.cpp:237 src/libslic3r/PrintConfig.cpp:450 -#: src/libslic3r/PrintConfig.cpp:472 src/libslic3r/PrintConfig.cpp:812 -#: src/libslic3r/PrintConfig.cpp:826 src/libslic3r/PrintConfig.cpp:863 -#: src/libslic3r/PrintConfig.cpp:1025 src/libslic3r/PrintConfig.cpp:1035 -#: src/libslic3r/PrintConfig.cpp:1053 src/libslic3r/PrintConfig.cpp:1072 -#: src/libslic3r/PrintConfig.cpp:1091 src/libslic3r/PrintConfig.cpp:1843 -#: src/libslic3r/PrintConfig.cpp:1860 -======= #: src/slic3r/GUI/Tab.cpp:4271 msgid "" "indicates that the settings were changed and are not equal to the last saved " @@ -6620,7 +6289,6 @@ msgstr "" #: src/libslic3r/PrintConfig.cpp:1385 src/libslic3r/PrintConfig.cpp:1454 #: src/libslic3r/PrintConfig.cpp:1474 src/libslic3r/PrintConfig.cpp:1493 #: src/libslic3r/PrintConfig.cpp:2314 src/libslic3r/PrintConfig.cpp:2331 ->>>>>>> master msgid "Infill" msgstr "Výplň" @@ -6669,17 +6337,12 @@ msgstr "Doba poÄáteÄnÃho osvitu" msgid "Initial layer height" msgstr "Výška prvnà vrstvy" -<<<<<<< HEAD -#: src/slic3r/GUI/Field.cpp:269 -#, possible-c-format -======= #: src/libslic3r/PrintConfig.cpp:514 msgid "Inner brim only" msgstr "Pouze vnitÅ™nà lÃmec" #: src/slic3r/GUI/Field.cpp:266 #, c-format, boost-format ->>>>>>> master msgid "" "Input value is out of range\n" "Are you sure that %s is a correct value and that you want to continue?" @@ -6729,19 +6392,9 @@ msgstr "Zkontrolovat / aktivovat zálohy konfigurace" msgid "Install" msgstr "Instalovat" -<<<<<<< HEAD -#: src/slic3r/GUI/UpdateDialogs.cpp:136 -msgid "Install" -msgstr "Instralovat" - -#: src/slic3r/GUI/ObjectDataViewModel.cpp:62 -#: src/slic3r/GUI/ObjectDataViewModel.cpp:218 -#, possible-c-format -======= #: src/slic3r/GUI/ObjectDataViewModel.cpp:98 #: src/slic3r/GUI/ObjectDataViewModel.cpp:266 #, c-format, boost-format ->>>>>>> master msgid "Instance %d" msgstr "Instance %d" @@ -6927,13 +6580,8 @@ msgstr "Rozkmit (Jitter)" msgid "Jump to height" msgstr "PÅ™echod do výšky" -<<<<<<< HEAD -#: src/slic3r/GUI/DoubleSlider.cpp:1223 -#, possible-c-format -======= #: src/slic3r/GUI/DoubleSlider.cpp:1391 #, c-format, boost-format ->>>>>>> master msgid "" "Jump to height %s\n" "or Set ruler mode" @@ -6941,13 +6589,8 @@ msgstr "" "PÅ™echod do výšky %s\n" "nebo Nastavenà režimu pravÃtka" -<<<<<<< HEAD -#: src/slic3r/GUI/DoubleSlider.cpp:1220 -#, possible-c-format -======= #: src/slic3r/GUI/DoubleSlider.cpp:1388 #, c-format, boost-format ->>>>>>> master msgid "" "Jump to height %s\n" "Set ruler mode\n" @@ -7195,19 +6838,9 @@ msgstr "NaÄÃst model" msgid "Load an model saved with imperial units" msgstr "NaÄÃst jako model v imperiálnÃch jednotkách" -<<<<<<< HEAD -#: src/slic3r/GUI/MainFrame.cpp:1000 -msgid "Load an SL1 / Sl1S archive" -msgstr "NaÄÃst SL1 / SL1S archiv" - -#: src/slic3r/GUI/MainFrame.cpp:1058 -msgid "Load an SL1 archive" -msgstr "NaÄÃst SL1 archiv" -======= #: src/slic3r/GUI/MainFrame.cpp:1209 msgid "Load an SL1 / Sl1S archive" msgstr "NaÄÃst SL1 / SL1S archiv" ->>>>>>> master #: src/libslic3r/PrintConfig.cpp:4454 msgid "" @@ -8122,13 +7755,6 @@ msgstr "MonotónnÃ" msgid "More" msgstr "VÃce" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI.cpp:339 -msgid "Most likely the configuration was produced by a newer version of PrusaSlicer or by some PrusaSlicer fork." -msgstr "Konfiguraci pravdÄ›podobnÄ› vytvoÅ™ila novÄ›jÅ¡Ã verze programu PrusaSlicer nebo nÄ›jaký fork PrusaSliceru." - -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1219 -======= #: src/slic3r/GUI/GUI.cpp:326 msgid "" "Most likely the configuration was produced by a newer version of PrusaSlicer " @@ -8138,7 +7764,6 @@ msgstr "" "nÄ›jaký fork PrusaSliceru." #: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1224 ->>>>>>> master msgid "Mouse wheel" msgstr "KoleÄko myÅ¡i" @@ -8243,11 +7868,7 @@ msgstr "" msgid "Multiple Extruders" msgstr "VÃce Extruderů" -<<<<<<< HEAD -#: src/slic3r/GUI/Plater.cpp:2372 -======= #: src/slic3r/GUI/Plater.cpp:2648 ->>>>>>> master msgid "" "Multiple objects were loaded for a multi-material printer.\n" "Instead of considering them as multiple objects, should I consider\n" @@ -8347,20 +7968,10 @@ msgstr "Nový Projekt" msgid "New project, clear plater" msgstr "Nový projekt, odstranit modely na podložce" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI.cpp:304 -msgid "new unknown value %1% was changed to default value %2%" -msgstr "nová neznámá hodnota %1% byla zmÄ›nÄ›na na výchozà hodnotu %2%" - -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:609 -msgid "New Value" -msgstr "Nová hodnota" -======= #: src/slic3r/GUI/GUI_App.cpp:1203 #, boost-format msgid "New release version %1% is available." msgstr "K dispozici je nová verze %1%." ->>>>>>> master #: src/slic3r/GUI/UnsavedChangesDialog.cpp:832 msgid "New Value" @@ -8464,29 +8075,6 @@ msgstr "Nenalezeno:" msgid "Note" msgstr "Poznámka" -<<<<<<< HEAD -#: src/slic3r/GUI/MsgDialog.cpp:114 -msgid "Note that" -msgstr "MÄ›jte na pamÄ›ti, že" - -#: src/slic3r/GUI/Tab.cpp:3408 -msgid "Note, that selected preset will be deleted from this/those printer(s) too." -msgstr "Upozorňujeme, že vybrané pÅ™ednastavené bude odstranÄ›no také z tÄ›chto tiskáren." - -#: src/slic3r/GUI/Tab.cpp:3416 -msgid "Note, that this/those printer(s) will be deleted after deleting of the selected preset." -msgstr "Upozorňujeme, že tato/tyto tiskárny budou odstranÄ›ny po odstranÄ›nà vybraného pÅ™ednastavenÃ." - -#: src/slic3r/GUI/Tab.cpp:2039 -msgid "" -"Note: All parameters from this group are moved to the Physical Printer settings (see changelog).\n" -"\n" -"A new Physical Printer profile is created by clicking on the \"cog\" icon right of the Printer profiles combo box, by selecting the \"Add physical printer\" item in the Printer combo box. The Physical Printer profile editor opens also when clicking on the \"cog\" icon in the Printer settings tab. The Physical Printer profiles are being stored into PrusaSlicer/physical_printer directory." -msgstr "" -"Poznámka: VÅ¡echna nastavenà z této sekce jsou pÅ™esunuta do nastavenà Fyzické tiskárny (viz changelog).\n" -"\n" -"Nový profil Fyzické tiskárny lze vytvoÅ™it kliknutÃm na ikonu „ozubeného koleÄka“ vpravo od pole se seznamem profilů tiskáren a výbÄ›rem položky „PÅ™idat fyzickou tiskárnu“. Editor fyzické tiskárny se otevÅ™e po kliknutà na ikonu „ozubeného koleÄka“ na kartÄ› Nastavenà tiskárny. Profily fyzických tiskáren se ukládajà do adresáře PrusaSlicer/physical_printer directory." -======= #: src/slic3r/GUI/Tab.cpp:3716 msgid "Note, that the selected preset will be deleted from this printer too." msgid_plural "" @@ -8538,7 +8126,6 @@ msgstr "" "„PÅ™idat fyzickou tiskárnu“. Editor fyzické tiskárny se otevÅ™e po kliknutà na " "ikonu „ozubeného koleÄka“ na kartÄ› Nastavenà tiskárny. Profily fyzických " "tiskáren se ukládajà do adresáře PrusaSlicer/physical_printer directory." ->>>>>>> master #: src/slic3r/Utils/AstroBox.cpp:92 msgid "Note: AstroBox version at least 1.1.0 is required." @@ -9017,13 +8604,6 @@ msgstr "OtevÅ™Ãt stránku pro stahovánà Prusa 3D ovladaÄů ve vaÅ¡em prohlà msgid "Open the software releases page in your browser" msgstr "OtevÅ™Ãt stránku s verzemi tohoto softwaru ve vaÅ¡em prohlÞeÄi" -<<<<<<< HEAD -#: src/slic3r/GUI/UpdateDialogs.cpp:89 -msgid "Opening Configuration Wizard" -msgstr "OtevÃránà průvodce nastavenÃm" - -#: src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp:220 src/slic3r/GUI/Plater.cpp:3961 -======= #: src/slic3r/GUI/UpdateDialogs.cpp:94 msgid "Opening Configuration Wizard" msgstr "OtevÃránà průvodce nastavenÃm" @@ -9063,7 +8643,6 @@ msgstr "" "podložku." #: src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp:505 ->>>>>>> master msgid "Optimize orientation" msgstr "Optimalizovat orientaci" @@ -9533,15 +9112,6 @@ msgstr "Fyzické tiskárny" msgid "Pick another vendor supported by %s" msgstr "Vyberte si jiného výrobce, který je podporováný programem %s" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:67 -msgid "Picture sizes to be stored into a .gcode and .sl1 / .sl1s files, in the following format: \"XxY, XxY, ...\"" -msgstr "Velikosti obrázků budou uloženy do souborů .gcode / .sl1 / .sl1s, v následujÃcÃm formátu: \"XxY, XxY, ...\"" - -#: src/libslic3r/PrintConfig.cpp:67 -msgid "Picture sizes to be stored into a .gcode and .sl1 files, in the following format: \"XxY, XxY, ...\"" -msgstr "Velikosti obrázků, které majà být uloženy do souborů .gcode a .sl1, v následujÃcÃm formátu: „XxY, XxY, ...“" -======= #: src/libslic3r/PrintConfig.cpp:257 msgid "" "Picture sizes to be stored into a .gcode and .sl1 / .sl1s files, in the " @@ -9549,7 +9119,6 @@ msgid "" msgstr "" "Velikosti obrázků budou uloženy do souborů .gcode / .sl1 / .sl1s, v " "následujÃcÃm formátu: \"XxY, XxY, ...\"" ->>>>>>> master #: src/libslic3r/PrintConfig.cpp:3483 msgid "Pillar connection mode" @@ -9607,13 +9176,6 @@ msgstr "Podložka" msgid "Please check your object list before preset changing." msgstr "PÅ™ed zmÄ›nou nastavenà zkontrolujte prosÃm seznam objektů." -<<<<<<< HEAD -#: src/slic3r/GUI/GUI.cpp:341 -msgid "Please review the substitutions and adjust them if needed." -msgstr "Zkontrolujte nahrazené hodnoty a v pÅ™ÃpadÄ› potÅ™eby je upravte." - -#: src/slic3r/GUI/Plater.cpp:3089 -======= #: src/slic3r/GUI/BackgroundSlicingProcess.cpp:85 msgid "" "Please save your project and restart PrusaSlicer. We would be glad if you " @@ -9623,7 +9185,6 @@ msgstr "" "nahlásÃte." #: src/slic3r/GUI/Plater.cpp:3620 ->>>>>>> master msgid "Please select the file to reload" msgstr "Vyberte soubor, který chcete znovu naÄÃst" @@ -9785,11 +9346,7 @@ msgstr "Stiskem aktivujete obdélnÃkové odstranÄ›nà výbÄ›ru" msgid "Press to activate selection rectangle" msgstr "Stiskem aktivujete obdélnÃkový výbÄ›r" -<<<<<<< HEAD -#: src/slic3r/GUI/KBShortcutsDialog.cpp:155 -======= #: src/slic3r/GUI/KBShortcutsDialog.cpp:136 ->>>>>>> master msgid "" "Press to select multiple objects\n" "or move multiple objects with mouse" @@ -9797,17 +9354,10 @@ msgstr "" "StisknutÃm vyberte vÃce objektů\n" "nebo pÅ™esuňte vÃce objektů pomocà myÅ¡i" -<<<<<<< HEAD -#: src/slic3r/GUI/KBShortcutsDialog.cpp:221 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:222 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:231 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:232 -======= #: src/slic3r/GUI/KBShortcutsDialog.cpp:239 #: src/slic3r/GUI/KBShortcutsDialog.cpp:240 #: src/slic3r/GUI/KBShortcutsDialog.cpp:250 #: src/slic3r/GUI/KBShortcutsDialog.cpp:251 ->>>>>>> master msgid "" "Press to speed up 5 times while moving thumb\n" "with arrow keys or mouse wheel" @@ -10134,17 +9684,6 @@ msgid "" "PrusaSlicer has encountered an error while taking a configuration snapshot." msgstr "PrusaSlicer narazil na chybu pÅ™i poÅ™izovánà zálohy konfigurace." -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_App.cpp:586 -msgid "" -"PrusaSlicer has encountered a localization error. Please report to PrusaSlicer team, what language was active and in which scenario this issue happened. Thank you.\n" -"\n" -"The application will now terminate." -msgstr "" -"V aplikaci PrusaSlicer doÅ¡lo k chybÄ› v lokalizaci. Nahlaste PrusaSlicer týmu, jaký jazyk byl aktivnà a ve kterém scénáři k tomuto problému doÅ¡lo. DÄ›kujeme.\n" -"\n" -"Aplikace bude nynà ukonÄena." -======= #: src/slic3r/GUI/AboutDialog.cpp:271 msgid "" "PrusaSlicer is based on Slic3r by Alessandro Ranellucci and the RepRap " @@ -10152,7 +9691,6 @@ msgid "" msgstr "" "PrusaSlicer je založen na Slic3r od Alessandra Ranellucciho a RepRap " "komunity." ->>>>>>> master #: src/slic3r/GUI/MainFrame.cpp:232 msgid "PrusaSlicer is closing" @@ -10177,26 +9715,9 @@ msgstr "" "PrusaSlicer vyžaduje grafický ovladaÄ s funkÄnÃm OpenGL 2.0. ZatÃmco byla " "detekována verze OpenGL %s, render %s, výrobce %s." -<<<<<<< HEAD -#: src/slic3r/GUI/UpdateDialogs.cpp:90 -msgid "" -"PrusaSlicer is not using the newest configuration available.\n" -"Configuration Wizard may not offer the latest printers, filaments and SLA materials to be installed. " -msgstr "" -"PrusaSlicer nepoužÃvá nejnovÄ›jÅ¡Ã dostupnou konfiguraci.\n" -"Průvodce konfiguracà proto nemusà k instalaci nabÃzet nejnovÄ›jÅ¡Ã tiskárny, filamenty a SLA materiály." - -#: src/slic3r/GUI/OpenGLManager.cpp:259 -#, possible-c-format -msgid "" -"PrusaSlicer requires OpenGL 2.0 capable graphics driver to run correctly, \n" -"while OpenGL version %s, render %s, vendor %s was detected." -msgstr "PrusaSlicer vyžaduje grafický ovladaÄ s funkÄnÃm OpenGL 2.0. ZatÃmco byla detekována verze OpenGL %s, render %s, výrobce %s." -======= #: src/slic3r/GUI/GUI_App.cpp:1329 msgid "PrusaSlicer started after a crash" msgstr "PrusaSlicer se spustil po neoÄekávaném ukonÄenÃ" ->>>>>>> master #: src/slic3r/GUI/ConfigSnapshotDialog.cpp:60 msgid "PrusaSlicer version" @@ -10206,21 +9727,9 @@ msgstr "verze PrusaSliceru" msgid "PrusaSlicer will remember your action." msgstr "PrusaSlicer si vaÅ¡i akci zapamatuje." -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigWizard.cpp:1174 -msgid "" -"PrusaSlicer's user interfaces comes in three variants:\n" -"Simple, Advanced, and Expert.\n" -"The Simple mode shows only the most frequently used settings relevant for regular 3D printing. The other two offer progressively more sophisticated fine-tuning, they are suitable for advanced and expert users, respectively." -msgstr "" -"Uživatelské rozhranà PrusaSlicer je k dispozici ve tÅ™ech variantách:\n" -"Jednoduché, pokroÄilé a expertnÃ.\n" -"Jednoduchý režim zobrazuje pouze nejÄastÄ›ji použÃvaná nastavenà relevantnà pro běžný 3D tisk. DalÅ¡Ã dva nabÃzejà detailnÄ›jÅ¡Ã doladÄ›nà a proto jsou vhodné pro pokroÄilé a expertnà uživatele." -======= #: src/slic3r/GUI/GUI_App.cpp:3074 src/slic3r/GUI/Plater.cpp:1734 msgid "PrusaSlicer will remember your choice." msgstr "PrusaSlicer si zapamatuje vaÅ¡i volbu." ->>>>>>> master #: src/slic3r/GUI/ConfigWizard.cpp:1274 msgid "" @@ -10335,19 +9844,6 @@ msgstr "Vrstev raftu" msgid "Ramming customization" msgstr "PÅ™izpůsobenà rapidnà extruze" -<<<<<<< HEAD -#: src/slic3r/GUI/WipeTowerDialog.cpp:41 -msgid "" -"Ramming denotes the rapid extrusion just before a tool change in a single-extruder MM printer. Its purpose is to properly shape the end of the unloaded filament so it does not prevent insertion of the new filament and can itself be reinserted later. This phase is important and different materials can require different extrusion speeds to get the good shape. For this reason, the extrusion rates during ramming are adjustable.\n" -"\n" -"This is an expert-level setting, incorrect adjustment will likely lead to jams, extruder wheel grinding into filament etc." -msgstr "" -"Rapidnà extruze oznaÄuje rychlé vytlaÄenà filamentu tÄ›snÄ› pÅ™ed jeho výmÄ›nou za jiný v multi material tiskárnÄ› s jednÃm extruderem. ÚÄelem je správnÄ› vytvarovat konec vysouvaného filamentu tak, aby neblokoval zasunutà nového filamentu a také mohl být sám pozdÄ›ji opÄ›tovnÄ› zasunut. Tento proces je důležitý a rozdÃlné materiály mohou pro zÃskánà optimálnÃho tvaru vyžadovat různé rychlosti extruze. Z tohoto důvodu jsou objemové průtoky pÅ™i rapidnà extruzi uživatelsky upravitelné.\n" -"\n" -"Toto nastavenà je urÄeno pro pokroÄilé uživatele, nesprávné nastavenà velmi pravdÄ›podobnÄ› povede k zaseknutà filamentu, vybrouÅ¡enà filamentu podávacÃm koleÄkem, atd." - -#: src/slic3r/GUI/WipeTowerDialog.cpp:91 -======= #: src/slic3r/GUI/WipeTowerDialog.cpp:54 msgid "" "Ramming denotes the rapid extrusion just before a tool change in a single-" @@ -10373,7 +9869,6 @@ msgstr "" "koleÄkem, atd." #: src/slic3r/GUI/WipeTowerDialog.cpp:122 ->>>>>>> master msgid "Ramming line spacing" msgstr "Rozestup linek pÅ™i rapidnà extruzi" @@ -11132,15 +10627,6 @@ msgstr "Uložit projekt (3mf)" msgid "Save project as (3mf)" msgstr "Uložit projekt jako (3mf)" -<<<<<<< HEAD -#: src/slic3r/GUI/Plater.cpp:5337 -msgid "Save SL1 / SL1S file as:" -msgstr "Uložit SL1 / SL1S soubor jako:" - -#: src/slic3r/GUI/Plater.cpp:4975 -msgid "Save SL1 file as:" -msgstr "Uložit SL1 soubor jako:" -======= #: src/slic3r/GUI/Plater.cpp:5707 msgid "Save SL1 / SL1S file as:" msgstr "Uložit SL1 / SL1S soubor jako:" @@ -11148,7 +10634,6 @@ msgstr "Uložit SL1 / SL1S soubor jako:" #: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:898 msgid "Save support points?" msgstr "Uložit podpÄ›rné body?" ->>>>>>> master #: src/slic3r/GUI/UnsavedChangesDialog.cpp:946 #, boost-format @@ -11391,11 +10876,7 @@ msgstr "Vyberte, jaký typ podložky potÅ™ebujete" msgid "Select what kind of support do you need" msgstr "Vyberte typ podpÄ›r, které potÅ™ebujete" -<<<<<<< HEAD -#: src/slic3r/GUI/DoubleSlider.cpp:2135 -======= #: src/slic3r/GUI/DoubleSlider.cpp:2532 ->>>>>>> master msgid "" "Select YES if you want to delete all saved tool changes, \n" "NO if you want all tool changes switch to color changes, \n" @@ -11792,18 +11273,6 @@ msgstr "Odebrán pÅ™Ãznak Tisknout Instanci" msgid "Set upper thumb as active" msgstr "Nastavit hornà ukazatel jako aktivnÃ" -<<<<<<< HEAD -#: src/slic3r/GUI/KBShortcutsDialog.cpp:217 -msgid "Set upper thumb to current slider thumb" -msgstr "Aktivovat hornà ukazatel aktivnÃho posuvnÃku" - -#: src/libslic3r/PrintConfig.cpp:3714 -msgid "" -"Sets logging sensitivity. 0:fatal, 1:error, 2:warning, 3:info, 4:debug, 5:trace\n" -"For example. loglevel=2 logs fatal, error and warning level messages." -msgstr "" -"Zvolte úroveň logovánÃ: 0:fatalnà chyby, 1:chyby, 2:varovánÃ, 3:info, 4:ladÄ›nÃ, 5:trasovánÃ\n" -======= #: src/libslic3r/PrintConfig.cpp:4458 msgid "" "Sets logging sensitivity. 0:fatal, 1:error, 2:warning, 3:info, 4:debug, 5:" @@ -11812,7 +11281,6 @@ msgid "" msgstr "" "Zvolte úroveň logovánÃ: 0:fatalnà chyby, 1:chyby, 2:varovánÃ, 3:info, 4:" "ladÄ›nÃ, 5:trasovánÃ\n" ->>>>>>> master "NapÅ™Ãklad. loglevel=2 zaznamenává fatálnà chyby, chyby a varovné zprávy." #: src/slic3r/GUI/BedShapeDialog.cpp:249 src/slic3r/GUI/GCodeViewer.cpp:3705 @@ -12125,17 +11593,6 @@ msgstr "Nastavenà jednoho extruderu MM" msgid "Single Extruder Multi Material" msgstr "MultiMaterial tisk s jednÃm extrudérem" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:2101 -msgid "" -"Single Extruder Multi Material is selected, \n" -"and all extruders must have the same diameter.\n" -"Do you want to change the diameter for all extruders to first extruder nozzle diameter value?" -msgstr "" -"Je zvolená Multi Materiálová tiskárna s jednÃm extruderem,\n" -"a proto vÅ¡echny extrudery musà mÃt stejný průmÄ›r.\n" -"Chcete nastavit průmÄ›ry vÅ¡ech extruderových trysek podle průmÄ›ru prvnÃho extruderu?" -======= #: src/slic3r/GUI/Tab.cpp:2326 msgid "" "Single Extruder Multi Material is selected, \n" @@ -12147,7 +11604,6 @@ msgstr "" "a proto vÅ¡echny extrudery musà mÃt stejný průmÄ›r.\n" "Chcete nastavit průmÄ›ry vÅ¡ech extruderových trysek podle průmÄ›ru prvnÃho " "extruderu?" ->>>>>>> master #: src/slic3r/GUI/Tab.cpp:2734 msgid "Single extruder multimaterial parameters" @@ -12485,16 +11941,6 @@ msgstr "" msgid "Some filaments were uninstalled." msgstr "NÄ›které filamenty byly odinstalovány." -<<<<<<< HEAD -#: src/slic3r/GUI/Plater.cpp:2309 -#, possible-c-format -msgid "" -"Some object(s) in file %s looks like saved in inches.\n" -"Should I consider them as a saved in inches and convert them?" -msgstr "" -"NÄ›které objekty v souboru %s se zdá, že jsou uložené v palcÃch.\n" -"Mám je považovat za uložené v palcÃch a pÅ™evést je?" -======= #: src/libslic3r/PrintConfig.cpp:1321 msgid "" "Some G/M-code commands, including temperature control and others, are not " @@ -12506,7 +11952,6 @@ msgstr "" "Vyberte typ firmware, který použÃvá vaÅ¡e tiskárna pro dosaženà " "kompatibilnÃho výstupu. PÅ™Ãkazy typu \"No extrusion\" zabraňujà PrusaSliceru " "zcela exportovat jakoukoliv hodnotu extruze." ->>>>>>> master #: src/slic3r/GUI/GLCanvas3D.cpp:6370 msgid "Some objects are not visible during editing." @@ -12817,23 +12262,6 @@ msgstr "Zahájit nový slicovacà proces" msgid "Start the application" msgstr "SpusÅ¥it aplikaci" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_App.cpp:386 -msgid "" -"Starting with %1% 2.3, configuration directory on Linux has changed (according to XDG Base Directory Specification) to \n" -"%2%.\n" -"\n" -"This directory did not exist yet (maybe you run the new version for the first time).\n" -"However, an old %1% configuration directory was detected in \n" -"%3%.\n" -"\n" -"Consider moving the contents of the old directory to the new location in order to access your profiles, etc.\n" -"Note that if you decide to downgrade %1% in future, it will use the old location again.\n" -"\n" -"What do you want to do now?" -msgstr "" -"PoÄÃnaje %1% 2.3 se konfiguraÄnà adresář v systému Linux zmÄ›nil (podle specifikace XDG Base Directory) na %2%.\n" -======= #: src/slic3r/GUI/GUI_App.cpp:411 #, boost-format msgid "" @@ -12855,20 +12283,11 @@ msgid "" msgstr "" "PoÄÃnaje %1% 2.3 se konfiguraÄnà adresář v systému Linux zmÄ›nil (podle " "specifikace XDG Base Directory) na %2%.\n" ->>>>>>> master "\n" "Tento adresář jeÅ¡tÄ› neexistoval (možná použÃváte novou verzi poprvé).\n" "Byl vÅ¡ak zjiÅ¡tÄ›n starý konfiguraÄnà adresář %1% v\n" "%3%.\n" "\n" -<<<<<<< HEAD -"Zvažte pÅ™esunutà obsahu starého adresáře do nového umÃstÄ›nà za úÄelem pÅ™Ãstupu k vaÅ¡im profilům atd.\n" -"Pamatujte, že pokud se v budoucnu rozhodnete %1% downgradovat, použije znovu staré umÃstÄ›nÃ.\n" -"\n" -"Co chcete udÄ›lat?" - -#: src/slic3r/GUI/PrintHostDialogs.cpp:149 -======= "Zvažte pÅ™esunutà obsahu starého adresáře do nového umÃstÄ›nà za úÄelem " "pÅ™Ãstupu k vaÅ¡im profilům atd.\n" "Pamatujte, že pokud se v budoucnu rozhodnete %1% downgradovat, použije znovu " @@ -12877,7 +12296,6 @@ msgstr "" "Co chcete udÄ›lat?" #: src/slic3r/GUI/PrintHostDialogs.cpp:249 ->>>>>>> master msgid "Status" msgstr "Stav" @@ -13070,11 +12488,7 @@ msgstr "Podpora zbývajÃcÃch tiskových Äasů" msgid "Supports stealth mode" msgstr "Podporuje tichý režim" -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigManipulation.cpp:158 -======= #: src/slic3r/GUI/ConfigManipulation.cpp:164 ->>>>>>> master msgid "" "Supports work better, if the following feature is enabled:\n" "- Detect bridging perimeters" @@ -13144,27 +12558,13 @@ msgstr "PÅ™epnout do režimu %s" msgid "Switching Presets: Unsaved Changes" msgstr "PÅ™epnutà na jiné pÅ™ednastavenÃ: Neuložené zmÄ›ny" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_App.cpp:1608 -======= #: src/slic3r/GUI/GUI_App.cpp:2368 ->>>>>>> master msgid "" "Switching the language will trigger application restart.\n" "You will lose content of the plater." msgstr "" "PÅ™epnutÃm jazyka se aplikace restartuje.\n" "ZtratÃte obsah scény." -<<<<<<< HEAD - -#: src/slic3r/GUI/WipeTowerDialog.cpp:365 -msgid "" -"Switching to simple settings will discard changes done in the advanced mode!\n" -"\n" -"Do you want to proceed?" -msgstr "" -"PÅ™epnutÃm do jednoduchého nastavenà ztratÃte zmÄ›ny provedené v pokroÄilém režimu!\n" -======= #: src/slic3r/GUI/Plater.cpp:4861 #, boost-format @@ -13186,7 +12586,6 @@ msgid "" msgstr "" "PÅ™epnutÃm do jednoduchého nastavenà ztratÃte zmÄ›ny provedené v pokroÄilém " "režimu!\n" ->>>>>>> master "\n" "Opravdu chcete pokraÄovat?" @@ -13291,14 +12690,6 @@ msgstr "Vzor výplnÄ› %1% nenà urÄen pro 100%% hustotu výplnÄ›." msgid "The %s device could not have been found" msgstr "ZaÅ™Ãzenà %s nebylo nalezeno" -<<<<<<< HEAD -#: src/slic3r/GUI/FirmwareDialog.cpp:436 -#, possible-c-format -msgid "" -"The %s device was not found.\n" -"If the device is connected, please press the Reset button next to the USB connector ..." -msgstr "ZaÅ™Ãzenà %s nebylo nalezeno. Pokud je zaÅ™Ãzenà pÅ™ipojeno, stisknÄ›te tlaÄÃtko Reset vedle USB konektoru ..." -======= #: src/slic3r/GUI/FirmwareDialog.cpp:437 #, c-format, boost-format msgid "" @@ -13308,7 +12699,6 @@ msgid "" msgstr "" "ZaÅ™Ãzenà %s nebylo nalezeno. Pokud je zaÅ™Ãzenà pÅ™ipojeno, stisknÄ›te tlaÄÃtko " "Reset vedle USB konektoru ..." ->>>>>>> master #: src/slic3r/GUI/GUI_App.cpp:957 #, boost-format @@ -13336,14 +12726,6 @@ msgstr "" "Aktuálnà vlastnà pÅ™ednastavenà bude oddÄ›leno od rodiÄovského systémového " "pÅ™ednastavenÃ." -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:925 -msgid "" -"The currently manipulated object is tilted (rotation angles are not multiples of 90°).\n" -"Non-uniform scaling of tilted objects is only possible in the World coordinate system,\n" -"once the rotation is embedded into the object coordinates." -msgstr "MomentálnÄ› upravovaný objekt je pootoÄený (rotaÄnà úhly nejsou násobky 90°). Nejednotné Å¡kálovánà naklonÄ›ných objektů je ve svÄ›tových koordinátech možné pouze tehdy, když je informace o rotacÃch zapsána do koordinátů daného objektu." -======= #: src/slic3r/GUI/GUI_ObjectManipulation.cpp:980 msgid "" "The currently manipulated object is tilted (rotation angles are not " @@ -13356,7 +12738,6 @@ msgstr "" "Nejednotné Å¡kálovánà naklonÄ›ných objektů je ve svÄ›tových koordinátech možné " "pouze tehdy, když je informace o rotacÃch zapsána do koordinátů daného " "objektu." ->>>>>>> master #: src/libslic3r/PrintConfig.cpp:3551 msgid "The default angle for connecting support sticks and junctions." @@ -13576,15 +12957,6 @@ msgstr "NásledujÃcà modely SLA tiskáren nemajà vybrané žádné materiály msgid "the following suffix is not allowed:" msgstr "následujÃcà pÅ™Ãpona nenà povolená:" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI.cpp:340 -msgid "The following values were substituted:" -msgstr "Byly nahrazeny následujÃcà hodnoty:" - -#: src/libslic3r/PrintConfig.cpp:3035 -msgid "The gap between the object bottom and the generated pad in zero elevation mode." -msgstr "Mezera mezi spodkem objektu a generovanou podložkou v režimu nulového nadzvednutÃ." -======= #: src/slic3r/GUI/GUI.cpp:327 msgid "The following values were substituted:" msgstr "Byly nahrazeny následujÃcà hodnoty:" @@ -13596,7 +12968,6 @@ msgid "" msgstr "" "Mezera mezi spodkem objektu a generovanou podložkou v režimu nulového " "nadzvednutÃ." ->>>>>>> master #: src/libslic3r/PrintConfig.cpp:3529 msgid "The height of the pillar base cone" @@ -13735,17 +13106,6 @@ msgstr "" "Objekt se zvýšà tÃmto poÄtem vrstev a pod nÃm bude vytvoÅ™en podpůrný " "materiál." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2567 -msgid "" -"The percentage of the bed area. \n" -"If the print area exceeds the specified value, \n" -"then a slow tilt will be used, otherwise - a fast tilt" -msgstr "" -"ProcentuálnÄ› vyjádÅ™ená zabraná tisková plocha.\n" -"Pokud tisk zabere vÃce než je zadaná hodnota,\n" -"bude použit pomalý náklon. V ostatnÃch pÅ™Ãpadech bude použit rychlý náklon" -======= #: src/libslic3r/PrintConfig.cpp:3464 msgid "" "The percentage of smaller pillars compared to the normal pillar diameter " @@ -13754,7 +13114,6 @@ msgstr "" "Procentuálnà velikost menÅ¡Ãch podpÄ›rných pilÃřů oproti průmÄ›ru normálnÃch " "pilÃřů. MenÅ¡Ã pilÃÅ™e jsou použity v problematických mÃstech, kam se normálnà " "nevejdou." ->>>>>>> master #: src/libslic3r/PrintConfig.cpp:3176 msgid "" @@ -13916,9 +13275,6 @@ msgid "" "The selected object couldn't be split because it contains only one part." msgstr "Vybraný objekt nemůže být rozdÄ›len, protože obsahuje pouze jednu Äást." -<<<<<<< HEAD -#: src/slic3r/GUI/MainFrame.cpp:1003 -======= #: src/slic3r/GUI/Plater.cpp:3086 msgid "" "The selected object couldn't be split because it contains only one solid " @@ -13927,25 +13283,12 @@ msgstr "" "Vybraný objekt nebylo možné rozdÄ›lit, protože obsahuje pouze jednu Äást." #: src/slic3r/GUI/MainFrame.cpp:1162 ->>>>>>> master msgid "" "The selected project is no longer available.\n" "Do you want to remove it from the recent projects list?" msgstr "" "Vybraný projekt již nenà k dispozici.\n" "Chcete ho odstranit ze seznamu poslednÃch projektů?" -<<<<<<< HEAD - -#: src/slic3r/GUI/DoubleSlider.cpp:1121 -msgid "" -"The sequential print is on.\n" -"It's impossible to apply any custom G-code for objects printing sequentually.\n" -"This code won't be processed during G-code generation." -msgstr "" -"SekvenÄnà tisk je zapnutý.\n" -"Nenà možné použÃt jakýkoliv vlastnà G-kód pro objekty tisknuté sekvenÄnÄ›.\n" -"BÄ›hem generovánà G-kódu nebude tento kód zpracován." -======= #: src/slic3r/GUI/DoubleSlider.cpp:1440 msgid "" @@ -13965,7 +13308,6 @@ msgid "" msgstr "" "SekvenÄnà tisk je zapnutý.\n" "Pro objekty tisknuté sekvenÄnÃm tiskem nelze použÃt žádný vlastnà G-code." ->>>>>>> master #: src/slic3r/GUI/ConfigWizard.cpp:1287 msgid "The size of the object can be specified in inches" @@ -14002,12 +13344,7 @@ msgstr "" msgid "The speed for retractions (it only applies to the extruder motor)." msgstr "Rychlost retrakce (toto nastavenà platà pouze pro motor extruderu)." -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigManipulation.cpp:80 -#, possible-c-format -======= #: src/slic3r/GUI/ConfigManipulation.cpp:82 ->>>>>>> master msgid "" "The Spiral Vase mode requires:\n" "- one perimeter\n" @@ -14025,18 +13362,12 @@ msgstr "" "- aktivnà volbu „Zajistit tlouÅ¡Å¥ku svislých stÄ›n“\n" "- neaktivnà volbu „Detekce tenkých stÄ›n“" -<<<<<<< HEAD -#: src/libslic3r/Print.cpp:1270 -msgid "The Spiral Vase option can only be used when printing single material objects." -msgstr "Možnost \"Spirálová váza\" lze použÃt pouze pÅ™i tisku jednÃm materiálem." -======= #: src/libslic3r/Print.cpp:469 msgid "" "The Spiral Vase option can only be used when printing single material " "objects." msgstr "" "Možnost \"Spirálová váza\" lze použÃt pouze pÅ™i tisku jednÃm materiálem." ->>>>>>> master #: src/slic3r/GUI/PhysicalPrinterDialog.cpp:630 msgid "The supplied name is empty. It can't be saved." @@ -14091,11 +13422,7 @@ msgstr "" "která urÄà shodnou vzdálenost mezi podpÄ›ry a hornÃm/spodnà povrchem objektu " "v ose Z." -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:2731 -======= #: src/slic3r/GUI/Tab.cpp:3005 ->>>>>>> master msgid "" "The Wipe option is not available when using the Firmware Retraction mode.\n" "\n" @@ -14111,24 +13438,6 @@ msgid "" msgstr "" "ÄŒistÃvà Věž v souÄasné dobÄ› nepodporuje volumetric E (use_volumetric_e = 0)." -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigManipulation.cpp:114 -msgid "" -"The Wipe Tower currently supports the non-soluble supports only\n" -"if they are printed with the current extruder without triggering a tool change.\n" -"(both support_material_extruder and support_material_interface_extruder need to be set to 0)." -msgstr "" -"ÄŒistÃcà věž v souÄasné dobÄ› podporuje pouze nerozpustné podpÄ›ry\n" -"pokud jsou vytiÅ¡tÄ›ny s aktuálnÃm extrudérem bez spuÅ¡tÄ›nà výmÄ›ny nástroje.\n" -"(jak extruder pro tisk podpor tak extruder pro tisk kontaktnÃch podpÄ›r je tÅ™eba nastavit na 0)." - -#: src/libslic3r/Print.cpp:1426 -msgid "The Wipe Tower currently supports the non-soluble supports only if they are printed with the current extruder without triggering a tool change. (both support_material_extruder and support_material_interface_extruder need to be set to 0)." -msgstr "" -"ÄŒistÃcà věž v souÄasné dobÄ› podporuje pouze nerozpustné podpÄ›ry\n" -"pokud jsou vytiÅ¡tÄ›ny s aktuálnÃm extrudérem bez spuÅ¡tÄ›nà výmÄ›ny nástroje.\n" -"(jak extruder pro tisk podpor tak extruder pro tisk kontaktnÃch podpÄ›r je tÅ™eba nastavit na 0)." -======= #: src/slic3r/GUI/ConfigManipulation.cpp:121 msgid "" "The Wipe Tower currently supports the non-soluble supports only\n" @@ -14153,7 +13462,6 @@ msgstr "" "pokud jsou vytiÅ¡tÄ›ny s aktuálnÃm extrudérem bez spuÅ¡tÄ›nà výmÄ›ny nástroje.\n" "(jak extruder pro tisk podpor tak extruder pro tisk kontaktnÃch podpÄ›r je " "tÅ™eba nastavit na 0)." ->>>>>>> master #: src/libslic3r/Print.cpp:496 msgid "" @@ -14246,31 +13554,6 @@ msgstr "" "Docházà zde ke zmÄ›nÄ› barvy u extruderu, který dosud nebyl použit.\n" "Zkontrolujte nastavenÃ, abyste se vyhnuli redundantnÃm zmÄ›nám barev." -<<<<<<< HEAD -#: src/slic3r/GUI/DoubleSlider.cpp:1155 -msgid "" -"There is a color change for extruder that has not been used before.\n" -"Check your settings to avoid redundant color changes." -msgstr "" -"Docházà zde ke zmÄ›nÄ› barvy u extruderu, který dosud nebyl použit.\n" -"Zkontrolujte nastavenÃ, abyste se vyhnuli redundantnÃm zmÄ›nám barev." - -#: src/slic3r/GUI/DoubleSlider.cpp:1149 -msgid "" -"There is a color change for extruder that won't be used till the end of print job.\n" -"This code won't be processed during G-code generation." -msgstr "" -"Docházà zde ke zmÄ›nÄ› barvy u extruderu, který již do konce tisku nebude použit.\n" -"Tento kód nebude bÄ›hem generovánà G-kódu zpracován." - -#: src/slic3r/GUI/DoubleSlider.cpp:1152 -msgid "" -"There is an extruder change set to the same extruder.\n" -"This code won't be processed during G-code generation." -msgstr "" -"Je zde zmÄ›na extruderu na ten samý extruder.\n" -"BÄ›hem generovánà G-codu nebude tento kód zpracován." -======= #: src/slic3r/GUI/DoubleSlider.cpp:1485 msgid "" "There is a color change for extruder that won't be used till the end of " @@ -14292,7 +13575,6 @@ msgstr "" #: src/libslic3r/GCode.cpp:539 msgid "There is an object with no extrusions in the first layer." msgstr "Je zde objekt, který nemá v prvnà vrstvÄ› žádné extrudovánÃ." ->>>>>>> master #: src/libslic3r/PrintConfig.cpp:2799 msgid "Thick bridges" @@ -14303,23 +13585,6 @@ msgstr "Silné pÅ™emostÄ›nÃ" msgid "This %s version: %s" msgstr "Tento %s verze: %s" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:1244 -msgid "" -"This action is not revertable.\n" -"Do you want to proceed?" -msgstr "" -"Tato akce je nevratná.\n" -"Chcete pokraÄovat?" - -#: src/libslic3r/PrintConfig.cpp:199 -msgid "This code is inserted between objects when using sequential printing. By default extruder and bed temperature are reset using non-wait command; however if M104, M109, M140 or M190 are detected in this custom code, Slic3r will not add temperature commands. Note that you can use placeholder variables for all Slic3r settings, so you can put a \"M109 S[first_layer_temperature]\" command wherever you want." -msgstr "Tento kód je vložen mezi objekty, pokud je použit sekvenÄnà tisk. Ve výchozÃm nastavenà je resetován extruder a tisková podložka pomocà non-wait (neÄekacÃm) pÅ™Ãkazem; nicménÄ› pokud jsou pÅ™Ãkazy M104, M109, 140 nebo M190 detekovány v tomto vlastnÃm kódu, Slic3r nebude pÅ™idávat teplotnà pÅ™Ãkazy. Můžete pÅ™idávat zástupné promÄ›nné pro veÅ¡keré nastavenà Slic3ru, takže můžete vložit pÅ™Ãkaz “M109 S[first_layer_temperature]†kamkoliv chcete." - -#: src/libslic3r/PrintConfig.cpp:1174 -msgid "This custom code is inserted at every layer change, right after the Z move and before the extruder moves to the first layer point. Note that you can use placeholder variables for all Slic3r settings as well as [layer_num] and [layer_z]." -msgstr "Tento vlastnà kód je vložen pÅ™i každé zmÄ›nÄ› vrstvy, hned po pohybu Z a pÅ™edtÃm, než se extruder pÅ™esune na prvnà bod vrstvy. Můžete pÅ™idávat zástupné promÄ›nné pro veÅ¡keré nastavenà Slic3ru, stejnÄ› tak jako [layer_num] a [layer_z]." -======= #: src/slic3r/GUI/DoubleSlider.cpp:2087 src/slic3r/GUI/Tab.cpp:1322 msgid "" "This action is not revertible.\n" @@ -14327,7 +13592,6 @@ msgid "" msgstr "" "Tato akce nenà vratná.\n" "Chcete pokraÄovat?" ->>>>>>> master #: src/slic3r/GUI/DoubleSlider.cpp:2086 msgid "This action will cause deletion of all ticks on vertical slider." @@ -14504,33 +13768,6 @@ msgstr "" "Slic3r automaticky zvolà maximálnà poÄet vrstev, které se budou kombinovat " "podle průmÄ›ru trysky a výšky vrstvy." -<<<<<<< HEAD -#: src/slic3r/GUI/Plater.cpp:2319 -msgid "" -"This file contains several objects positioned at multiple heights.\n" -"Instead of considering them as multiple objects, should I consider\n" -"this file as a single object having multiple parts?" -msgstr "" -"Tento soubor obsahuje nÄ›kolik objektů umÃstÄ›ných v různých výškách. Majà být vloženy jako jeden objekt obsahujÃcà vÃce ÄástÃ,\n" -"namÃsto vloženà nÄ›kolika objektů?" - -#: src/slic3r/GUI/FirmwareDialog.cpp:332 -#, possible-c-format -msgid "" -"This firmware hex file does not match the printer model.\n" -"The hex file is intended for: %s\n" -"Printer reported: %s\n" -"\n" -"Do you want to continue and flash this hex file anyway?\n" -"Please only continue if you are sure this is the right thing to do." -msgstr "" -"Tento hex soubor s firmware neodpovÃdá modelu tiskárny.\n" -"Soubor hex je urÄen pro: %s\n" -"Tiskárna oznámila: %s\n" -"\n" -"Chcete i pÅ™esto pokraÄovat a nahrát do tiskárny hex soubor?\n" -"PokraÄujte prosÃm, pouze pokud jste si jisti, že je to správný soubor." -======= #: src/libslic3r/PrintConfig.cpp:2382 msgid "" "This feature will raise Z gradually while printing a single-walled object in " @@ -14563,7 +13800,6 @@ msgstr "" "Tento soubor obsahuje nÄ›kolik objektů umÃstÄ›ných v různých výškách.\n" "MÃsto toho, aby se s nimi pracovalo jako se separátnÃmi objekty, \n" "majà být naÄteny jako jeden objekt, který má vÃce ÄástÃ?" ->>>>>>> master #: src/slic3r/GUI/FirmwareDialog.cpp:333 #, c-format, boost-format @@ -14755,11 +13991,7 @@ msgid "" "This may cause problems in g-code visualization and printing time estimation." msgstr "Může to způsobit problémy pÅ™i vizualizaci g-codu a odhadu doby tisku." -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:928 -======= #: src/slic3r/GUI/GUI_ObjectManipulation.cpp:983 ->>>>>>> master msgid "" "This operation is irreversible.\n" "Do you want to proceed?" @@ -14932,19 +14164,6 @@ msgstr "" "celkových objemů ÄiÅ¡tÄ›nà nÞe." #: src/slic3r/GUI/UpdateDialogs.cpp:216 -<<<<<<< HEAD -#, possible-c-format -msgid "" -"This version of %s is not compatible with currently installed configuration bundles.\n" -"This probably happened as a result of running an older %s after using a newer one.\n" -"\n" -"You may either exit %s and try again with a newer version, or you may re-run the initial configuration. Doing so will create a backup snapshot of the existing configuration before installing files compatible with this %s." -msgstr "" -"Tato verze %s nenà kompatibilnà se souÄasnÄ› nainstalovanými balÃÄky nastavenÃ.\n" -"Tato situace nejspÃÅ¡e nastala spuÅ¡tÄ›nÃm starÅ¡Ã verze %s po použÃvánà novÄ›jÅ¡Ã verze.\n" -"\n" -"Můžete buÄ ukonÄit %s a zkusit to znovu s novou verzÃ, nebo můžete znovu spustit výchozà konfiguraci. PÅ™ed instalacà kompatibilnÃho nastavenà s touto verzà %s dojde k vytvoÅ™enà zálohy souÄasné konfigurace." -======= #, c-format, boost-format msgid "" "This version of %s is not compatible with currently installed configuration " @@ -14976,7 +14195,6 @@ msgstr "" "nejnovÄ›jÅ¡Ãmi verzemi PrusaSliceru. NovÄ›jÅ¡Ã verze PrusaSliceru mohou " "napÅ™Ãklad rozÅ¡ÃÅ™it seznam podporovaných druhů firmwaru. Lze se rozhodnout, " "že to budeme ignorovat, nebo že neznámou hodnotu nahradÃme výchozà hodnotou." ->>>>>>> master #: src/libslic3r/PrintConfig.cpp:3234 msgid "" @@ -15265,20 +14483,9 @@ msgstr "Typ tiskárny." msgid "Type:" msgstr "Typ:" -<<<<<<< HEAD -#: src/slic3r/GUI/OpenGLManager.cpp:275 -#, possible-c-format -msgid "" -"Unable to load the following shaders:\n" -"%s" -msgstr "" -"Nelze naÄÃst následujÃcà shadery: \n" -"%s" -======= #: src/libslic3r/SLAPrintSteps.cpp:441 msgid "Unable to drill the current configuration of holes into the model." msgstr "Nelze vyvrtat aktuálnà konfiguraci otvorů do modelu." ->>>>>>> master #: src/slic3r/GUI/OpenGLManager.cpp:273 #, c-format, boost-format @@ -15307,9 +14514,6 @@ msgstr "Nelze nahradit vÃce než jednou ÄástÃ" msgid "Undef" msgstr "Nedefinováno" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI.cpp:305 -======= #: src/slic3r/GUI/UnsavedChangesDialog.cpp:1681 msgid "Undef category" msgstr "Nedefinovaná kategorie" @@ -15319,7 +14523,6 @@ msgid "Undef group" msgstr "Nedefinovaná skupina" #: src/slic3r/GUI/GUI.cpp:292 ->>>>>>> master msgid "Undefined" msgstr "Nedefinováno" @@ -15408,21 +14611,6 @@ msgstr "PoÄáteÄnà rychlost vysouvánà filamentu" msgid "UNLOCKED LOCK" msgstr "ODEMÄŒENà ZÃMEK" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3719 -msgid "" -"UNLOCKED LOCK icon indicates that some settings were changed and are not equal to the system (or default) values for the current option group.\n" -"Click to reset all settings for current option group to the system (or default) values." -msgstr "Ikona ODEMKNUTÉHO ZÃMKU indikuje, že nÄ›která nastavenà byla zmÄ›nÄ›na a nejsou shodná se systémovými (výchozÃmi) hodnotami pro danou skupinu nastavenÃ. KliknÄ›te pro reset vÅ¡ech nastavenà aktuálnà skupiny nastavenà na systémové hodnoty." - -#: src/slic3r/GUI/Tab.cpp:3734 -msgid "" -"UNLOCKED LOCK icon indicates that the value was changed and is not equal to the system (or default) value.\n" -"Click to reset current value to the system (or default) value." -msgstr "" -"Ikona ODEMKNUTÉHO ZÃMKU indikuje, že se hodnota zmÄ›nila a nenà shodná se systémovou (nebo výchozÃ) hodnotou.\n" -"KliknÄ›te pro reset souÄasné hodnoty na systémovou hodnotu." -======= #: src/slic3r/GUI/Tab.cpp:4283 msgid "" "UNLOCKED LOCK icon indicates that some settings were changed and are not " @@ -15448,7 +14636,6 @@ msgstr "" #: src/slic3r/GUI/UnsavedChangesDialog.cpp:771 msgid "Unsaved Changes" msgstr "Neuložené zmÄ›ny" ->>>>>>> master #: src/slic3r/GUI/KBShortcutsDialog.cpp:157 msgid "Unselect gizmo or clear selection" @@ -15793,20 +14980,12 @@ msgstr "ZobrazenÃ" msgid "View mode" msgstr "Režim zobrazenÃ" -<<<<<<< HEAD -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:666 -msgid "" -"Visit \"Preferences\" and check \"%1%\"\n" -"to be asked about unsaved changes again." -msgstr "Pro zruÅ¡enà zapamatovánà jdÄ›te do Nastanevà a zaÅ¡krtnÄ›te \"%1%\"." -======= #: src/slic3r/GUI/UnsavedChangesDialog.cpp:903 #, boost-format msgid "" "Visit \"Preferences\" and check \"%1%\"\n" "to be asked about unsaved changes again." msgstr "Pro zruÅ¡enà zapamatovánà jdÄ›te do Nastavenà a zaÅ¡krtnÄ›te \"%1%\"." ->>>>>>> master #: src/slic3r/GUI/GUI_App.cpp:3076 src/slic3r/GUI/Plater.cpp:1738 #, boost-format @@ -16177,39 +15356,21 @@ msgstr "Pouzdro okolo podpÄ›r" msgid "World coordinates" msgstr "SvÄ›tové souÅ™adnice" -<<<<<<< HEAD -#: src/slic3r/GUI/UpdateDialogs.cpp:92 -msgid "" -"Would you like to install it?\n" -"\n" -"Note that a full configuration snapshot will be created first. It can then be restored at any time should there be a problem with the new version.\n" -======= #: src/slic3r/GUI/UpdateDialogs.cpp:100 msgid "" "Would you like to install it?\n" "\n" "Note that a full configuration snapshot will be created first. It can then " "be restored at any time should there be a problem with the new version.\n" ->>>>>>> master "\n" "Updated configuration bundles:" msgstr "" "PÅ™ejete si spustit instalaci?\n" "\n" -<<<<<<< HEAD -"Nejprve bude provedena kompletnà záloha nastavenÃ. V pÅ™ÃpadÄ› problémů s novou verzà ji bude možné kdykoliv obnovit.\n" -"\n" -"Aktualizované balÃÄky nastavenÃ:" - -#: src/slic3r/GUI/GUI_App.cpp:1802 -msgid "Would you like to stop uploads and close the program?" -msgstr "Chcete zastavit nahrávánà a ukonÄit program?" -======= "Nejprve bude provedena kompletnà záloha nastavenÃ. V pÅ™ÃpadÄ› problémů s " "novou verzà ji bude možné kdykoliv obnovit.\n" "\n" "Aktualizované balÃÄky nastavenÃ:" ->>>>>>> master #: src/libslic3r/miniz_extension.cpp:151 msgid "write calledback failed" @@ -16358,17 +15519,6 @@ msgid "" msgstr "" "Nemůžete použÃt nestejnomÄ›rnou zmÄ›nu měřÃtka pro vÃce vybraných objektů/ÄástÃ" -<<<<<<< HEAD -#: src/slic3r/GUI/NotificationManager.hpp:459 -msgid "" -"You have just added a G-code for color change, but its value is empty.\n" -"To export the G-code correctly, check the \"Color Change G-code\" in \"Printer Settings > Custom G-code\"" -msgstr "" -"PrávÄ› jste pÅ™idali G-code pro zmÄ›nu barvy, ale jeho obsah je prázdný.\n" -"Chcete-li exportovat G-code správnÄ›, zkontrolujte „G-code pro zmÄ›nu barvy“ v „Nastavenà tiskárny> Vlastnà G-code“" - -#: src/slic3r/GUI/SavePresetDialog.cpp:277 -======= #: src/slic3r/GUI/NotificationManager.hpp:761 msgid "" "You have just added a G-code for color change, but its value is empty.\n" @@ -16381,7 +15531,6 @@ msgstr "" #: src/slic3r/GUI/SavePresetDialog.cpp:283 #, boost-format ->>>>>>> master msgid "" "You have selected physical printer \"%1%\" \n" "with related printer preset \"%2%\"" @@ -16404,30 +15553,12 @@ msgstr "Možná budete muset aktualizovat ovladaÄ grafické karty." msgid "You must install a configuration update." msgstr "Je nutné nainstalovat aktualizaci konfigurace." -<<<<<<< HEAD -#: src/slic3r/GUI/Preferences.cpp:299 -#, possible-c-format -msgid "You need to restart %s to make the changes effective." -msgstr "Chcete-li provést zmÄ›ny, musÃte restartovat aplikaci %s." - -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:611 -msgid "You should change the name of your printer device." -msgstr "MÄ›li byste zmÄ›nit název tiskového zaÅ™ÃzenÃ." - -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:468 -msgid "You should to change a name of your printer device. It can't be saved." -msgstr "MÄ›li byste zmÄ›nit název tiskového zaÅ™ÃzenÃ. Nemůže být uloženo." - -#: src/slic3r/GUI/GUI_ObjectList.cpp:3884 -#, possible-c-format -======= #: src/slic3r/GUI/PhysicalPrinterDialog.cpp:634 msgid "You should change the name of your printer device." msgstr "MÄ›li byste zmÄ›nit název tiskového zaÅ™ÃzenÃ." #: src/slic3r/GUI/GUI_ObjectList.cpp:3644 #, c-format, boost-format ->>>>>>> master msgid "You started your selection with %s Item." msgstr "ZaÄali jste výbÄ›r s položkou %s." @@ -16524,35 +15655,11 @@ msgstr "" msgid "Z offset" msgstr "Odsazenà Z" -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigManipulation.cpp:59 -msgid "" -"Zero first layer height is not valid.\n" -"\n" -"The first layer height will be reset to 0.01." -msgstr "" -"Nulová výška prvnà vrstvy nenà platná.\n" -"\n" -"Výška prvnà vrstvy bude resetována na 0.01." - -#: src/slic3r/GUI/ConfigManipulation.cpp:47 -msgid "" -"Zero layer height is not valid.\n" -"\n" -"The layer height will be reset to 0.01." -msgstr "" -"Nulová výška vrstvy nenà platná.\n" -"\n" -"Výška vrstvy bude resetována na 0.01." - -#: src/libslic3r/PrintConfig.cpp:2831 -======= #: src/libslic3r/PrintConfig.cpp:2896 msgid "Z travel" msgstr "Posun v ose Z" #: src/libslic3r/PrintConfig.cpp:3492 ->>>>>>> master msgid "Zig-Zag" msgstr "Zig-Zag" @@ -16585,11 +15692,7 @@ msgstr "Oddálit" msgid "Zoom to Bed" msgstr "Pohled na tiskovou plochu" -<<<<<<< HEAD -#: src/slic3r/GUI/KBShortcutsDialog.cpp:176 -======= #: src/slic3r/GUI/KBShortcutsDialog.cpp:160 ->>>>>>> master msgid "" "Zoom to selected object\n" "or all objects in scene, if none selected" @@ -16597,19 +15700,11 @@ msgstr "" "Pohled na oznaÄený objekt, nebo na vÅ¡echny objekty ve scénÄ›,\n" "pokud nenà vybraný žádný objekt" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:241 src/libslic3r/PrintConfig.cpp:816 -#: src/libslic3r/PrintConfig.cpp:1748 src/libslic3r/PrintConfig.cpp:1758 -#: src/libslic3r/PrintConfig.cpp:2036 src/libslic3r/PrintConfig.cpp:2191 -#: src/libslic3r/PrintConfig.cpp:2390 src/libslic3r/PrintConfig.cpp:2891 -#: src/libslic3r/PrintConfig.cpp:3012 -======= #: src/libslic3r/PrintConfig.cpp:456 src/libslic3r/PrintConfig.cpp:1075 #: src/libslic3r/PrintConfig.cpp:2232 src/libslic3r/PrintConfig.cpp:2242 #: src/libslic3r/PrintConfig.cpp:2533 src/libslic3r/PrintConfig.cpp:2774 #: src/libslic3r/PrintConfig.cpp:2991 src/libslic3r/PrintConfig.cpp:3552 #: src/libslic3r/PrintConfig.cpp:3673 ->>>>>>> master msgid "°" msgstr "°" diff --git a/resources/localization/de/PrusaSlicer.mo b/resources/localization/de/PrusaSlicer.mo Binary files differindex 411f1f8bc..796dbe27b 100644 --- a/resources/localization/de/PrusaSlicer.mo +++ b/resources/localization/de/PrusaSlicer.mo diff --git a/resources/localization/de/PrusaSlicer_de.po b/resources/localization/de/PrusaSlicer_de.po index 829bee7c7..5c87133ee 100644 --- a/resources/localization/de/PrusaSlicer_de.po +++ b/resources/localization/de/PrusaSlicer_de.po @@ -7,26 +7,12 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Phrase (phrase.com)\n" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:4124 -======= #: src/slic3r/GUI/Tab.cpp:4707 #, boost-format ->>>>>>> master msgid "" "\"%1%\" is disabled because \"%2%\" is on in \"%3%\" category.\n" "To enable \"%1%\", please switch off \"%2%\"" msgstr "" -<<<<<<< HEAD -"\"%1%\" ist deaktiviert, weil \"%2%\" in der Kategorie \"%3%\" eingeschaltet ist.\n" -"Um \"%1%\" zu aktivieren, schalten Sie bitte \"%2%\" aus." - -#: src/libslic3r/PrintConfig.cpp:249 src/libslic3r/PrintConfig.cpp:828 -#: src/libslic3r/PrintConfig.cpp:1148 src/libslic3r/PrintConfig.cpp:1327 -#: src/libslic3r/PrintConfig.cpp:1390 src/libslic3r/PrintConfig.cpp:1640 -#: src/libslic3r/PrintConfig.cpp:2568 src/libslic3r/PrintConfig.cpp:2805 -#: src/libslic3r/PrintConfig.cpp:2931 -======= "\"%1%\" ist deaktiviert, weil \"%2%\" in der Kategorie \"%3%\" eingeschaltet " "ist.\n" "Um \"%1%\" zu aktivieren, schalten Sie bitte \"%2%\" aus." @@ -36,7 +22,6 @@ msgstr "" #: src/libslic3r/PrintConfig.cpp:1814 src/libslic3r/PrintConfig.cpp:2065 #: src/libslic3r/PrintConfig.cpp:2124 src/libslic3r/PrintConfig.cpp:3177 #: src/libslic3r/PrintConfig.cpp:3466 src/libslic3r/PrintConfig.cpp:3592 ->>>>>>> master msgid "%" msgstr "%" @@ -144,16 +129,8 @@ msgstr "%1% Voreinstellung" msgid "%1% was substituted with %2%" msgstr "%1% wurde durch %2% ersetzt" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI.cpp:330 -msgid "%1% was substituted with %2%" -msgstr "%1% wurde durch %2% ersetzt" - -#: src/slic3r/GUI/MainFrame.cpp:1585 -======= #: src/slic3r/GUI/MainFrame.cpp:1707 #, boost-format ->>>>>>> master msgid "%1% was successfully sliced." msgstr "%1% wurde erfolgreich gesliced." @@ -179,10 +156,6 @@ msgstr "%d Linien: %.2f mm" msgid "%d presets successfully imported." msgstr "%d Voreinstellungen erfolgreich importiert." -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_App.cpp:718 -#, possible-c-format -======= #: src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:304 #, c-format, boost-format msgid "%d triangles" @@ -190,7 +163,6 @@ msgstr "%d Dreiecke" #: src/slic3r/GUI/GUI_App.cpp:1126 #, c-format, boost-format ->>>>>>> master msgid "" "%s\n" "Do you want to continue?" @@ -243,23 +215,6 @@ msgstr "%s hat eine Warnmeldung" msgid "%s has encountered an error" msgstr "%s ist auf einen Fehler gestoßen" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_App.cpp:528 -#, possible-c-format -msgid "" -"%s has encountered an error. It was likely caused by running out of memory. If you are sure you have enough RAM on your system, this may also be a bug and we would be glad if you reported it.\n" -"\n" -"The application will now terminate." -msgstr "" -"%s ist auf einen Fehler gestoßen. Es wurde wahrscheinlich dadurch verursacht, dass der Speicher knapp wird. Wenn Sie sicher sind, dass Sie genügend RAM auf Ihrem System haben, kann dies auch ein Programmfehler sein, und wir würden uns freuen, wenn Sie ihn melden würden.\n" -"\n" -"Die Anwendung wird nun beendet." - -#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:62 -#, possible-c-format -msgid "%s has encountered an error. It was likely caused by running out of memory. If you are sure you have enough RAM on your system, this may also be a bug and we would be glad if you reported it." -msgstr "%s ist auf einen Fehler gestoßen. Es wurde wahrscheinlich dadurch verursacht, dass der Speicher knapp wird. Wenn Sie sicher sind, dass Sie genügend RAM auf Ihrem System haben, kann dies auch ein Programmfehler sein, und wir würden uns freuen, wenn Sie ihn melden würden." -======= #: src/slic3r/GUI/GUI_App.cpp:698 #, c-format, boost-format msgid "" @@ -287,7 +242,6 @@ msgstr "" "verursacht, dass der Speicher knapp wird. Wenn Sie sicher sind, dass Sie " "genügend RAM auf Ihrem System haben, kann dies auch ein Programmfehler sein, " "und wir würden uns freuen, wenn Sie ihn melden würden." ->>>>>>> master #: src/slic3r/GUI/UpdateDialogs.cpp:304 #, c-format, boost-format @@ -299,29 +253,6 @@ msgstr "Für %s sind keine Konfigurationsaktualisierungen verfügbar." msgid "%s incompatibility" msgstr "%s-Inkompatibilität" -<<<<<<< HEAD -#: src/slic3r/GUI/MsgDialog.cpp:114 -#, possible-c-format -msgid "%s information" -msgstr "%s Information" - -#: src/slic3r/GUI/UpdateDialogs.cpp:270 -#, possible-c-format -msgid "" -"%s now uses an updated configuration structure.\n" -"\n" -"So called 'System presets' have been introduced, which hold the built-in default settings for various printers. These System presets cannot be modified, instead, users now may create their own presets inheriting settings from one of the System presets.\n" -"An inheriting preset may either inherit a particular value from its parent or override it with a customized value.\n" -"\n" -"Please proceed with the %s that follows to set up the new presets and to choose whether to enable automatic preset updates." -msgstr "" -"%s verwendet nun eine aktualisierte Konfigurationsstruktur.\n" -"\n" -"Sogenannte 'Systemeinstellungen' wurden eingeführt; diese enthalten die eingebauten Standardeinstellungen für verschiedene Drucker. Diese Systemeinstellungen können nicht verändert werden. Stattdessen können Benutzer nun ihre eigenen Voreinstellungen erstellen, die Werte von einer der Systemeinstellungen übernehmen.\n" -"Eine übernehmende Voreinstellung kann entweder einen bestimmten Wert von ihrem Vorbild übernehmen, oder ihn mit einem eigenen Wert überschreiben.\n" -"\n" -"Bitte fahren Sie fort mit '%s'. Dies folgt nun, um die neuen Einstellungen einzurichten sowie auszuwählen, ob Einstellungen automatisch aktualisiert werden dürfen." -======= #: src/slic3r/GUI/MsgDialog.cpp:246 src/slic3r/GUI/MsgDialog.cpp:259 #, c-format, boost-format msgid "%s info" @@ -331,7 +262,6 @@ msgstr "%s Info" #, c-format, boost-format msgid "%s information" msgstr "%s Information" ->>>>>>> master #: src/slic3r/GUI/UpdateDialogs.cpp:265 #, c-format, boost-format @@ -367,27 +297,10 @@ msgstr "" msgid "%s View Mode" msgstr "%s Anzeigemodus" -<<<<<<< HEAD -#: src/slic3r/GUI/UpdateDialogs.cpp:151 -#, possible-c-format -msgid "" -"%s will now start updates. Otherwise it won't be able to start.\n" -"\n" -"Note that a full configuration snapshot will be created first. It can then be restored at any time should there be a problem with the new version.\n" -"\n" -"Updated configuration bundles:" -msgstr "" -"%s beginnt nun mit der Aktualisierung. Andernfalls kann nicht gestartet werden.\n" -"\n" -"Beachten Sie, dass zuerst ein vollständiger Konfigurations-Snapshot erstellt wird. Er kann dann jederzeit wiederhergestellt werden, falls es ein Problem mit der neuen Version geben sollte.\n" -"\n" -"Aktualisierte Konfigurations-Bundles:" -======= #: src/slic3r/GUI/MsgDialog.cpp:232 #, c-format, boost-format msgid "%s warning" msgstr "%s Warnung" ->>>>>>> master #: src/slic3r/GUI/UpdateDialogs.cpp:160 #, c-format, boost-format @@ -1282,11 +1195,7 @@ msgstr "" "Ein Objekt verfügt über benutzerdefinierte Stützverstärker, die nicht " "verwendet werden, weil Stützen deaktiviert sind." -<<<<<<< HEAD -#: src/slic3r/GUI/GLCanvas3D.cpp:638 -======= #: src/slic3r/GUI/GLCanvas3D.cpp:6372 ->>>>>>> master msgid "" "An object outside the print area was detected.\n" "Resolve the current problem to continue slicing." @@ -1365,13 +1274,6 @@ msgstr "Archiv ist zu groß" msgid "Are you sure you want to %1% the selected preset?" msgstr "Sind Sie sicher, dass Sie die gewählte Voreinstellung %1% möchten?" -<<<<<<< HEAD -#: src/slic3r/GUI/FirmwareDialog.cpp:902 -msgid "" -"Are you sure you want to cancel firmware flashing?\n" -"This could leave your printer in an unusable state!" -msgstr "Sind Sie sicher, dass Sie das Flashen der Firmware abbrechen wollen? Dies könnte Ihren Drucker in einen unbrauchbaren Zustand versetzen!" -======= #: src/slic3r/GUI/FirmwareDialog.cpp:915 msgid "" "Are you sure you want to cancel firmware flashing?\n" @@ -1379,7 +1281,6 @@ msgid "" msgstr "" "Sind Sie sicher, dass Sie das Flashen der Firmware abbrechen wollen? Dies " "könnte Ihren Drucker in einen unbrauchbaren Zustand versetzen!" ->>>>>>> master #: src/slic3r/GUI/DoubleSlider.cpp:2518 src/slic3r/GUI/DoubleSlider.cpp:2539 msgid "Are you sure you want to continue?" @@ -1619,21 +1520,6 @@ msgstr "Kreuzen von Perimetern Vermeiden - Maximale Umleitungslänge" msgid "BACK ARROW" msgstr "PFEIL ZURÃœCK" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3727 -msgid "" -"BACK ARROW icon indicates that the settings were changed and are not equal to the last saved preset for the current option group.\n" -"Click to reset all settings for the current option group to the last saved preset." -msgstr "Das Symbol PFEIL ZURÃœCK zeigt an, dass die Einstellungen geändert wurden und nicht mit dem zuletzt gespeicherten Preset für die aktuelle Optionsgruppe übereinstimmen. Klicken Sie hier, um alle Einstellungen für die aktuelle Optionsgruppe auf das zuletzt gespeicherte Preset zurückzusetzen." - -#: src/slic3r/GUI/Tab.cpp:3741 -msgid "" -"BACK ARROW icon indicates that the value was changed and is not equal to the last saved preset.\n" -"Click to reset current value to the last saved preset." -msgstr "" -"Das Symbol PFEIL ZURÃœCK zeigt an, dass der Wert geändert wurde und nicht mit dem zuletzt gespeicherten Preset übereinstimmt. \n" -"Klicken Sie, um den aktuellen Wert auf das zuletzt gespeicherte Preset zurückzusetzen." -======= #: src/slic3r/GUI/Tab.cpp:4291 msgid "" "BACK ARROW icon indicates that the settings were changed and are not equal " @@ -1656,7 +1542,6 @@ msgstr "" "dem zuletzt gespeicherten Preset übereinstimmt. \n" "Klicken Sie, um den aktuellen Wert auf das zuletzt gespeicherte Preset " "zurückzusetzen." ->>>>>>> master #: src/slic3r/GUI/Preferences.cpp:137 msgid "Background processing" @@ -1917,14 +1802,6 @@ msgstr "Eimerfüllung" msgid "buffer too small" msgstr "Puffer zu klein" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_App.cpp:1152 -msgid "" -"But since this version of PrusaSlicer we don't show this information in Printer Settings anymore.\n" -"Settings will be available in physical printers settings." -msgstr "" -"Seit dieser Version von PrusaSlicer zeigen wir diese Informationen nicht mehr in den Druckereinstellungen an.\n" -======= #: src/slic3r/GUI/GUI_App.cpp:1660 msgid "" "But since this version of PrusaSlicer we don't show this information in " @@ -1933,22 +1810,12 @@ msgid "" msgstr "" "Seit dieser Version von PrusaSlicer zeigen wir diese Informationen nicht " "mehr in den Druckereinstellungen an.\n" ->>>>>>> master "Die Einstellungen sind in den Einstellungen für physische Drucker verfügbar." #: src/slic3r/GUI/ButtonsDescription.cpp:62 msgid "Buttons And Text Colors Description" msgstr "Schaltflächen und Textfarben Beschreibung" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_App.cpp:1084 -msgid "" -"By default new Printer devices will be named as \"Printer N\" during its creation.\n" -"Note: This name can be changed later from the physical printers settings" -msgstr "" -"Standardmäßig werden neue Drucker bei ihrer Erstellung als \"Drucker N\" bezeichnet.\n" -"Hinweis: Dieser Name kann später über die Einstellungen für physische Drucker geändert werden." -======= #: src/slic3r/GUI/GUI_App.cpp:1662 msgid "" "By default new Printer devices will be named as \"Printer N\" during its " @@ -1959,7 +1826,6 @@ msgstr "" "bezeichnet.\n" "Hinweis: Dieser Name kann später über die Einstellungen für physische " "Drucker geändert werden." ->>>>>>> master #: src/slic3r/GUI/PresetHints.cpp:191 msgid "by the print profile maximum" @@ -2029,46 +1895,22 @@ msgstr "" "Kann die Extrusionsbreite für %1% nicht berechnen: Variable \"%2%\" nicht " "zugänglich." -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_ObjectList.cpp:3400 -======= #: src/slic3r/GUI/GUI_ObjectList.cpp:3113 ->>>>>>> master msgid "" "Cannot insert a new layer range after the current layer range.\n" "Current layer range overlaps with the next layer range." msgstr "" -<<<<<<< HEAD -"Es kann kein neuer Schichtenbereich nach dem aktuellen Schichtenbereich eingefügt werden.\n" -"Der aktuelle Schichtenbereich überschneidet sich mit dem nächsten Schichtenbereich." - -#: src/slic3r/GUI/GUI_ObjectList.cpp:3391 -======= "Es kann kein neuer Schichtenbereich nach dem aktuellen Schichtenbereich " "eingefügt werden.\n" "Der aktuelle Schichtenbereich überschneidet sich mit dem nächsten " "Schichtenbereich." #: src/slic3r/GUI/GUI_ObjectList.cpp:3104 ->>>>>>> master 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 "" -<<<<<<< HEAD -"Es kann kein neuer Schichtenbereich nach dem aktuellen Schichtenbereich eingefügt werden.\n" -"Der nächste Schichtenbereich ist zu schmal, um auf zwei Schichten aufgeteilt zu werden ohne die Mindestschichthöhe zu verletzen." - -#: src/slic3r/GUI/GUI_ObjectList.cpp:3395 -msgid "" -"Cannot insert a new layer range between the current and the next layer range.\n" -"The gap between the current layer range and the next layer range\n" -"is thinner than the minimum layer height allowed." -msgstr "" -"Es kann kein neuer Schichtenbereich zwischen dem aktuellen und dem nächsten Schichtenbereich eingefügt werden.\n" -"Die Lücke zwischen dem aktuellen und dem nächsten Schichtenbereich ist ist schmaler als die minimal zulässige Schichthöhe." -======= "Es kann kein neuer Schichtenbereich nach dem aktuellen Schichtenbereich " "eingefügt werden.\n" "Der nächste Schichtenbereich ist zu schmal, um auf zwei Schichten aufgeteilt " @@ -2085,7 +1927,6 @@ msgstr "" "Schichtenbereich eingefügt werden.\n" "Die Lücke zwischen dem aktuellen und dem nächsten Schichtenbereich ist ist " "schmaler als die minimal zulässige Schichthöhe." ->>>>>>> master #: src/slic3r/GUI/SavePresetDialog.cpp:122 msgid "Cannot overwrite a system profile." @@ -2512,17 +2353,6 @@ msgstr "&Konfigurations-Assistent" msgid "Configuration Assistant" msgstr "Konfigurations-Assistent" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI.cpp:368 -msgid "Configuration bundle was loaded, however some configuration values were not recognized." -msgstr "Konfigurations-Bundle wurde geladen, jedoch wurden einige Konfigurationswerte nicht erkannt." - -#: src/slic3r/GUI/GUI.cpp:378 -msgid "Configuration file \"%1%\" was loaded, however some configuration values were not recognized." -msgstr "Konfigurationsdatei \"%1%\" wurde geladen, jedoch wurden einige Konfigurationswerte nicht erkannt." - -#: src/libslic3r/PrintConfig.cpp:1424 -======= #: src/slic3r/GUI/GUI.cpp:355 msgid "" "Configuration bundle was loaded, however some configuration values were not " @@ -2549,7 +2379,6 @@ msgid "Configuration is editing from ConfigWizard" msgstr "Die Konfiguration wird vom ConfigWizard aus bearbeitet" #: src/libslic3r/PrintConfig.cpp:1848 ->>>>>>> master msgid "Configuration notes" msgstr "Konfigurationsnotizen" @@ -2686,23 +2515,6 @@ msgstr "Verbindung zum Prusa SL1 / SL1S funktioniert einwandfrei." msgid "Connection to PrusaLink works correctly." msgstr "Die Verbindung zu PrusaLink funktioniert einwandfrei." -<<<<<<< HEAD -#: src/slic3r/Utils/OctoPrint.cpp:185 -msgid "Connection to Prusa SL1 / SL1S works correctly." -msgstr "Verbindung zum Prusa SL1 / SL1S funktioniert einwandfrei." - -#: src/slic3r/Utils/OctoPrint.cpp:185 -msgid "Connection to Prusa SL1 works correctly." -msgstr "Verbindung zum Prusa SL1 funktioniert einwandfrei." - -#: src/slic3r/Utils/OctoPrint.cpp:229 -msgid "Connection to PrusaLink works correctly." -msgstr "Die Verbindung zu PrusaLink funktioniert einwandfrei." - -#: src/libslic3r/PrintConfig.cpp:2051 -msgid "Contact Z distance" -msgstr "Kontakt Z-Abstand" -======= #: src/slic3r/Utils/Repetier.cpp:84 msgid "Connection to Repetier works correctly." msgstr "Die Verbindung zu Repetier funktioniert korrekt." @@ -2710,7 +2522,6 @@ msgstr "Die Verbindung zu Repetier funktioniert korrekt." #: src/slic3r/GUI/DoubleSlider.cpp:1458 msgid "continue" msgstr "weiter" ->>>>>>> master #: src/slic3r/Config/Snapshot.cpp:601 msgid "Continue" @@ -2814,45 +2625,6 @@ msgstr "Zu Zwischenablage kopieren" msgid "Copy Version Info" msgstr "Versionsinfo kopieren" -<<<<<<< HEAD -#: src/slic3r/Utils/PresetUpdater.cpp:84 -msgid "" -"Copying of file %1% to %2% failed.\n" -"Error message : %3%\n" -"Copying was triggered by function: %4%" -msgstr "" -"Das Kopieren der Datei %1% nach %2% ist fehlgeschlagen.\n" -"Fehlermeldung : %3%\n" -"Kopieren wurde ausgelöst durch Funktion: %4%" - -#: src/slic3r/Utils/PresetUpdater.cpp:91 -msgid "" -"Copying of file %1% to %2% failed. Permissions fail at target file after copying.\n" -"Error message : %3%\n" -"Copying was triggered by function: %4%" -msgstr "" -"Kopieren der Datei %1% nach %2% fehlgeschlagen. Berechtigungsfehler der Zieldatei nach dem Kopieren.\n" -"Fehlermeldung : %3%\n" -" Dieser Fehler wurde ausgelöst durch Funktion: %4%" - -#: src/slic3r/Utils/PresetUpdater.cpp:70 -msgid "" -"Copying of file %1% to %2% failed. Permissions fail at target file before copying.\n" -"Error message : %3%\n" -"This error happend during %4% phase." -msgstr "" -"Kopieren der Datei %1% nach %2% fehlgeschlagen. Berechtigungsfehler der Zieldatei vor dem Kopieren.\n" -"Fehlermeldung : %3%\n" -"Dieser Fehler trat während der Phase %4% auf." - -#: src/slic3r/Utils/PresetUpdater.cpp:65 -msgid "Copying of file %1% to %2% failed: %3%" -msgstr "Kopieren der Datei %1% nach %2% fehlgeschlagen: %3%" - -#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:156 -msgid "Copying of the temporary G-code has finished but the exported code couldn't be opened during copy check. The output G-code is at %1%.tmp." -msgstr "Das Kopieren des temporären G-Codes ist abgeschlossen, aber der exportierte Code konnte während der Kopierprüfung nicht geöffnet werden. Der Ausgabe-G-Code liegt in %1%.tmp." -======= #: src/slic3r/Utils/PresetUpdater.cpp:61 #, boost-format msgid "Copying of file %1% to %2% failed: %3%" @@ -2867,7 +2639,6 @@ msgstr "" "Das Kopieren des temporären G-Codes ist abgeschlossen, aber der exportierte " "Code konnte während der Kopierprüfung nicht geöffnet werden. Der Ausgabe-G-" "Code liegt in %1%.tmp." ->>>>>>> master #: src/slic3r/GUI/BackgroundSlicingProcess.cpp:704 #, boost-format @@ -2884,14 +2655,6 @@ msgid "Copying of the temporary G-code to the output G-code failed" msgstr "" "Das Kopieren des temporären G-Codes auf den Ausgabe-G-Code ist fehlgeschlagen" -<<<<<<< HEAD -#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:163 -msgid "" -"Copying of the temporary G-code to the output G-code failed. Maybe the SD card is write locked?\n" -"Error message: %1%" -msgstr "" -"Das Kopieren des temporären G-Codes auf den Ausgabe-G-Code ist fehlgeschlagen. Vielleicht ist die SD-Karte schreibgeschützt?\n" -======= #: src/slic3r/GUI/BackgroundSlicingProcess.cpp:695 #, boost-format msgid "" @@ -2901,7 +2664,6 @@ msgid "" msgstr "" "Das Kopieren des temporären G-Codes auf den Ausgabe-G-Code ist " "fehlgeschlagen. Vielleicht ist die SD-Karte schreibgeschützt?\n" ->>>>>>> master "Fehlermeldung: %1%" #: src/slic3r/GUI/BackgroundSlicingProcess.cpp:698 @@ -2975,12 +2737,6 @@ msgstr "Ich konnte keine Verbindung zu OctoPrint herstellen" msgid "Could not connect to Prusa SLA" msgstr "Ich konnte keine Verbindung zum Prusa SLA herstellen" -<<<<<<< HEAD -#: src/slic3r/Utils/OctoPrint.cpp:235 -msgid "Could not connect to PrusaLink" -msgstr "Konnte keine Verbindung zu PrusaLink herstellen." - -======= #: src/slic3r/Utils/OctoPrint.cpp:342 msgid "Could not connect to PrusaLink" msgstr "Konnte keine Verbindung zu PrusaLink herstellen." @@ -2989,7 +2745,6 @@ msgstr "Konnte keine Verbindung zu PrusaLink herstellen." msgid "Could not connect to Repetier" msgstr "Keine Verbindung zu Repetier möglich" ->>>>>>> master #: src/slic3r/Utils/Http.cpp:73 msgid "" "Could not detect system SSL certificate store. PrusaSlicer will be unable to " @@ -3755,22 +3510,9 @@ msgstr "" "Wählen Sie JA, wenn Sie diesen Wert auf %s%% ändern möchten, \n" "oder NEIN, wenn Sie sicher sind, dass %s %s ein korrekter Wert ist." -<<<<<<< HEAD -#: src/slic3r/GUI/Field.cpp:288 -#, possible-c-format -msgid "" -"Do you mean %s%% instead of %s %s?\n" -"Select YES if you want to change this value to %s%%, \n" -"or NO if you are sure that %s %s is a correct value." -msgstr "" -"Meinen Sie%s anstelle von %s %s?\n" -"Wählen Sie JA, wenn Sie diesen Wert auf %s%% ändern möchten, \n" -"oder NEIN, wenn Sie sicher sind, dass %s %s ein korrekter Wert ist." -======= #: src/slic3r/GUI/ConfigWizard.cpp:2625 msgid "Do you want to continue changing the configuration?" msgstr "Möchten Sie die Konfiguration weiter ändern?" ->>>>>>> master #: src/slic3r/GUI/DoubleSlider.cpp:2535 msgid "Do you want to delete all saved tool changes?" @@ -3810,13 +3552,6 @@ msgstr "enthält keinen gültigen G-Code." msgid "Don't arrange" msgstr "Nicht Anordnen" -<<<<<<< HEAD -# Don't install -msgid "Don't install" -msgstr "Nicht installieren" - -#: src/slic3r/GUI/UpdateDialogs.cpp:71 -======= #: src/slic3r/GUI/GUI_App.cpp:974 msgid "Don't import" msgstr "Nicht Importieren" @@ -3826,7 +3561,6 @@ msgid "Don't install" msgstr "Nicht installieren" #: src/slic3r/GUI/UpdateDialogs.cpp:72 ->>>>>>> master msgid "Don't notify about new releases any more" msgstr "Keine Benachrichtigung mehr über neue Releases" @@ -4772,13 +4506,6 @@ msgstr "Ausblendende Schichten" msgid "failed finding central directory" msgstr "Zentrales Verzeichnis nicht gefunden" -<<<<<<< HEAD -#: src/slic3r/GUI/Plater.cpp:2399 -msgid "Failed loading file \"%1%\" due to an invalid configuration." -msgstr "Das Laden der Datei \"%1%\" ist aufgrund einer ungültigen Konfiguration fehlgeschlagen." - -#: src/slic3r/Utils/FixModelByWin10.cpp:235 -======= #: src/slic3r/GUI/Plater.cpp:2516 #, boost-format msgid "Failed loading file \"%1%\" due to an invalid configuration." @@ -4787,7 +4514,6 @@ msgstr "" "fehlgeschlagen." #: src/slic3r/Utils/FixModelByWin10.cpp:237 ->>>>>>> master msgid "Failed loading the input model." msgstr "Das Laden des Inputmodells ist fehlgeschlagen." @@ -5291,25 +5017,11 @@ msgid "For support enforcers only" msgstr "Nur für Stützverstärker" #. TRN Description for "WHITE BULLET" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3702 -======= #: src/slic3r/GUI/Tab.cpp:4266 ->>>>>>> master msgid "" "for the left button: indicates a non-system (or non-default) preset,\n" "for the right button: indicates that the settings hasn't been modified." msgstr "" -<<<<<<< HEAD -"Beim linken Knopf: zeigt eine Nicht-System- (oder Nicht-Standard-) Einstellung an.\n" -"Beim rechten Knopf: zeigt an, dass die Einstellung nicht geändert wurde." - -#: src/slic3r/GUI/ConfigManipulation.cpp:135 -msgid "" -"For the Wipe Tower to work with the soluble supports, the support layers\n" -"need to be synchronized with the object layers." -msgstr "Damit der Reinigungsturm mit den löslichen Trägermaterialien arbeiten kann, müssen die Stützschichten mit den Objektschichten synchronisiert sein." -======= "Beim linken Knopf: zeigt eine Nicht-System- (oder Nicht-Standard-) " "Einstellung an.\n" "Beim rechten Knopf: zeigt an, dass die Einstellung nicht geändert wurde." @@ -5321,7 +5033,6 @@ msgid "" msgstr "" "Damit der Reinigungsturm mit den löslichen Trägermaterialien arbeiten kann, " "müssen die Stützschichten mit den Objektschichten synchronisiert sein." ->>>>>>> master #: src/libslic3r/Print.cpp:594 msgid "" @@ -5452,21 +5163,13 @@ msgstr "g" msgid "G-code" msgstr "G-Code" -<<<<<<< HEAD -#: src/slic3r/GUI/DoubleSlider.cpp:1146 -======= #: src/slic3r/GUI/DoubleSlider.cpp:1482 ->>>>>>> master msgid "" "G-code associated to this tick mark is in a conflict with print mode.\n" "Editing it will cause changes of Slider data." msgstr "" -<<<<<<< HEAD -"Der mit diesem Häkchen verbundene G-Code steht in Konflikt mit dem Druckmodus.\n" -======= "Der mit diesem Häkchen verbundene G-Code steht in Konflikt mit dem " "Druckmodus.\n" ->>>>>>> master "Seine Bearbeitung führt zu Änderungen der Slicer-Daten." #: src/slic3r/GUI/BackgroundSlicingProcess.cpp:715 @@ -5936,21 +5639,13 @@ msgstr "Hostname" msgid "Hostname, IP or URL" msgstr "Hostname, IP oder URL" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:210 -======= #: src/slic3r/GUI/Tab.cpp:223 ->>>>>>> master msgid "" "Hover the cursor over buttons to find more information \n" "or click this button." msgstr "" -<<<<<<< HEAD -"Bewegen Sie den Mauszeiger über die Schaltflächen, um weitere Informationen zu erhalten,\n" -======= "Bewegen Sie den Mauszeiger über die Schaltflächen, um weitere Informationen " "zu erhalten,\n" ->>>>>>> master "oder klicken Sie auf diese Schaltfläche." #: src/libslic3r/PrintConfig.cpp:3637 @@ -6058,15 +5753,6 @@ msgid "If enabled, a repetition of the next random color will be allowed." msgstr "" "Wenn aktiviert, wird eine Wiederholung der nächsten Zufallsfarbe zugelassen." -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigWizard.cpp:1164 -msgid "" -"If enabled, allows the Reload from disk command to automatically find and load the files when invoked.\n" -"If not enabled, the Reload from disk command will ask to select each file using an open file dialog." -msgstr "" -"Wenn diese Option aktiviert ist, ermöglicht der Befehl Von Festplatte neu laden das automatische Suchen und Laden der Dateien, wenn er aufgerufen wird.\n" -"Wenn nicht aktiviert, fordert der Befehl Von der Festplatte neu laden jede Datei über ein Dialogfeld zum Öffnen von Dateien zur Auswahl auf." -======= #: src/libslic3r/PrintConfig.cpp:2466 msgid "" "If enabled, all printing extruders will be primed at the front edge of the " @@ -6074,7 +5760,6 @@ msgid "" msgstr "" "Wenn aktiviert, werden alle Druckextruder zu Beginn des Druckvorgangs an der " "Vorderkante des Druckbetts geprimt." ->>>>>>> master #: src/slic3r/GUI/ConfigWizard.cpp:1250 msgid "" @@ -6583,19 +6268,9 @@ msgstr "Import einer reparierten 3MF Datei fehlgeschlagen" msgid "Import profile only" msgstr "Nur Profil importieren" -<<<<<<< HEAD -#: src/slic3r/GUI/MainFrame.cpp:1000 -msgid "Import SL1 / SL1S archive" -msgstr "Import SL1 / SL1S Archiv" - -#: src/slic3r/GUI/MainFrame.cpp:1050 -msgid "Import SL1 archive" -msgstr "SL1-Archiv importieren" -======= #: src/slic3r/GUI/MainFrame.cpp:1209 msgid "Import SL1 / SL1S Archive" msgstr "Import SL1 / SL1S Archiv" ->>>>>>> master #: src/slic3r/GUI/Plater.cpp:1684 msgid "Import SLA archive" @@ -6671,15 +6346,6 @@ msgid "Increase/decrease edit area" msgstr "Bearbeitungsbereich vergrößern/verkleinern" #. TRN Description for "UNLOCKED LOCK" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3695 -msgid "" -"indicates that some settings were changed and are not equal to the system (or default) values for the current option group.\n" -"Click the UNLOCKED LOCK icon to reset all settings for current option group to the system (or default) values." -msgstr "" -"zeigt an, dass einige Einstellungen geändert wurden und nicht mit den System- (oder Standard-) Werten für die aktuelle Optionsgruppe übereinstimmen.\n" -"Klicken Sie auf das Symbol GEÖFFNETES SCHLOSS, um alle Einstellungen für die aktuelle Optionsgruppe auf die System- (oder Standard-) Werte zurückzusetzen." -======= #: src/slic3r/GUI/Tab.cpp:4259 msgid "" "indicates that some settings were changed and are not equal to the system " @@ -6692,7 +6358,6 @@ msgstr "" "übereinstimmen.\n" "Klicken Sie auf das Symbol GEÖFFNETES SCHLOSS, um alle Einstellungen für die " "aktuelle Optionsgruppe auf die System- (oder Standard-) Werte zurückzusetzen." ->>>>>>> master #. TRN Description for "LOCKED LOCK" #: src/slic3r/GUI/Tab.cpp:4255 @@ -6704,27 +6369,6 @@ msgstr "" "die aktuelle Optionsgruppe übereinstimmen" #. TRN Description for "BACK ARROW" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3707 -msgid "" -"indicates that the settings were changed and are not equal to the last saved preset for the current option group.\n" -"Click the BACK ARROW icon to reset all settings for the current option group to the last saved preset." -msgstr "" -"zeigt an, dass die Einstellungen geändert wurden und nicht mit dem zuletzt gespeicherten Preset für die aktuelle Optionsgruppe übereinstimmen.\n" -"Klicken Sie auf das Symbol PFEIL ZURÃœCK, um alle Einstellungen für die aktuelle Optionsgruppe auf das zuletzt gespeicherte Preset zurückzusetzen." - -#: src/slic3r/GUI/ConfigManipulation.cpp:210 -#: src/slic3r/GUI/GUI_ObjectList.cpp:35 src/slic3r/GUI/GUI_ObjectList.cpp:93 -#: src/slic3r/GUI/GUI_ObjectList.cpp:652 src/slic3r/GUI/Plater.cpp:393 -#: src/slic3r/GUI/Tab.cpp:1413 src/slic3r/GUI/Tab.cpp:1414 -#: src/libslic3r/PrintConfig.cpp:237 src/libslic3r/PrintConfig.cpp:450 -#: src/libslic3r/PrintConfig.cpp:472 src/libslic3r/PrintConfig.cpp:812 -#: src/libslic3r/PrintConfig.cpp:826 src/libslic3r/PrintConfig.cpp:863 -#: src/libslic3r/PrintConfig.cpp:1025 src/libslic3r/PrintConfig.cpp:1035 -#: src/libslic3r/PrintConfig.cpp:1053 src/libslic3r/PrintConfig.cpp:1072 -#: src/libslic3r/PrintConfig.cpp:1091 src/libslic3r/PrintConfig.cpp:1843 -#: src/libslic3r/PrintConfig.cpp:1860 -======= #: src/slic3r/GUI/Tab.cpp:4271 msgid "" "indicates that the settings were changed and are not equal to the last saved " @@ -6747,7 +6391,6 @@ msgstr "" #: src/libslic3r/PrintConfig.cpp:1385 src/libslic3r/PrintConfig.cpp:1454 #: src/libslic3r/PrintConfig.cpp:1474 src/libslic3r/PrintConfig.cpp:1493 #: src/libslic3r/PrintConfig.cpp:2314 src/libslic3r/PrintConfig.cpp:2331 ->>>>>>> master msgid "Infill" msgstr "Infill" @@ -6796,20 +6439,9 @@ msgstr "Anfang-Belichtungszeit" msgid "Initial layer height" msgstr "Anfangsschichthöhe" -<<<<<<< HEAD -#: src/slic3r/GUI/Field.cpp:269 -#, possible-c-format -msgid "" -"Input value is out of range\n" -"Are you sure that %s is a correct value and that you want to continue?" -msgstr "" -"Eingabewert liegt außerhalb des Bereichs\n" -"Sind Sie sicher, dass %s ein korrekter Wert ist und Sie fortfahren möchten?" -======= #: src/libslic3r/PrintConfig.cpp:514 msgid "Inner brim only" msgstr "Nur innerer Rand" ->>>>>>> master #: src/slic3r/GUI/Field.cpp:266 #, c-format, boost-format @@ -6864,19 +6496,9 @@ msgstr "Inspiziere / aktiviere Konfigurations-Momentaufnahmen" msgid "Install" msgstr "Installation" -<<<<<<< HEAD -#: src/slic3r/GUI/UpdateDialogs.cpp:136 -msgid "Install" -msgstr "Installation" - -#: src/slic3r/GUI/ObjectDataViewModel.cpp:62 -#: src/slic3r/GUI/ObjectDataViewModel.cpp:218 -#, possible-c-format -======= #: src/slic3r/GUI/ObjectDataViewModel.cpp:98 #: src/slic3r/GUI/ObjectDataViewModel.cpp:266 #, c-format, boost-format ->>>>>>> master msgid "Instance %d" msgstr "Kopie %d" @@ -7069,13 +6691,8 @@ msgstr "Jitter" msgid "Jump to height" msgstr "Zur Höhe wechseln" -<<<<<<< HEAD -#: src/slic3r/GUI/DoubleSlider.cpp:1223 -#, possible-c-format -======= #: src/slic3r/GUI/DoubleSlider.cpp:1391 #, c-format, boost-format ->>>>>>> master msgid "" "Jump to height %s\n" "or Set ruler mode" @@ -7083,13 +6700,8 @@ msgstr "" "Auf Höhe %s springen\n" "oder Linealmodus einstellen" -<<<<<<< HEAD -#: src/slic3r/GUI/DoubleSlider.cpp:1220 -#, possible-c-format -======= #: src/slic3r/GUI/DoubleSlider.cpp:1388 #, c-format, boost-format ->>>>>>> master msgid "" "Jump to height %s\n" "Set ruler mode\n" @@ -7337,19 +6949,9 @@ msgstr "Lade ein Modell" msgid "Load an model saved with imperial units" msgstr "Laden eines mit imperialen Einheiten gespeicherten Modells" -<<<<<<< HEAD -#: src/slic3r/GUI/MainFrame.cpp:1000 -msgid "Load an SL1 / Sl1S archive" -msgstr "Laden eines SL1 / SL1S Archiv" - -#: src/slic3r/GUI/MainFrame.cpp:1058 -msgid "Load an SL1 archive" -msgstr "SL1-Archiv laden" -======= #: src/slic3r/GUI/MainFrame.cpp:1209 msgid "Load an SL1 / Sl1S archive" msgstr "Laden eines SL1 / SL1S Archiv" ->>>>>>> master #: src/libslic3r/PrintConfig.cpp:4454 msgid "" @@ -8276,13 +7878,6 @@ msgstr "Monotonisch" msgid "More" msgstr "Mehr" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI.cpp:339 -msgid "Most likely the configuration was produced by a newer version of PrusaSlicer or by some PrusaSlicer fork." -msgstr "Höchstwahrscheinlich wurde die Konfiguration von einer neueren Version des PrusaSlicer oder von einem PrusaSlicer-Ableger erzeugt." - -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1219 -======= #: src/slic3r/GUI/GUI.cpp:326 msgid "" "Most likely the configuration was produced by a newer version of PrusaSlicer " @@ -8292,7 +7887,6 @@ msgstr "" "PrusaSlicer oder von einem PrusaSlicer-Ableger erzeugt." #: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1224 ->>>>>>> master msgid "Mouse wheel" msgstr "Mausrad" @@ -8397,11 +7991,7 @@ msgstr "" msgid "Multiple Extruders" msgstr "Mehrere Extruder" -<<<<<<< HEAD -#: src/slic3r/GUI/Plater.cpp:2372 -======= #: src/slic3r/GUI/Plater.cpp:2648 ->>>>>>> master msgid "" "Multiple objects were loaded for a multi-material printer.\n" "Instead of considering them as multiple objects, should I consider\n" @@ -8503,20 +8093,10 @@ msgstr "Neues Projekt" msgid "New project, clear plater" msgstr "Neues Projekt, Druckplatte leeren" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI.cpp:304 -msgid "new unknown value %1% was changed to default value %2%" -msgstr "neuer unbekannter Wert %1% wurde auf Standardwert %2% geändert" - -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:609 -msgid "New Value" -msgstr "Neuer Wert" -======= #: src/slic3r/GUI/GUI_App.cpp:1203 #, boost-format msgid "New release version %1% is available." msgstr "Die neue Release-Version %1% ist verfügbar." ->>>>>>> master #: src/slic3r/GUI/UnsavedChangesDialog.cpp:832 msgid "New Value" @@ -8623,29 +8203,6 @@ msgstr "Nicht gefunden:" msgid "Note" msgstr "Hinweis" -<<<<<<< HEAD -#: src/slic3r/GUI/MsgDialog.cpp:114 -msgid "Note that" -msgstr "Beachten Sie, dass" - -#: src/slic3r/GUI/Tab.cpp:3408 -msgid "Note, that selected preset will be deleted from this/those printer(s) too." -msgstr "Beachten Sie, dass die ausgewählte Voreinstellung auch von diesem/diesen Drucker(n) gelöscht wird." - -#: src/slic3r/GUI/Tab.cpp:3416 -msgid "Note, that this/those printer(s) will be deleted after deleting of the selected preset." -msgstr "Beachten Sie, dass dieser/diese Drucker nach dem Löschen der ausgewählten Voreinstellung gelöscht werden." - -#: src/slic3r/GUI/Tab.cpp:2039 -msgid "" -"Note: All parameters from this group are moved to the Physical Printer settings (see changelog).\n" -"\n" -"A new Physical Printer profile is created by clicking on the \"cog\" icon right of the Printer profiles combo box, by selecting the \"Add physical printer\" item in the Printer combo box. The Physical Printer profile editor opens also when clicking on the \"cog\" icon in the Printer settings tab. The Physical Printer profiles are being stored into PrusaSlicer/physical_printer directory." -msgstr "" -"Hinweis: Alle Parameter aus dieser Gruppe werden in die Einstellungen des physischen Druckers verschoben (siehe Changelog).\n" -"\n" -"Ein neues physisches Druckerprofil wird erstellt, indem man auf das \"Zahnrad\"-Symbol rechts vom Auswahlfeld \"Druckerprofile\" klickt, indem man den Punkt \"Physischen Drucker hinzufügen\" im Auswahlfeld \"Drucker\" auswählt. Der Profil-Editor für physische Drucker wird auch durch Klicken auf das \"Zahnrad\"-Symbol in der Registerkarte \"Druckereinstellungen\" geöffnet. Die Profile des physischen Druckers werden im Verzeichnis PrusaSlicer/physical_printer gespeichert." -======= #: src/slic3r/GUI/Tab.cpp:3716 msgid "Note, that the selected preset will be deleted from this printer too." msgid_plural "" @@ -8695,7 +8252,6 @@ msgstr "" "\"Zahnrad\"-Symbol in der Registerkarte \"Druckereinstellungen\" geöffnet. " "Die Profile des physischen Druckers werden im Verzeichnis PrusaSlicer/" "physical_printer gespeichert." ->>>>>>> master #: src/slic3r/Utils/AstroBox.cpp:92 msgid "Note: AstroBox version at least 1.1.0 is required." @@ -9176,13 +8732,6 @@ msgstr "Download-Seite für die Prusa3D-Treiber in Ihrem Browser öffnen" msgid "Open the software releases page in your browser" msgstr "Seite mit Programmversionen in Ihrem Browser öffnen" -<<<<<<< HEAD -#: src/slic3r/GUI/UpdateDialogs.cpp:89 -msgid "Opening Configuration Wizard" -msgstr "Öffne Konfigurationsassistent" - -#: src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp:220 src/slic3r/GUI/Plater.cpp:3961 -======= #: src/slic3r/GUI/UpdateDialogs.cpp:94 msgid "Opening Configuration Wizard" msgstr "Öffne Konfigurationsassistent" @@ -9222,7 +8771,6 @@ msgstr "" "für die Berührung des Druckbetts zu finden, wenn keine Höhe eingestellt ist." #: src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp:505 ->>>>>>> master msgid "Optimize orientation" msgstr "Optimiere Ausrichtung" @@ -9697,15 +9245,6 @@ msgstr "Physische Drucker" msgid "Pick another vendor supported by %s" msgstr "Wählen Sie einen anderen Hersteller, der von %s unterstützt wird" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:67 -msgid "Picture sizes to be stored into a .gcode and .sl1 / .sl1s files, in the following format: \"XxY, XxY, ...\"" -msgstr "Bildgrößen, die in einer .gcode und .sl1 / .sl1s Datei gespeichert werden sollen, im folgenden Format: \"XxY, XxY, ...\"" - -#: src/libslic3r/PrintConfig.cpp:67 -msgid "Picture sizes to be stored into a .gcode and .sl1 files, in the following format: \"XxY, XxY, ...\"" -msgstr "Bildgrößen, die in einer .gcode- und .sl1-Datei gespeichert werden sollen, im folgenden Format: \"XxY, XxY, ...\"" -======= #: src/libslic3r/PrintConfig.cpp:257 msgid "" "Picture sizes to be stored into a .gcode and .sl1 / .sl1s files, in the " @@ -9713,7 +9252,6 @@ msgid "" msgstr "" "Bildgrößen, die in einer .gcode und .sl1 / .sl1s Datei gespeichert werden " "sollen, im folgenden Format: \"XxY, XxY, ...\"" ->>>>>>> master #: src/libslic3r/PrintConfig.cpp:3483 msgid "Pillar connection mode" @@ -9781,15 +9319,7 @@ msgstr "" "Bitte speichern Sie Ihr Projekt und starten Sie PrusaSlicer neu. Wir würden " "uns freuen, wenn Sie das Problem melden würden." -<<<<<<< HEAD -#: src/slic3r/GUI/GUI.cpp:341 -msgid "Please review the substitutions and adjust them if needed." -msgstr "Ãœberprüfen Sie die Ersatzwerte und passen Sie sie bei Bedarf an." - -#: src/slic3r/GUI/Plater.cpp:3089 -======= #: src/slic3r/GUI/Plater.cpp:3620 ->>>>>>> master msgid "Please select the file to reload" msgstr "Bitte wählen Sie die neu zu ladende Datei aus" @@ -9955,11 +9485,7 @@ msgstr "Drücken um das Abwahlrechteck zu aktivieren" msgid "Press to activate selection rectangle" msgstr "Drücken um das Auswahlrechteck zu aktivieren" -<<<<<<< HEAD -#: src/slic3r/GUI/KBShortcutsDialog.cpp:155 -======= #: src/slic3r/GUI/KBShortcutsDialog.cpp:136 ->>>>>>> master msgid "" "Press to select multiple objects\n" "or move multiple objects with mouse" @@ -9967,16 +9493,6 @@ msgstr "" "Drücken zum Auswählen des mehrteiligen Objekts \n" "oder Bewegen des mehrteiligen Objekts mit der Maus" -<<<<<<< HEAD -#: src/slic3r/GUI/KBShortcutsDialog.cpp:221 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:222 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:231 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:232 -msgid "" -"Press to speed up 5 times while moving thumb\n" -"with arrow keys or mouse wheel" -msgstr "Drücken, um 5 Mal schneller zu werden, während der Regler mit Pfeiltasten oder Mausrad bewegt wird" -======= #: src/slic3r/GUI/KBShortcutsDialog.cpp:239 #: src/slic3r/GUI/KBShortcutsDialog.cpp:240 #: src/slic3r/GUI/KBShortcutsDialog.cpp:250 @@ -9987,7 +9503,6 @@ msgid "" msgstr "" "Drücken, um 5 Mal schneller zu werden, während der Regler mit Pfeiltasten " "oder Mausrad bewegt wird" ->>>>>>> master #: src/slic3r/GUI/KBShortcutsDialog.cpp:230 src/slic3r/GUI/Plater.cpp:4446 #: src/slic3r/GUI/Tab.cpp:2822 @@ -10287,17 +9802,6 @@ msgstr "PrusaSlicer Fehler" msgid "PrusaSlicer GUI initialization failed" msgstr "PrusaSlicer GUI-Initialisierung fehlgeschlagen" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_App.cpp:586 -msgid "" -"PrusaSlicer has encountered a localization error. Please report to PrusaSlicer team, what language was active and in which scenario this issue happened. Thank you.\n" -"\n" -"The application will now terminate." -msgstr "" -"PrusaSlicer ist auf einen Lokalisierungsfehler gestoßen. Bitte melden Sie dem PrusaSlicer-Team, welche Sprache aktiv war und in welchem Szenario dieses Problem aufgetreten ist. Wir danken Ihnen.\n" -"\n" -"Die Anwendung wird nun beendet." -======= #: src/slic3r/GUI/BackgroundSlicingProcess.cpp:84 #, boost-format msgid "PrusaSlicer has encountered a fatal error: \"%1%\"" @@ -10335,7 +9839,6 @@ msgstr "" #: src/slic3r/GUI/MainFrame.cpp:232 msgid "PrusaSlicer is closing" msgstr "PrusaSlicer schließt" ->>>>>>> master #: src/slic3r/GUI/UpdateDialogs.cpp:95 msgid "" @@ -10357,26 +9860,9 @@ msgstr "" "laufen, während die OpenGL-Version %s, Render %s, Hersteller %s erkannt " "wurde." -<<<<<<< HEAD -#: src/slic3r/GUI/UpdateDialogs.cpp:90 -msgid "" -"PrusaSlicer is not using the newest configuration available.\n" -"Configuration Wizard may not offer the latest printers, filaments and SLA materials to be installed. " -msgstr "" -"Der PrusaSlicer verwendet nicht die neueste verfügbare Konfiguration.\n" -"Der Konfigurationsassistent bietet möglicherweise nicht die neuesten zu installierenden Drucker, Filamente und SLA-Materialien an. " - -#: src/slic3r/GUI/OpenGLManager.cpp:259 -#, possible-c-format -msgid "" -"PrusaSlicer requires OpenGL 2.0 capable graphics driver to run correctly, \n" -"while OpenGL version %s, render %s, vendor %s was detected." -msgstr "PrusaSlicer benötigt einen OpenGL 2.0-fähigen Grafiktreiber, um korrekt zu laufen, während die OpenGL-Version %s, Render %s, Hersteller %s erkannt wurde." -======= #: src/slic3r/GUI/GUI_App.cpp:1329 msgid "PrusaSlicer started after a crash" msgstr "PrusaSlicer startet nach einem Absturz" ->>>>>>> master #: src/slic3r/GUI/ConfigSnapshotDialog.cpp:60 msgid "PrusaSlicer version" @@ -10386,21 +9872,9 @@ msgstr "PrusaSlicer Version" msgid "PrusaSlicer will remember your action." msgstr "PrusaSlicer wird sich an Ihre Aktion erinnern." -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigWizard.cpp:1174 -msgid "" -"PrusaSlicer's user interfaces comes in three variants:\n" -"Simple, Advanced, and Expert.\n" -"The Simple mode shows only the most frequently used settings relevant for regular 3D printing. The other two offer progressively more sophisticated fine-tuning, they are suitable for advanced and expert users, respectively." -msgstr "" -"Die Benutzeroberflächen von PrusaSlicer sind in drei Varianten erhältlich:\n" -"Einfach, Fortgeschritten und Experte.\n" -"Der einfache Modus zeigt nur die am häufigsten verwendeten Einstellungen, die für den regulären 3D-Druck relevant sind. Die beiden anderen bieten eine immer anspruchsvollere Feinabstimmung, sie sind für fortgeschrittene bzw. erfahrene Anwender geeignet." -======= #: src/slic3r/GUI/GUI_App.cpp:3074 src/slic3r/GUI/Plater.cpp:1734 msgid "PrusaSlicer will remember your choice." msgstr "PrusaSlicer wird sich an Ihre Wahl erinnern." ->>>>>>> master #: src/slic3r/GUI/ConfigWizard.cpp:1274 msgid "" @@ -10516,19 +9990,6 @@ msgstr "Raftschichten" msgid "Ramming customization" msgstr "Einstellungen für das Rammen" -<<<<<<< HEAD -#: src/slic3r/GUI/WipeTowerDialog.cpp:41 -msgid "" -"Ramming denotes the rapid extrusion just before a tool change in a single-extruder MM printer. Its purpose is to properly shape the end of the unloaded filament so it does not prevent insertion of the new filament and can itself be reinserted later. This phase is important and different materials can require different extrusion speeds to get the good shape. For this reason, the extrusion rates during ramming are adjustable.\n" -"\n" -"This is an expert-level setting, incorrect adjustment will likely lead to jams, extruder wheel grinding into filament etc." -msgstr "" -"Rammen steht für die beschleunigte Extrusion unmittelbar vor einem Werkzeugwechsel in einem MM-Drucker mit einem Extruder. Der Zweck ist, die Spitze des entladenen Filaments geeignet zu formen, damit es das Laden des neuen Filaments nicht behindert und später selber wieder eingeführt werden kann. Diese Phase ist wichtig und verschiedene Materialien können unterschiedliche Extrusionsgeschwindigkeiten benötigen, um die richtige Form zu erzielen. Aus diesem Grund können die Extrusionsraten für das Rammen angepasst werden.\n" -"\n" -"Dies ist eine Einstellung für fortgeschrittene Benutzer. Falsche Anpassungen werden sehr wahrscheinlich zu Verstopfungen führen oder dazu, dass die Zähne der Extruderwelle ins Filament einschneiden usw." - -#: src/slic3r/GUI/WipeTowerDialog.cpp:91 -======= #: src/slic3r/GUI/WipeTowerDialog.cpp:54 msgid "" "Ramming denotes the rapid extrusion just before a tool change in a single-" @@ -10555,7 +10016,6 @@ msgstr "" "der Extruderwelle ins Filament einschneiden usw." #: src/slic3r/GUI/WipeTowerDialog.cpp:122 ->>>>>>> master msgid "Ramming line spacing" msgstr "Abstand der Rammlinien" @@ -11319,19 +10779,9 @@ msgstr "Speichere Projekt (3mf)" msgid "Save project as (3mf)" msgstr "Speichere Projekt als (3mf)" -<<<<<<< HEAD -#: src/slic3r/GUI/Plater.cpp:5337 -msgid "Save SL1 / SL1S file as:" -msgstr "SL1 / SL1S-Datei speichern unter:" - -#: src/slic3r/GUI/Plater.cpp:4975 -msgid "Save SL1 file as:" -msgstr "Speichere SL1 Datei als:" -======= #: src/slic3r/GUI/Plater.cpp:5707 msgid "Save SL1 / SL1S file as:" msgstr "SL1 / SL1S-Datei speichern unter:" ->>>>>>> master #: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:898 msgid "Save support points?" @@ -11578,25 +11028,16 @@ msgstr "Wählen Sie aus, welche Art von Grundschicht Sie benötigen" msgid "Select what kind of support do you need" msgstr "Wählen Sie aus, welche Art von Unterstützung Sie benötigen" -<<<<<<< HEAD -#: src/slic3r/GUI/DoubleSlider.cpp:2135 -======= #: src/slic3r/GUI/DoubleSlider.cpp:2532 ->>>>>>> master msgid "" "Select YES if you want to delete all saved tool changes, \n" "NO if you want all tool changes switch to color changes, \n" "or CANCEL to leave it unchanged." msgstr "" -<<<<<<< HEAD -"Wählen Sie JA, wenn Sie alle gespeicherten Werkzeugänderungen löschen möchten, \n" -"NEIN, wenn Sie möchten, dass alle Werkzeugänderungen auf Farbwechsel umgestellt werden, \n" -======= "Wählen Sie JA, wenn Sie alle gespeicherten Werkzeugänderungen löschen " "möchten, \n" "NEIN, wenn Sie möchten, dass alle Werkzeugänderungen auf Farbwechsel " "umgestellt werden, \n" ->>>>>>> master "oder ABBRECHEN, um sie unverändert zu lassen." #: src/slic3r/GUI/Selection.cpp:168 @@ -11995,19 +11436,6 @@ msgstr "Setze undruckbare Kopie" msgid "Set upper thumb as active" msgstr "Oberen Schieber aktiv setzen" -<<<<<<< HEAD -#: src/slic3r/GUI/KBShortcutsDialog.cpp:217 -msgid "Set upper thumb to current slider thumb" -msgstr "Stelle den oberen Regler auf den aktuellen Schieberegler" - -#: src/libslic3r/PrintConfig.cpp:3714 -msgid "" -"Sets logging sensitivity. 0:fatal, 1:error, 2:warning, 3:info, 4:debug, 5:trace\n" -"For example. loglevel=2 logs fatal, error and warning level messages." -msgstr "" -"Stellt die Empfindlichkeit der Protokollierung ein. 0:fatal, 1:Fehler, 2:Warnung, 3:Info, 4:Debug, 5: Trace.\n" -"Zum Beispiel. loglevel=2 protokolliert fatale, Fehler- und Warnstufenmeldungen." -======= #: src/libslic3r/PrintConfig.cpp:4458 msgid "" "Sets logging sensitivity. 0:fatal, 1:error, 2:warning, 3:info, 4:debug, 5:" @@ -12018,7 +11446,6 @@ msgstr "" "Warnung, 3:Info, 4:Debug, 5: Trace.\n" "Zum Beispiel. loglevel=2 protokolliert fatale, Fehler- und " "Warnstufenmeldungen." ->>>>>>> master #: src/slic3r/GUI/BedShapeDialog.cpp:249 src/slic3r/GUI/GCodeViewer.cpp:3705 #: src/slic3r/GUI/MainFrame.cpp:2140 @@ -12343,17 +11770,6 @@ msgstr "Einzelextruder MM Setup" msgid "Single Extruder Multi Material" msgstr "Einzelextruder mit Multi-Material" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:2101 -msgid "" -"Single Extruder Multi Material is selected, \n" -"and all extruders must have the same diameter.\n" -"Do you want to change the diameter for all extruders to first extruder nozzle diameter value?" -msgstr "" -"Einzel-Extruder Multi-Material ist ausgewählt, \n" -"und alle Extruder müssen den gleichen Durchmesser haben.\n" -"Möchten Sie den Durchmesser für alle Extruder auf den Wert des ersten Extruderdüsendurchmessers ändern?" -======= #: src/slic3r/GUI/Tab.cpp:2326 msgid "" "Single Extruder Multi Material is selected, \n" @@ -12365,7 +11781,6 @@ msgstr "" "und alle Extruder müssen den gleichen Durchmesser haben.\n" "Möchten Sie den Durchmesser für alle Extruder auf den Wert des ersten " "Extruderdüsendurchmessers ändern?" ->>>>>>> master #: src/slic3r/GUI/Tab.cpp:2734 msgid "Single extruder multimaterial parameters" @@ -12706,16 +12121,6 @@ msgstr "" msgid "Some filaments were uninstalled." msgstr "Einige Filamente wurden deinstalliert." -<<<<<<< HEAD -#: src/slic3r/GUI/Plater.cpp:2309 -#, possible-c-format -msgid "" -"Some object(s) in file %s looks like saved in inches.\n" -"Should I consider them as a saved in inches and convert them?" -msgstr "" -"Einige Objekte in der Datei %s sehen aus wie in Zoll gespeichert.\n" -"Als in Zoll gespeicherte Objekte betrachten und konvertieren?" -======= #: src/libslic3r/PrintConfig.cpp:1321 msgid "" "Some G/M-code commands, including temperature control and others, are not " @@ -12728,7 +12133,6 @@ msgstr "" "Druckers ein, um eine kompatible Ausgabe zu erhalten. Der Zusatz \"No " "Extrusion\" verhindert, dass PrusaSlicer überhaupt einen Extrusionswert " "exportiert." ->>>>>>> master #: src/slic3r/GUI/GLCanvas3D.cpp:6370 msgid "Some objects are not visible during editing." @@ -12739,18 +12143,12 @@ msgid "Some objects are too close; your extruder will collide with them." msgstr "" "Einige Objekte sind zu nahe; Ihr Extruder wird mit ihnen zusammenstoßen." -<<<<<<< HEAD -#: src/libslic3r/Print.cpp:1254 -msgid "Some objects are too tall and cannot be printed without extruder collisions." -msgstr "Einige Objekte sind zu hoch und können nicht ohne Zusammenstoß mit dem Extruder gedruckt werden." -======= #: src/libslic3r/Print.cpp:456 msgid "" "Some objects are too tall and cannot be printed without extruder collisions." msgstr "" "Einige Objekte sind zu hoch und können nicht ohne Zusammenstoß mit dem " "Extruder gedruckt werden." ->>>>>>> master #: src/libslic3r/PrintConfig.cpp:3649 msgid "" @@ -12763,11 +12161,6 @@ msgstr "" "Mittelpunkte von zwei kleineren Grundschichten entfernt sein soll. Wenn sie " "näher sind, werden sie zu einem Block zusammengeführt." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2330 -msgid "Some printers or printer setups may have difficulties printing with a variable layer height. Enabled by default." -msgstr "Mit einigen Druckern oder Druckerkonfigurationen ist es schwierig, mit einer variablen Schichthöhe zu drucken. Standardmäßig aktiviert." -======= #: src/slic3r/GUI/GUI_App.cpp:2272 msgid "" "Some presets are modified and the unsaved changes will not be captured by " @@ -12795,7 +12188,6 @@ msgstr "" #: src/slic3r/GUI/ConfigWizard.cpp:2696 msgid "Some Printers were uninstalled." msgstr "Einige Drucker wurden deinstalliert." ->>>>>>> master #: src/slic3r/GUI/ConfigWizard.cpp:2729 msgid "Some SLA materials were uninstalled." @@ -12832,11 +12224,6 @@ msgstr "Geschwindigkeit" msgid "Speed (mm/s)" msgstr "Geschwindigkeit (mm/s)" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:964 -msgid "Speed for filling small gaps using short zigzag moves. Keep this reasonably low to avoid too much shaking and resonance issues. Set zero to disable gaps filling." -msgstr "Geschwindigkeit, mit der kleine Lücken mit kurzen Zickzackbewegungen gefüllt werden. Beschränken Sie diese auf einen mäßigen Wert, um übermässiges Rütteln und Resonanzprobleme zu vermeiden. Auf Null gesetzt, wird das Füllen kleiner Lücken deaktiviert." -======= #: src/libslic3r/PrintConfig.cpp:1304 msgid "" "Speed for filling small gaps using short zigzag moves. Keep this reasonably " @@ -12857,7 +12244,6 @@ msgstr "" "Geschwindigkeit für Bewegungen entlang der Z-Achse.\n" "Wenn der Wert auf Null gesetzt ist, wird er ignoriert und stattdessen die " "normale Fahrgeschwindigkeit verwendet." ->>>>>>> master #: src/slic3r/GUI/Tab.cpp:1598 msgid "Speed for non-print moves" @@ -12878,11 +12264,6 @@ msgstr "Geschwindigkeit für Druckbewegungen" msgid "Speed for printing bridges." msgstr "Brückendruckgeschwindigkeit." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1884 -msgid "Speed for printing solid regions (top/bottom/internal horizontal shells). This can be expressed as a percentage (for example: 80%) over the default infill speed above. Set to zero for auto." -msgstr "Druckgeschwindigkeit für massive Bereiche (obere/untere/innenliegende waagrechte Hüllen). Sie kann als Prozentwert (z.B. 80%) der oben eingegebenen standardmäßigen Infill-Geschwindigkeit angegeben werden. Für Automatik auf null setzen." -======= #: src/libslic3r/PrintConfig.cpp:2356 msgid "" "Speed for printing solid regions (top/bottom/internal horizontal shells). " @@ -12893,7 +12274,6 @@ msgstr "" "waagrechte Hüllen). Sie kann als Prozentwert (z.B. 80%) der oben " "eingegebenen standardmäßigen Infill-Geschwindigkeit angegeben werden. Für " "Automatik auf null setzen." ->>>>>>> master #: src/libslic3r/PrintConfig.cpp:2688 msgid "" @@ -13073,35 +12453,6 @@ msgstr "Neuen Slicing-Prozess starten" msgid "Start the application" msgstr "Anwendung starten" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_App.cpp:386 -msgid "" -"Starting with %1% 2.3, configuration directory on Linux has changed (according to XDG Base Directory Specification) to \n" -"%2%.\n" -"\n" -"This directory did not exist yet (maybe you run the new version for the first time).\n" -"However, an old %1% configuration directory was detected in \n" -"%3%.\n" -"\n" -"Consider moving the contents of the old directory to the new location in order to access your profiles, etc.\n" -"Note that if you decide to downgrade %1% in future, it will use the old location again.\n" -"\n" -"What do you want to do now?" -msgstr "" -"Beginnend mit %1% 2.3 hat sich das Konfigurationsverzeichnis unter Linux (gemäß XDG Base Directory Specification) geändert in \n" -"%2%.\n" -"\n" -"Dieses Verzeichnis existierte noch nicht (vielleicht führen Sie die neue Version zum ersten Mal aus).\n" -"Es wurde jedoch ein altes %1%-Konfigurationsverzeichnis entdeckt in \n" -"%3%.\n" -"\n" -"Ziehen Sie in Betracht, den Inhalt des alten Verzeichnisses an den neuen Ort zu verschieben, um auf Ihre Profile usw. zuzugreifen.\n" -"Beachten Sie, dass bei einem zukünftigen Downgrade von %1% wieder der alte Speicherort verwendet wird.\n" -"\n" -"Was möchten Sie jetzt tun?" - -#: src/slic3r/GUI/PrintHostDialogs.cpp:149 -======= #: src/slic3r/GUI/GUI_App.cpp:411 #, boost-format msgid "" @@ -13138,7 +12489,6 @@ msgstr "" "Was möchten Sie jetzt tun?" #: src/slic3r/GUI/PrintHostDialogs.cpp:249 ->>>>>>> master msgid "Status" msgstr "Status" @@ -13331,11 +12681,7 @@ msgstr "Unterstützt Restzeit" msgid "Supports stealth mode" msgstr "Unterstützt Stealth Modus" -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigManipulation.cpp:158 -======= #: src/slic3r/GUI/ConfigManipulation.cpp:164 ->>>>>>> master msgid "" "Supports work better, if the following feature is enabled:\n" "- Detect bridging perimeters" @@ -13405,27 +12751,13 @@ msgstr "Wechseln zum %s Modus" msgid "Switching Presets: Unsaved Changes" msgstr "Voreinstellungen umschalten: Nicht gespeicherte Änderungen" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_App.cpp:1608 -======= #: src/slic3r/GUI/GUI_App.cpp:2368 ->>>>>>> master msgid "" "Switching the language will trigger application restart.\n" "You will lose content of the plater." msgstr "" "Das Umschalten der Sprache löst einen Neustart der Anwendung aus.\n" "Sie verlieren den Inhalt der Druckplatte." -<<<<<<< HEAD - -#: src/slic3r/GUI/WipeTowerDialog.cpp:365 -msgid "" -"Switching to simple settings will discard changes done in the advanced mode!\n" -"\n" -"Do you want to proceed?" -msgstr "" -"Das Umschalten auf einfache Einstellungen verwirft die im erweiterten Modus vorgenommenen Änderungen!\n" -======= #: src/slic3r/GUI/Plater.cpp:4861 #, boost-format @@ -13447,7 +12779,6 @@ msgid "" msgstr "" "Das Umschalten auf einfache Einstellungen verwirft die im erweiterten Modus " "vorgenommenen Änderungen!\n" ->>>>>>> master "\n" "Wollen Sie fortfahren?" @@ -13554,16 +12885,6 @@ msgstr "" msgid "The %s device could not have been found" msgstr "Das %s-Gerät konnte nicht gefunden werden" -<<<<<<< HEAD -#: src/slic3r/GUI/FirmwareDialog.cpp:436 -#, possible-c-format -msgid "" -"The %s device was not found.\n" -"If the device is connected, please press the Reset button next to the USB connector ..." -msgstr "" -"Das %s-Gerät wurde nicht gefunden.\n" -"Wenn das Gerät angeschlossen ist, drücken Sie bitte die Reset-Taste neben dem USB-Anschluss...." -======= #: src/slic3r/GUI/FirmwareDialog.cpp:437 #, c-format, boost-format msgid "" @@ -13574,7 +12895,6 @@ msgstr "" "Das %s-Gerät wurde nicht gefunden.\n" "Wenn das Gerät angeschlossen ist, drücken Sie bitte die Reset-Taste neben " "dem USB-Anschluss...." ->>>>>>> master #: src/slic3r/GUI/GUI_App.cpp:957 #, boost-format @@ -13602,16 +12922,6 @@ msgstr "" "Die aktuelle benutzerdefinierte Voreinstellung wird von der Voreinstellung " "des übergeordneten Systems gelöst." -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:925 -msgid "" -"The currently manipulated object is tilted (rotation angles are not multiples of 90°).\n" -"Non-uniform scaling of tilted objects is only possible in the World coordinate system,\n" -"once the rotation is embedded into the object coordinates." -msgstr "" -"Das aktuell manipulierte Objekt wird gekippt (Drehwinkel sind keine Vielfachen von 90°).\n" -"Eine ungleiche Skalierung von geschwenkten Objekten ist nur im Weltkoordinatensystem möglich,\n" -======= #: src/slic3r/GUI/GUI_ObjectManipulation.cpp:980 msgid "" "The currently manipulated object is tilted (rotation angles are not " @@ -13624,7 +12934,6 @@ msgstr "" "Vielfachen von 90°).\n" "Eine ungleiche Skalierung von geschwenkten Objekten ist nur im " "Weltkoordinatensystem möglich,\n" ->>>>>>> master "sobald die Drehung in die Objektkoordinaten eingearbeitet wurde." #: src/libslic3r/PrintConfig.cpp:3551 @@ -13828,19 +13137,9 @@ msgstr "" msgid "the following suffix is not allowed:" msgstr "das folgenden Suffix ist nicht erlaubt:" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI.cpp:340 -msgid "The following values were substituted:" -msgstr "Die folgenden Werte wurden ersetzt:" - -#: src/libslic3r/PrintConfig.cpp:3035 -msgid "The gap between the object bottom and the generated pad in zero elevation mode." -msgstr "Der Abstand zwischen dem Objektboden und der erzeugten Grundschicht im Nullhöhenmodus." -======= #: src/slic3r/GUI/GUI.cpp:327 msgid "The following values were substituted:" msgstr "Die folgenden Werte wurden ersetzt:" ->>>>>>> master #: src/libslic3r/PrintConfig.cpp:3696 msgid "" @@ -13993,17 +13292,6 @@ msgstr "" "Das Objekt wird um diese Anzahl von Schichten angehoben, und darunter wird " "Trägermaterial erzeugt." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2567 -msgid "" -"The percentage of the bed area. \n" -"If the print area exceeds the specified value, \n" -"then a slow tilt will be used, otherwise - a fast tilt" -msgstr "" -"Der Prozentsatz der Druckbettfläche.\n" -"Wenn der Druckbereich den angegebenen Wert überschreitet,\n" -"wird eine langsame Verkippung verwendet, andernfalls - eine schnelle Verkippung" -======= #: src/libslic3r/PrintConfig.cpp:3464 msgid "" "The percentage of smaller pillars compared to the normal pillar diameter " @@ -14012,7 +13300,6 @@ msgstr "" "Der Prozentsatz der im Vergleich zum normalen Pfeilerdurchmesser kleineren " "Pfeiler, die in problematischen Bereichen eingesetzt werden, in die ein " "normaler Pfeiler nicht passt." ->>>>>>> master #: src/libslic3r/PrintConfig.cpp:3176 msgid "" @@ -14179,25 +13466,6 @@ msgstr "" "Das ausgewählte Projekt ist nicht mehr verfügbar.\n" "Wollen Sie es aus der Liste der letzten Projekte entfernen?" -<<<<<<< HEAD -#: src/slic3r/GUI/MainFrame.cpp:1003 -msgid "" -"The selected project is no longer available.\n" -"Do you want to remove it from the recent projects list?" -msgstr "" -"Das ausgewählte Projekt ist nicht mehr verfügbar.\n" -"Wollen Sie es aus der Liste der letzten Projekte entfernen?" - -#: src/slic3r/GUI/DoubleSlider.cpp:1121 -msgid "" -"The sequential print is on.\n" -"It's impossible to apply any custom G-code for objects printing sequentually.\n" -"This code won't be processed during G-code generation." -msgstr "" -"Der sequentielle Druck ist eingeschaltet.\n" -"Es ist unmöglich, einen benutzerdefinierten G-Code für Objekte anzuwenden, die sequentiell gedruckt werden.\n" -"Dieser Code wird bei der G-Code-Generierung nicht verarbeitet." -======= #: src/slic3r/GUI/DoubleSlider.cpp:1440 msgid "" "The sequential print is on.\n" @@ -14218,7 +13486,6 @@ msgstr "" "Der sequenzielle Druck ist eingeschaltet.\n" "Es ist nicht möglich, einen benutzerdefinierten G-Code für Objekte " "anzuwenden, die sequentiell gedruckt werden." ->>>>>>> master #: src/slic3r/GUI/ConfigWizard.cpp:1287 msgid "The size of the object can be specified in inches" @@ -14258,12 +13525,7 @@ msgstr "" msgid "The speed for retractions (it only applies to the extruder motor)." msgstr "Die Einzugsgeschwindigkeit (sie betrifft nur den Extruderantrieb)." -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigManipulation.cpp:80 -#, possible-c-format -======= #: src/slic3r/GUI/ConfigManipulation.cpp:82 ->>>>>>> master msgid "" "The Spiral Vase mode requires:\n" "- one perimeter\n" @@ -14281,11 +13543,6 @@ msgstr "" "- Vertikale Schalenstärke sicherstellen aktiv\n" "- Dünne Wände erkennen nicht aktiv" -<<<<<<< HEAD -#: src/libslic3r/Print.cpp:1270 -msgid "The Spiral Vase option can only be used when printing single material objects." -msgstr "Die Option Spiralvase kann nur beim Drucken von Objekten aus einem einzigen Material verwendet werden." -======= #: src/libslic3r/Print.cpp:469 msgid "" "The Spiral Vase option can only be used when printing single material " @@ -14293,7 +13550,6 @@ msgid "" msgstr "" "Die Option Spiralvase kann nur beim Drucken von Objekten aus einem einzigen " "Material verwendet werden." ->>>>>>> master #: src/slic3r/GUI/PhysicalPrinterDialog.cpp:630 msgid "The supplied name is empty. It can't be saved." @@ -14337,9 +13593,6 @@ msgstr "" "Sie diesen Wert auf 0 setzen, wird PrusaSlicer auch verhindern, dass Bridge-" "Flow und -Geschwindigkeit für die erste Objektschicht verwendet werden." -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:2731 -======= #: src/libslic3r/PrintConfig.cpp:2568 msgid "" "The vertical distance between the object top surface and the support " @@ -14352,18 +13605,13 @@ msgstr "" "unteren Z-Abstand verwendet." #: src/slic3r/GUI/Tab.cpp:3005 ->>>>>>> master msgid "" "The Wipe option is not available when using the Firmware Retraction mode.\n" "\n" "Shall I disable it in order to enable Firmware Retraction?" msgstr "" -<<<<<<< HEAD -"Die Reinigungsoption ist nicht verfügbar, wenn der Firmware-Einzug verwendet wird.\n" -======= "Die Reinigungsoption ist nicht verfügbar, wenn der Firmware-Einzug verwendet " "wird.\n" ->>>>>>> master "\n" "Soll ich sie ausschalten, um den Firmware-Einzug zu aktivieren?" @@ -14374,16 +13622,6 @@ msgstr "" "Der Reinigungsturm unterstützt derzeit kein volumetrisches E " "(use_volumetric_e=0)." -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigManipulation.cpp:114 -msgid "" -"The Wipe Tower currently supports the non-soluble supports only\n" -"if they are printed with the current extruder without triggering a tool change.\n" -"(both support_material_extruder and support_material_interface_extruder need to be set to 0)." -msgstr "" -"Der Reinigungsturm unterstützt derzeit nur die unlöslichen Stützen, wenn sie mit dem aktuellen Extruder gedruckt werden, ohne einen Werkzeugwechsel auszulösen.\n" -"(sowohl der Stützmaterial-Extruder als auch der Stützmaterial-Schnittstellen-Extruder müssen auf 0 eingestellt sein)" -======= #: src/slic3r/GUI/ConfigManipulation.cpp:121 msgid "" "The Wipe Tower currently supports the non-soluble supports only\n" @@ -14397,7 +13635,6 @@ msgstr "" "auszulösen.\n" "(sowohl der Stützmaterial-Extruder als auch der Stützmaterial-Schnittstellen-" "Extruder müssen auf 0 eingestellt sein)" ->>>>>>> master #: src/libslic3r/Print.cpp:598 msgid "" @@ -14504,31 +13741,6 @@ msgstr "" "wurde.\n" "Ãœberprüfen Sie Ihre Einstellungen, um überflüssige Farbwechsel zu vermeiden." -<<<<<<< HEAD -#: src/slic3r/GUI/DoubleSlider.cpp:1155 -msgid "" -"There is a color change for extruder that has not been used before.\n" -"Check your settings to avoid redundant color changes." -msgstr "" -"Es gibt einen Farbwechsel für den Extruder, der bisher noch nicht verwendet wurde.\n" -"Ãœberprüfen Sie Ihre Einstellungen, um überflüssige Farbwechsel zu vermeiden." - -#: src/slic3r/GUI/DoubleSlider.cpp:1149 -msgid "" -"There is a color change for extruder that won't be used till the end of print job.\n" -"This code won't be processed during G-code generation." -msgstr "" -"Es gibt einen Farbwechsel für den Extruder, der nicht vor dem Ende des Druckauftrags verwendet wird.\n" -"Dieser Code wird bei der G-Code-Generierung nicht verarbeitet." - -#: src/slic3r/GUI/DoubleSlider.cpp:1152 -msgid "" -"There is an extruder change set to the same extruder.\n" -"This code won't be processed during G-code generation." -msgstr "" -"Es gibt einen Extruderwechsel, der auf denselben Extruder eingestellt ist.\n" -"Dieser Code wird während der G-Code-Generierung nicht verarbeitet." -======= #: src/slic3r/GUI/DoubleSlider.cpp:1485 msgid "" "There is a color change for extruder that won't be used till the end of " @@ -14550,7 +13762,6 @@ msgstr "" #: src/libslic3r/GCode.cpp:539 msgid "There is an object with no extrusions in the first layer." msgstr "In der ersten Schicht gibt es ein Objekt ohne Extrusionen." ->>>>>>> master #: src/libslic3r/PrintConfig.cpp:2799 msgid "Thick bridges" @@ -14561,27 +13772,6 @@ msgstr "Dicke Brücken" msgid "This %s version: %s" msgstr "Diese %s Version: %s" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:1244 -msgid "" -"This action is not revertable.\n" -"Do you want to proceed?" -msgstr "" -"Diese Aktion ist nicht umkehrbar.\n" -"Wollen Sie fortfahren?" - -#: src/libslic3r/PrintConfig.cpp:199 -msgid "This code is inserted between objects when using sequential printing. By default extruder and bed temperature are reset using non-wait command; however if M104, M109, M140 or M190 are detected in this custom code, Slic3r will not add temperature commands. Note that you can use placeholder variables for all Slic3r settings, so you can put a \"M109 S[first_layer_temperature]\" command wherever you want." -msgstr "Dieser Code wird beim sequentiellen Drucken zwischen Objekten eingefügt. Standardmäßig werden Extruder- und Betttemperatur mit dem Befehl, der nicht auf die Änderung wartet, zurückgesetzt. Wenn jedoch M104, M109, M140 oder M190 in diesem benutzerdefinierten Code erkannt werden, fügt Slic3r keine Temperaturbefehle hinzu. Beachten Sie, dass Sie Platzhaltervariablen für alle PrusaSlicer-Einstellungen verwenden können, so dass Sie einen \"M109 S[first_layer_temperature]\"-Befehl an beliebiger Stelle platzieren können." - -#: src/libslic3r/PrintConfig.cpp:1174 -msgid "This custom code is inserted at every layer change, right after the Z move and before the extruder moves to the first layer point. Note that you can use placeholder variables for all Slic3r settings as well as [layer_num] and [layer_z]." -msgstr "Dieser benutzerdefinierte Code wird bei jedem Schichtwechsel eingefügt, direkt nach der Z-Bewegung und bevor der Extruder zum ersten Lagenpunkt fährt. Beachten Sie, dass Sie Platzhaltervariablen für alle Slic3r-Einstellungen sowie [layer_num] und [layer_z] verwenden können." - -#: src/libslic3r/PrintConfig.cpp:188 -msgid "This custom code is inserted at every layer change, right before the Z move. Note that you can use placeholder variables for all Slic3r settings as well as [layer_num] and [layer_z]." -msgstr "Dieser benutzerdefinierte Code wird bei jedem Lagenwechsel, unmittelbar vor der Z Bewegung, eingefügt. Beachten Sie, dass Sie Platzhaltervariablen für alle PrusaSlicer-Einstellungen sowie [layer_num] und [layer_z] verwenden können." -======= #: src/slic3r/GUI/DoubleSlider.cpp:2087 src/slic3r/GUI/Tab.cpp:1322 msgid "" "This action is not revertible.\n" @@ -14589,7 +13779,6 @@ msgid "" msgstr "" "Diese Maßnahme ist nicht rückgängig zu machen.\n" "Möchten Sie fortfahren?" ->>>>>>> master #: src/slic3r/GUI/DoubleSlider.cpp:2086 msgid "This action will cause deletion of all ticks on vertical slider." @@ -14776,35 +13965,6 @@ msgstr "" "Anzahl von Schichten wählen, die in Abhängigkeit von Düsendurchmesser und " "Schichthöhe kombiniert werden können." -<<<<<<< HEAD -#: src/slic3r/GUI/Plater.cpp:2319 -msgid "" -"This file contains several objects positioned at multiple heights.\n" -"Instead of considering them as multiple objects, should I consider\n" -"this file as a single object having multiple parts?" -msgstr "Diese Datei enthält mehrere Objekte, die in verschiedenen Höhen positioniert sind. Anstatt sie als mehrere Objekte zu betrachten, soll ich diese Datei als ein einzelnes Objekt mit mehreren Teilen betrachten?" - -#: src/slic3r/GUI/FirmwareDialog.cpp:332 -#, possible-c-format -msgid "" -"This firmware hex file does not match the printer model.\n" -"The hex file is intended for: %s\n" -"Printer reported: %s\n" -"\n" -"Do you want to continue and flash this hex file anyway?\n" -"Please only continue if you are sure this is the right thing to do." -msgstr "" -"Diese Firmware-Hex-Datei stimmt nicht mit dem Druckermodell überein.\n" -"Die Hex-Datei ist für: %s\n" -"Drucker erkannt: %s\n" -"\n" -"Möchtest Sie fortfahren und diese Hex-Datei trotzdem flashen?\n" -"Bitte fahren Sie nur fort, wenn Sie der festen Ãœberzeugung sind, dass dies das Richtige ist." - -#: src/libslic3r/PrintConfig.cpp:348 -msgid "This flag enables the automatic cooling logic that adjusts print speed and fan speed according to layer printing time." -msgstr "Diese Einstellung aktiviert die Logik, die die Druckgeschwindigkeit und Lüftergeschwindigkeit automatisch gemäß der Schichtdruckdauer regelt." -======= #: src/libslic3r/PrintConfig.cpp:2382 msgid "" "This feature will raise Z gradually while printing a single-walled object in " @@ -14864,7 +14024,6 @@ msgid "" msgstr "" "Diese Einstellung aktiviert die Logik, die die Druckgeschwindigkeit und " "Lüftergeschwindigkeit automatisch gemäß der Schichtdruckdauer regelt." ->>>>>>> master #: src/slic3r/GUI/Plater.cpp:469 msgid "" @@ -15026,15 +14185,6 @@ msgstr "" msgid "This is wipe tower layer" msgstr "Dies ist die Wischturmschicht" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:928 -msgid "" -"This operation is irreversible.\n" -"Do you want to proceed?" -msgstr "" -"Dieser Vorgang ist nicht mehr rückgängig zu machen.\n" -"Möchten Sie fortfahren?" -======= #: src/libslic3r/PrintConfig.cpp:2959 msgid "" "This matrix describes volumes (in cubic milimetres) required to purge the " @@ -15043,7 +14193,6 @@ msgstr "" "Diese Matrix beschreibt die Volumina (in Kubikmillimetern), die benötigt " "werden, um das neue Filament auf dem Reinigungsturm für ein bestimmtes " "Werkzeugpaar zu reinigen." ->>>>>>> master #: src/libslic3r/GCode.cpp:766 msgid "" @@ -15238,23 +14387,6 @@ msgstr "" "um die Erstellung des vollen Reinigungsvolumens zu vereinfachen." #: src/slic3r/GUI/UpdateDialogs.cpp:216 -<<<<<<< HEAD -#, possible-c-format -msgid "" -"This version of %s is not compatible with currently installed configuration bundles.\n" -"This probably happened as a result of running an older %s after using a newer one.\n" -"\n" -"You may either exit %s and try again with a newer version, or you may re-run the initial configuration. Doing so will create a backup snapshot of the existing configuration before installing files compatible with this %s." -msgstr "" -"Diese Version von %s ist nicht kompatibel zu den aktuell installierten Konfigurationssammlungen.\n" -"Dies wurde wahrscheinlich dadurch verursacht, dass Sie eine ältere %s Version benutzt haben, nachdem Sie eine neuere ausgeführt hatten.\n" -"\n" -"Sie können %s entweder beenden und es mit einer neueren Version nochmals versuchen, oder Sie können die erstmalige Startkonfiguration nochmals wiederholen. In diesem Fall wird eine Sicherungskopie der aktuellen Konfiguration erstellt, bevor die mit dieser %s-Version kompatiblen Dateien installiert werden." - -#: src/libslic3r/PrintConfig.cpp:2601 -msgid "This will apply a gamma correction to the rasterized 2D polygons. A gamma value of zero means thresholding with the threshold in the middle. This behaviour eliminates antialiasing without losing holes in polygons." -msgstr "Dadurch wird eine Gammakorrektur auf die gerasterten 2D-Polygone angewendet. Ein Gamma-Wert von null bedeutet Schwellenwertbildung mit dem Schwellenwert in der Mitte. Dieses Verhalten eliminiert Antialiasing, ohne Löcher in Polygonen zu verlieren." -======= #, c-format, boost-format msgid "" "This version of %s is not compatible with currently installed configuration " @@ -15301,7 +14433,6 @@ msgstr "" "Ein Gamma-Wert von null bedeutet Schwellenwertbildung mit dem Schwellenwert " "in der Mitte. Dieses Verhalten eliminiert Antialiasing, ohne Löcher in " "Polygonen zu verlieren." ->>>>>>> master #: src/libslic3r/PrintConfig.cpp:2815 msgid "Threads" @@ -15587,10 +14718,6 @@ msgstr "Druckertyp." msgid "Type:" msgstr "Typ:" -<<<<<<< HEAD -#: src/slic3r/GUI/OpenGLManager.cpp:275 -#, possible-c-format -======= #: src/libslic3r/SLAPrintSteps.cpp:441 msgid "Unable to drill the current configuration of holes into the model." msgstr "" @@ -15599,7 +14726,6 @@ msgstr "" #: src/slic3r/GUI/OpenGLManager.cpp:273 #, c-format, boost-format ->>>>>>> master msgid "" "Unable to load the following shaders:\n" "%s" @@ -15625,9 +14751,6 @@ msgstr "Kann nicht durch mehr als ein Volumen ersetzt werden" msgid "Undef" msgstr "Undef" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI.cpp:305 -======= #: src/slic3r/GUI/UnsavedChangesDialog.cpp:1681 msgid "Undef category" msgstr "Kategorie nicht definieren" @@ -15637,7 +14760,6 @@ msgid "Undef group" msgstr "Gruppe nicht definieren" #: src/slic3r/GUI/GUI.cpp:292 ->>>>>>> master msgid "Undefined" msgstr "Undefiniert" @@ -15725,23 +14847,6 @@ msgstr "Entladegeschwindigkeit zu Beginn" msgid "UNLOCKED LOCK" msgstr "OFFENES SCHLOSS" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3719 -msgid "" -"UNLOCKED LOCK icon indicates that some settings were changed and are not equal to the system (or default) values for the current option group.\n" -"Click to reset all settings for current option group to the system (or default) values." -msgstr "" -"Das Symbol GEÖFFNETES SCHLOSS zeigt an, dass einige Einstellungen geändert wurden und nicht mehr mit den System- (oder Standard-) Werte für die aktuelle Optionsgruppe identisch sind.\n" -"Klicken Sie, um alle Einstellungen für die aktuelle Optionsgruppe auf die System- (oder Standard-) Werte zurückzusetzen." - -#: src/slic3r/GUI/Tab.cpp:3734 -msgid "" -"UNLOCKED LOCK icon indicates that the value was changed and is not equal to the system (or default) value.\n" -"Click to reset current value to the system (or default) value." -msgstr "" -"Das Symbol GEÖFFNETES SCHLOSS zeigt an, dass der Wert geändert wurde und nicht mit der System- (oder Standard-) Einstellung identisch ist.\n" -"Klicken Sie, um den aktuellen Wert auf die System- (oder Standard-) Einstellung zurückzusetzen." -======= #: src/slic3r/GUI/Tab.cpp:4283 msgid "" "UNLOCKED LOCK icon indicates that some settings were changed and are not " @@ -15765,7 +14870,6 @@ msgstr "" "nicht mit der System- (oder Standard-) Einstellung identisch ist.\n" "Klicken Sie, um den aktuellen Wert auf die System- (oder Standard-) " "Einstellung zurückzusetzen." ->>>>>>> master #: src/slic3r/GUI/UnsavedChangesDialog.cpp:771 msgid "Unsaved Changes" @@ -16120,20 +15224,12 @@ msgstr "Ansicht" msgid "View mode" msgstr "Anzeigemodus" -<<<<<<< HEAD -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:666 -======= #: src/slic3r/GUI/UnsavedChangesDialog.cpp:903 #, boost-format ->>>>>>> master msgid "" "Visit \"Preferences\" and check \"%1%\"\n" "to be asked about unsaved changes again." msgstr "" -<<<<<<< HEAD -"Besuchen Sie \"Präferenzen\" und überprüfen Sie \"%1%\",\n" -"um über nicht gespeicherte Änderungen wieder gefragt zu werden." -======= "Besuchen Sie \"Einstellungen\" und überprüfen Sie \"%1%\",\n" "um über nicht gespeicherte Änderungen wieder gefragt zu werden." @@ -16145,7 +15241,6 @@ msgid "" msgstr "" "Besuchen Sie \"Einstellungen\" und prüfen Sie \"%1%\"\n" "um Ihre Auswahl zu ändern." ->>>>>>> master #: src/libslic3r/PrintConfig.cpp:4278 msgid "Visualize an already sliced and saved G-code" @@ -16523,40 +15618,22 @@ msgstr "Mit Umhüllung der Stützen" msgid "World coordinates" msgstr "Weltkoordinaten" -<<<<<<< HEAD -#: src/slic3r/GUI/UpdateDialogs.cpp:92 -msgid "" -"Would you like to install it?\n" -"\n" -"Note that a full configuration snapshot will be created first. It can then be restored at any time should there be a problem with the new version.\n" -======= #: src/slic3r/GUI/UpdateDialogs.cpp:100 msgid "" "Would you like to install it?\n" "\n" "Note that a full configuration snapshot will be created first. It can then " "be restored at any time should there be a problem with the new version.\n" ->>>>>>> master "\n" "Updated configuration bundles:" msgstr "" "Möchten Sie dies installieren?\n" "\n" -<<<<<<< HEAD -"Beachten Sie, dass zuerst eine Momentaufnahme der gesamten Konfiguration erstellt wird. Diese kann dann jederzeit wiederhergestellt werden, falls es ein Problem mit der neuen Version gibt.\n" -"\n" -"Aktualisierte Konfigurationssammlungen:" - -#: src/slic3r/GUI/GUI_App.cpp:1802 -msgid "Would you like to stop uploads and close the program?" -msgstr "Möchten Sie die Uploads stoppen und das Programm schließen?" -======= "Beachten Sie, dass zuerst eine Momentaufnahme der gesamten Konfiguration " "erstellt wird. Diese kann dann jederzeit wiederhergestellt werden, falls es " "ein Problem mit der neuen Version gibt.\n" "\n" "Aktualisierte Konfigurationssammlungen:" ->>>>>>> master #: src/libslic3r/miniz_extension.cpp:151 msgid "write calledback failed" @@ -16712,17 +15789,6 @@ msgstr "" "Sie können den nichtgleichmäßigen Skalierungsmodus nicht für mehrere Objekte/" "Teileauswahlen verwenden" -<<<<<<< HEAD -#: src/slic3r/GUI/NotificationManager.hpp:459 -msgid "" -"You have just added a G-code for color change, but its value is empty.\n" -"To export the G-code correctly, check the \"Color Change G-code\" in \"Printer Settings > Custom G-code\"" -msgstr "" -"Sie haben gerade einen G-Code für Farbwechsel hinzugefügt, aber sein Wert ist leer.\n" -"Um den G-Code korrekt zu exportieren, überprüfen Sie den \"Farbwechsel-G-Code\" unter \"Druckereinstellungen > Benutzerdefinierter G-Code\"." - -#: src/slic3r/GUI/SavePresetDialog.cpp:277 -======= #: src/slic3r/GUI/NotificationManager.hpp:761 msgid "" "You have just added a G-code for color change, but its value is empty.\n" @@ -16736,7 +15802,6 @@ msgstr "" #: src/slic3r/GUI/SavePresetDialog.cpp:283 #, boost-format ->>>>>>> master msgid "" "You have selected physical printer \"%1%\" \n" "with related printer preset \"%2%\"" @@ -16759,24 +15824,9 @@ msgstr "Möglicherweise müssen Sie Ihren Grafikkartentreiber aktualisieren." msgid "You must install a configuration update." msgstr "Ein Konfigurations-Update muss installiert werden." -<<<<<<< HEAD -#: src/slic3r/GUI/Preferences.cpp:299 -#, possible-c-format -msgid "You need to restart %s to make the changes effective." -msgstr "Sie müssen %s neu starten, damit die Änderungen wirksam werden." - -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:611 -msgid "You should change the name of your printer device." -msgstr "Sie sollten den Namen Ihres Druckgeräts ändern." - -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:468 -msgid "You should to change a name of your printer device. It can't be saved." -msgstr "Sie sollten den Namen Ihres Druckers ändern. Er kann nicht gespeichert werden." -======= #: src/slic3r/GUI/PhysicalPrinterDialog.cpp:634 msgid "You should change the name of your printer device." msgstr "Sie sollten den Namen Ihres Druckgeräts ändern." ->>>>>>> master #: src/slic3r/GUI/GUI_ObjectList.cpp:3644 #, c-format, boost-format @@ -16882,35 +15932,11 @@ msgstr "" msgid "Z offset" msgstr "Z-Abstand" -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigManipulation.cpp:59 -msgid "" -"Zero first layer height is not valid.\n" -"\n" -"The first layer height will be reset to 0.01." -msgstr "" -"Null Höhe der ersten Schicht ist nicht gültig.\n" -"\n" -"Die erste Schichthöhe wird auf 0,01 zurückgesetzt." - -#: src/slic3r/GUI/ConfigManipulation.cpp:47 -msgid "" -"Zero layer height is not valid.\n" -"\n" -"The layer height will be reset to 0.01." -msgstr "" -"Eine Nullschichthöhe ist nicht gültig.\n" -"\n" -"Die Schichthöhe wird auf 0,01 zurückgesetzt." - -#: src/libslic3r/PrintConfig.cpp:2831 -======= #: src/libslic3r/PrintConfig.cpp:2896 msgid "Z travel" msgstr "Z Eilgang" #: src/libslic3r/PrintConfig.cpp:3492 ->>>>>>> master msgid "Zig-Zag" msgstr "Zickzack" @@ -16945,11 +15971,7 @@ msgstr "Herauszoomen" msgid "Zoom to Bed" msgstr "Zoom aufs Druckbett" -<<<<<<< HEAD -#: src/slic3r/GUI/KBShortcutsDialog.cpp:176 -======= #: src/slic3r/GUI/KBShortcutsDialog.cpp:160 ->>>>>>> master msgid "" "Zoom to selected object\n" "or all objects in scene, if none selected" @@ -16957,19 +15979,11 @@ msgstr "" "Auf ausgewähltes Objekt zoomen\n" "oder alle Objekte in der Szene, wenn keines ausgewählt ist" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:241 src/libslic3r/PrintConfig.cpp:816 -#: src/libslic3r/PrintConfig.cpp:1748 src/libslic3r/PrintConfig.cpp:1758 -#: src/libslic3r/PrintConfig.cpp:2036 src/libslic3r/PrintConfig.cpp:2191 -#: src/libslic3r/PrintConfig.cpp:2390 src/libslic3r/PrintConfig.cpp:2891 -#: src/libslic3r/PrintConfig.cpp:3012 -======= #: src/libslic3r/PrintConfig.cpp:456 src/libslic3r/PrintConfig.cpp:1075 #: src/libslic3r/PrintConfig.cpp:2232 src/libslic3r/PrintConfig.cpp:2242 #: src/libslic3r/PrintConfig.cpp:2533 src/libslic3r/PrintConfig.cpp:2774 #: src/libslic3r/PrintConfig.cpp:2991 src/libslic3r/PrintConfig.cpp:3552 #: src/libslic3r/PrintConfig.cpp:3673 ->>>>>>> master msgid "°" msgstr "°" diff --git a/resources/localization/en/PrusaSlicer.mo b/resources/localization/en/PrusaSlicer.mo Binary files differindex 10978da8d..d641d462d 100644 --- a/resources/localization/en/PrusaSlicer.mo +++ b/resources/localization/en/PrusaSlicer.mo diff --git a/resources/localization/es/PrusaSlicer.mo b/resources/localization/es/PrusaSlicer.mo Binary files differindex 97a93ea2c..354de3a95 100644 --- a/resources/localization/es/PrusaSlicer.mo +++ b/resources/localization/es/PrusaSlicer.mo diff --git a/resources/localization/es/PrusaSlicer_es.po b/resources/localization/es/PrusaSlicer_es.po index f4269f0cc..5ee9598d9 100644 --- a/resources/localization/es/PrusaSlicer_es.po +++ b/resources/localization/es/PrusaSlicer_es.po @@ -7,12 +7,8 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Phrase (phrase.com)\n" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:4124 -======= #: src/slic3r/GUI/Tab.cpp:4707 #, boost-format ->>>>>>> master msgid "" "\"%1%\" is disabled because \"%2%\" is on in \"%3%\" category.\n" "To enable \"%1%\", please switch off \"%2%\"" @@ -20,19 +16,11 @@ msgstr "" "\"%1%\" está desactivado porque \"%2%\" está en la categorÃa \"%3%\".\n" "Para activar \"%1%\", por favor desactiva \"%2%\"" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:249 src/libslic3r/PrintConfig.cpp:828 -#: src/libslic3r/PrintConfig.cpp:1148 src/libslic3r/PrintConfig.cpp:1327 -#: src/libslic3r/PrintConfig.cpp:1390 src/libslic3r/PrintConfig.cpp:1640 -#: src/libslic3r/PrintConfig.cpp:2568 src/libslic3r/PrintConfig.cpp:2805 -#: src/libslic3r/PrintConfig.cpp:2931 -======= #: src/libslic3r/PrintConfig.cpp:464 src/libslic3r/PrintConfig.cpp:1087 #: src/libslic3r/PrintConfig.cpp:1559 src/libslic3r/PrintConfig.cpp:1751 #: src/libslic3r/PrintConfig.cpp:1814 src/libslic3r/PrintConfig.cpp:2065 #: src/libslic3r/PrintConfig.cpp:2124 src/libslic3r/PrintConfig.cpp:3177 #: src/libslic3r/PrintConfig.cpp:3466 src/libslic3r/PrintConfig.cpp:3592 ->>>>>>> master msgid "%" msgstr "%" @@ -133,16 +121,8 @@ msgstr "%1% Preset" msgid "%1% was substituted with %2%" msgstr "%1% fue sustituido con %2%" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI.cpp:330 -msgid "%1% was substituted with %2%" -msgstr "%1% fue sustituido con %2%" - -#: src/slic3r/GUI/MainFrame.cpp:1585 -======= #: src/slic3r/GUI/MainFrame.cpp:1707 #, boost-format ->>>>>>> master msgid "%1% was successfully sliced." msgstr "%1% fue laminado con éxito." @@ -167,10 +147,6 @@ msgstr "%d lÃneas: %.2f mm" msgid "%d presets successfully imported." msgstr "%d ajustes iniciales importados con éxito." -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_App.cpp:718 -#, possible-c-format -======= #: src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:304 #, c-format, boost-format msgid "%d triangles" @@ -178,7 +154,6 @@ msgstr "%d triángulos" #: src/slic3r/GUI/GUI_App.cpp:1126 #, c-format, boost-format ->>>>>>> master msgid "" "%s\n" "Do you want to continue?" @@ -231,23 +206,6 @@ msgstr "%s tiene un aviso" msgid "%s has encountered an error" msgstr "%s ha ocurrido un error" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_App.cpp:528 -#, possible-c-format -msgid "" -"%s has encountered an error. It was likely caused by running out of memory. If you are sure you have enough RAM on your system, this may also be a bug and we would be glad if you reported it.\n" -"\n" -"The application will now terminate." -msgstr "" -"%s ha encontrado un error. Probablemente fue causado por quedarse sin memoria. Si estás seguro de tener suficiente RAM en su sistema, esto también puede ser un error y nos complacerÃa que lo informaras.\n" -"\n" -"La aplicación se cerrará." - -#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:62 -#, possible-c-format -msgid "%s has encountered an error. It was likely caused by running out of memory. If you are sure you have enough RAM on your system, this may also be a bug and we would be glad if you reported it." -msgstr "%s ha encontrado un error. Probablemente fue causado por quedarse sin memoria. Si estás seguro de tener suficiente RAM en su sistema, esto también puede ser un error y nos complacerÃa que lo informaras." -======= #: src/slic3r/GUI/GUI_App.cpp:698 #, c-format, boost-format msgid "" @@ -273,7 +231,6 @@ msgstr "" "%s ha encontrado un error. Probablemente fue causado por quedarse sin " "memoria. Si estás seguro de tener suficiente RAM en su sistema, esto también " "puede ser un error y nos complacerÃa que lo informaras." ->>>>>>> master #: src/slic3r/GUI/UpdateDialogs.cpp:304 #, c-format, boost-format @@ -285,29 +242,6 @@ msgstr "%s no tiene actualizaciones de configuración disponibles." msgid "%s incompatibility" msgstr "%s incompatibilidad" -<<<<<<< HEAD -#: src/slic3r/GUI/MsgDialog.cpp:114 -#, possible-c-format -msgid "%s information" -msgstr "%s información" - -#: src/slic3r/GUI/UpdateDialogs.cpp:270 -#, possible-c-format -msgid "" -"%s now uses an updated configuration structure.\n" -"\n" -"So called 'System presets' have been introduced, which hold the built-in default settings for various printers. These System presets cannot be modified, instead, users now may create their own presets inheriting settings from one of the System presets.\n" -"An inheriting preset may either inherit a particular value from its parent or override it with a customized value.\n" -"\n" -"Please proceed with the %s that follows to set up the new presets and to choose whether to enable automatic preset updates." -msgstr "" -"Ahora %s usa una estructura actualizada para la configuración. \n" -"\n" -"Se han introducido los llamados 'Ajustes del sistema', que tienen valores por defecto para varias impresoras. Estos ajustes del sistema no pueden modificarse, por el contrario, los usuarios pueden crear nuevos ajustes que se basan en alguno de ellos.\n" -"Un ajuste nuevo puede heredar un valor de un ajuste existente o bien tener un nuevo valor personalizado.\n" -"\n" -"Por favof, continúa con el %s que sigue para establecer los nuevos ajustes y seleccionar si quieres que estos se actualicen automáticamente." -======= #: src/slic3r/GUI/MsgDialog.cpp:246 src/slic3r/GUI/MsgDialog.cpp:259 #, c-format, boost-format msgid "%s info" @@ -317,7 +251,6 @@ msgstr "%s info" #, c-format, boost-format msgid "%s information" msgstr "%s información" ->>>>>>> master #: src/slic3r/GUI/UpdateDialogs.cpp:265 #, c-format, boost-format @@ -351,27 +284,10 @@ msgstr "" msgid "%s View Mode" msgstr "%s Tipo de vista" -<<<<<<< HEAD -#: src/slic3r/GUI/UpdateDialogs.cpp:151 -#, possible-c-format -msgid "" -"%s will now start updates. Otherwise it won't be able to start.\n" -"\n" -"Note that a full configuration snapshot will be created first. It can then be restored at any time should there be a problem with the new version.\n" -"\n" -"Updated configuration bundles:" -msgstr "" -"%s comenzará las actualizaciones. De otro modo no podrá comenzar.\n" -"\n" -"Ten en cuenta que primero se creará una copia de seguridad. Puedes volver a ella si en algún momento hay problemas con la nueva versión.\n" -"\n" -"Configuraciones actualizadas:" -======= #: src/slic3r/GUI/MsgDialog.cpp:232 #, c-format, boost-format msgid "%s warning" msgstr "%s aviso" ->>>>>>> master #: src/slic3r/GUI/UpdateDialogs.cpp:160 #, c-format, boost-format @@ -1262,11 +1178,7 @@ msgstr "" "Un objeto tiene reforzadores de soporte personalizados que no se utilizarán " "porque los soportes están desactivados." -<<<<<<< HEAD -#: src/slic3r/GUI/GLCanvas3D.cpp:638 -======= #: src/slic3r/GUI/GLCanvas3D.cpp:6372 ->>>>>>> master msgid "" "An object outside the print area was detected.\n" "Resolve the current problem to continue slicing." @@ -1344,11 +1256,7 @@ msgstr "el archivo es demasiado grande" msgid "Are you sure you want to %1% the selected preset?" msgstr "¿Estás seguro de que deseas %1% el preset seleccionado?" -<<<<<<< HEAD -#: src/slic3r/GUI/FirmwareDialog.cpp:902 -======= #: src/slic3r/GUI/FirmwareDialog.cpp:915 ->>>>>>> master msgid "" "Are you sure you want to cancel firmware flashing?\n" "This could leave your printer in an unusable state!" @@ -1592,22 +1500,6 @@ msgstr "Evitar cruzar perÃmetros - Longitud máxima del desvÃo" msgid "BACK ARROW" msgstr "FLECHA HACIA ATRÃS" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3727 -msgid "" -"BACK ARROW icon indicates that the settings were changed and are not equal to the last saved preset for the current option group.\n" -"Click to reset all settings for the current option group to the last saved preset." -msgstr "" -"El sÃmbolo de FLECHA ATRÃS indica que los ajustes cambiaron y que no son iguales a los que se guardaron para el grupo de opciones actual.\n" -"Haz clic para devolver esos valores a los últimos guardados." - -#: src/slic3r/GUI/Tab.cpp:3741 -msgid "" -"BACK ARROW icon indicates that the value was changed and is not equal to the last saved preset.\n" -"Click to reset current value to the last saved preset." -msgstr "" -"La FLECHA ATRÃS indica que el valor ha cambiado y ya no es el mismo que el guardado la última vez.\n" -======= #: src/slic3r/GUI/Tab.cpp:4291 msgid "" "BACK ARROW icon indicates that the settings were changed and are not equal " @@ -1627,7 +1519,6 @@ msgid "" msgstr "" "La FLECHA ATRÃS indica que el valor ha cambiado y ya no es el mismo que el " "guardado la última vez.\n" ->>>>>>> master "Haz clic para restaurar el valor al último ajuste guardado." #: src/slic3r/GUI/Preferences.cpp:137 @@ -1890,14 +1781,6 @@ msgstr "Relleno de cubos" msgid "buffer too small" msgstr "buffer demasiado pequeño" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_App.cpp:1152 -msgid "" -"But since this version of PrusaSlicer we don't show this information in Printer Settings anymore.\n" -"Settings will be available in physical printers settings." -msgstr "" -"Pero dado que a partir de esta versión de PrusaSlicer ya no mostramos esta información en los ajustes de impresora.\n" -======= #: src/slic3r/GUI/GUI_App.cpp:1660 msgid "" "But since this version of PrusaSlicer we don't show this information in " @@ -1906,22 +1789,12 @@ msgid "" msgstr "" "Pero dado que a partir de esta versión de PrusaSlicer ya no mostramos esta " "información en los ajustes de impresora.\n" ->>>>>>> master "Los ajustes se mostrarán en la configuración de impresora fÃsica." #: src/slic3r/GUI/ButtonsDescription.cpp:62 msgid "Buttons And Text Colors Description" msgstr "Descripción de los botones y de los colores del texto" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_App.cpp:1084 -msgid "" -"By default new Printer devices will be named as \"Printer N\" during its creation.\n" -"Note: This name can be changed later from the physical printers settings" -msgstr "" -"Por defecto, los nuevos dispositivos de impresión se llamarán \"Impresora N\" durante su creación.\n" -"Nota: Este nombre se puede cambiar posteriormente en los ajustes de impresora fÃsica" -======= #: src/slic3r/GUI/GUI_App.cpp:1662 msgid "" "By default new Printer devices will be named as \"Printer N\" during its " @@ -1932,7 +1805,6 @@ msgstr "" "\" durante su creación.\n" "Nota: Este nombre se puede cambiar posteriormente en los ajustes de " "impresora fÃsica" ->>>>>>> master #: src/slic3r/GUI/PresetHints.cpp:191 msgid "by the print profile maximum" @@ -2002,45 +1874,21 @@ msgstr "" "No se puede calcular el ancho de extrusión para %1%: Variable \"%2%\" no " "accesible." -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_ObjectList.cpp:3400 -======= #: src/slic3r/GUI/GUI_ObjectList.cpp:3113 ->>>>>>> master msgid "" "Cannot insert a new layer range after the current layer range.\n" "Current layer range overlaps with the next layer range." msgstr "" -<<<<<<< HEAD -"No se puede insertar un nuevo rango de capas después del rango de capa actual.\n" -"El rango de capa actual se superpone con el siguiente rango de capa." - -#: src/slic3r/GUI/GUI_ObjectList.cpp:3391 -======= "No se puede insertar un nuevo rango de capas después del rango de capa " "actual.\n" "El rango de capa actual se superpone con el siguiente rango de capa." #: src/slic3r/GUI/GUI_ObjectList.cpp:3104 ->>>>>>> master 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 "" -<<<<<<< HEAD -"No se puede insertar un nuevo rango de capas después del rango de capa actual.\n" -"El siguiente rango de capa es demasiado delgado para dividirse en dos\n" -"sin violar la altura mÃnima de la capa." - -#: src/slic3r/GUI/GUI_ObjectList.cpp:3395 -msgid "" -"Cannot insert a new layer range between the current and the next layer range.\n" -"The gap between the current layer range and the next layer range\n" -"is thinner than the minimum layer height allowed." -msgstr "" -"No se puede insertar un nuevo rango de capas entre el rango de capa actual y el siguiente.\n" -======= "No se puede insertar un nuevo rango de capas después del rango de capa " "actual.\n" "El siguiente rango de capa es demasiado delgado para dividirse en dos\n" @@ -2055,7 +1903,6 @@ msgid "" msgstr "" "No se puede insertar un nuevo rango de capas entre el rango de capa actual y " "el siguiente.\n" ->>>>>>> master "La brecha entre el rango de capa actual y el siguiente rango de capa\n" "es más delgada que la altura mÃnima de capa permitida." @@ -2475,17 +2322,6 @@ msgstr "Ayudante de co&nfiguración" msgid "Configuration Assistant" msgstr "Asistente de Configuración" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI.cpp:368 -msgid "Configuration bundle was loaded, however some configuration values were not recognized." -msgstr "Se cargó el paquete de configuración, sin embargo, no se reconocieron algunos valores de configuración." - -#: src/slic3r/GUI/GUI.cpp:378 -msgid "Configuration file \"%1%\" was loaded, however some configuration values were not recognized." -msgstr "Se cargó el archivo de configuración \"%1%\", sin embargo, no se reconocieron algunos valores de configuración." - -#: src/libslic3r/PrintConfig.cpp:1424 -======= #: src/slic3r/GUI/GUI.cpp:355 msgid "" "Configuration bundle was loaded, however some configuration values were not " @@ -2512,7 +2348,6 @@ msgid "Configuration is editing from ConfigWizard" msgstr "La configuración se editada desde ConfigWizard" #: src/libslic3r/PrintConfig.cpp:1848 ->>>>>>> master msgid "Configuration notes" msgstr "Notas de configuración" @@ -2656,23 +2491,6 @@ msgstr "continuar" msgid "Continue" msgstr "Continuar" -<<<<<<< HEAD -#: src/slic3r/Utils/OctoPrint.cpp:185 -msgid "Connection to Prusa SL1 / SL1S works correctly." -msgstr "La conexión con la Prusa SL1 / SL1S funciona correctamente." - -#: src/slic3r/Utils/OctoPrint.cpp:185 -msgid "Connection to Prusa SL1 works correctly." -msgstr "La conexión con la Prusa SL1 funciona correctamente." - -#: src/slic3r/Utils/OctoPrint.cpp:229 -msgid "Connection to PrusaLink works correctly." -msgstr "La conexión con PrusaLink funciona correctamente." - -#: src/libslic3r/PrintConfig.cpp:2051 -msgid "Contact Z distance" -msgstr "Distancia Z de contacto" -======= #: src/slic3r/GUI/GUI_App.cpp:982 msgid "Continue and import newer configuration?" msgstr "¿Continuar e importar una nueva configuración?" @@ -2681,7 +2499,6 @@ msgstr "¿Continuar e importar una nueva configuración?" #: src/slic3r/Utils/PresetUpdater.cpp:662 msgid "Continue and install configuration updates?" msgstr "¿Continuar e instalar las actualizaciones de configuración?" ->>>>>>> master #: src/slic3r/GUI/GUI_App.cpp:2298 #, boost-format @@ -2776,45 +2593,6 @@ msgstr "Copiar al portapapeles" msgid "Copy Version Info" msgstr "Copiar Información de Versión" -<<<<<<< HEAD -#: src/slic3r/Utils/PresetUpdater.cpp:84 -msgid "" -"Copying of file %1% to %2% failed.\n" -"Error message : %3%\n" -"Copying was triggered by function: %4%" -msgstr "" -"Copia del archivo %1% a %2% fallida.\n" -"Mensaje de error : %3%\n" -"La copia fue activada por la función: %4%" - -#: src/slic3r/Utils/PresetUpdater.cpp:91 -msgid "" -"Copying of file %1% to %2% failed. Permissions fail at target file after copying.\n" -"Error message : %3%\n" -"Copying was triggered by function: %4%" -msgstr "" -"Copia del archivo %1% a %2% fallida. Los permisos fallan en el archivo de destino después de copiar. \n" -"Mensaje de error : %3%\n" -"La copia fue activada por la función: %4%" - -#: src/slic3r/Utils/PresetUpdater.cpp:70 -msgid "" -"Copying of file %1% to %2% failed. Permissions fail at target file before copying.\n" -"Error message : %3%\n" -"This error happend during %4% phase." -msgstr "" -"Copia del archivo %1% a %2% fallida. Los permisos fallan en el archivo de destino antes de copiar.\n" -"Mensaje de error : %3%\n" -" Este error ocurrió durante la fase %4%." - -#: src/slic3r/Utils/PresetUpdater.cpp:65 -msgid "Copying of file %1% to %2% failed: %3%" -msgstr "La copia del archivo %1% a %2% falló: %3%" - -#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:156 -msgid "Copying of the temporary G-code has finished but the exported code couldn't be opened during copy check. The output G-code is at %1%.tmp." -msgstr "La copia del código G temporal ha finalizado, pero el código exportado no se pudo abrir durante la verificación de la copia. El código G de salida está en %1%.tmp." -======= #: src/slic3r/Utils/PresetUpdater.cpp:61 #, boost-format msgid "Copying of file %1% to %2% failed: %3%" @@ -2829,7 +2607,6 @@ msgstr "" "La copia del código G temporal ha finalizado, pero el código exportado no se " "pudo abrir durante la verificación de la copia. El código G de salida está " "en %1%.tmp." ->>>>>>> master #: src/slic3r/GUI/BackgroundSlicingProcess.cpp:704 #, boost-format @@ -2845,14 +2622,6 @@ msgstr "" msgid "Copying of the temporary G-code to the output G-code failed" msgstr "Error al copiar el código G temporal al código G de salida" -<<<<<<< HEAD -#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:163 -msgid "" -"Copying of the temporary G-code to the output G-code failed. Maybe the SD card is write locked?\n" -"Error message: %1%" -msgstr "" -"Error al copiar el código G temporal en el código G de salida. ¿Quizás la tarjeta SD está bloqueada contra escritura?\n" -======= #: src/slic3r/GUI/BackgroundSlicingProcess.cpp:695 #, boost-format msgid "" @@ -2862,7 +2631,6 @@ msgid "" msgstr "" "Error al copiar el código G temporal en el código G de salida. ¿Quizás la " "tarjeta SD está bloqueada contra escritura?\n" ->>>>>>> master "Mensaje de error: %1%" #: src/slic3r/GUI/BackgroundSlicingProcess.cpp:698 @@ -2935,12 +2703,6 @@ msgstr "No puedo conectar con OctoPrint" msgid "Could not connect to Prusa SLA" msgstr "No se pudo conectar con la Prusa SLA" -<<<<<<< HEAD -#: src/slic3r/Utils/OctoPrint.cpp:235 -msgid "Could not connect to PrusaLink" -msgstr "No se pudo conectar con PrusaLink" - -======= #: src/slic3r/Utils/OctoPrint.cpp:342 msgid "Could not connect to PrusaLink" msgstr "No se pudo conectar con PrusaLink" @@ -2949,7 +2711,6 @@ msgstr "No se pudo conectar con PrusaLink" msgid "Could not connect to Repetier" msgstr "No se ha podido conectar con Repetier" ->>>>>>> master #: src/slic3r/Utils/Http.cpp:73 msgid "" "Could not detect system SSL certificate store. PrusaSlicer will be unable to " @@ -3716,22 +3477,9 @@ msgstr "" "Escoge SI si deseas cambiar este valor a %s%%,\n" "o NO si estás seguro que %s %s es el valor correcto." -<<<<<<< HEAD -#: src/slic3r/GUI/Field.cpp:288 -#, possible-c-format -msgid "" -"Do you mean %s%% instead of %s %s?\n" -"Select YES if you want to change this value to %s%%, \n" -"or NO if you are sure that %s %s is a correct value." -msgstr "" -"¿Quieres decir %s%% en vez de %s %s?\n" -"Escoge SI si deseas cambiar este valor a %s%%,\n" -"o NO si estás seguro que %s %s es el valor correcto." -======= #: src/slic3r/GUI/ConfigWizard.cpp:2625 msgid "Do you want to continue changing the configuration?" msgstr "¿Quieres seguir cambiando la configuración?" ->>>>>>> master #: src/slic3r/GUI/DoubleSlider.cpp:2535 msgid "Do you want to delete all saved tool changes?" @@ -3774,13 +3522,6 @@ msgstr "no contiene gcode válido." msgid "Don't arrange" msgstr "No organizar" -<<<<<<< HEAD -# Don't install -msgid "Don't install" -msgstr "No instalar" - -#: src/slic3r/GUI/UpdateDialogs.cpp:71 -======= #: src/slic3r/GUI/GUI_App.cpp:974 msgid "Don't import" msgstr "No importar" @@ -3790,7 +3531,6 @@ msgid "Don't install" msgstr "No instalar" #: src/slic3r/GUI/UpdateDialogs.cpp:72 ->>>>>>> master msgid "Don't notify about new releases any more" msgstr "No quiero recibir avisos de nuevas versiones" @@ -4731,13 +4471,6 @@ msgstr "Capas descoloridas" msgid "failed finding central directory" msgstr "búsqueda de directorio central fallida" -<<<<<<< HEAD -#: src/slic3r/GUI/Plater.cpp:2399 -msgid "Failed loading file \"%1%\" due to an invalid configuration." -msgstr "Error al cargar el archivo \"%1%\" debido a una configuración no válida." - -#: src/slic3r/Utils/FixModelByWin10.cpp:235 -======= #: src/slic3r/GUI/Plater.cpp:2516 #, boost-format msgid "Failed loading file \"%1%\" due to an invalid configuration." @@ -4745,7 +4478,6 @@ msgstr "" "Error al cargar el archivo \"%1%\" debido a una configuración no válida." #: src/slic3r/Utils/FixModelByWin10.cpp:237 ->>>>>>> master msgid "Failed loading the input model." msgstr "No se pudo cargar el modelo de entrada." @@ -5243,37 +4975,22 @@ msgid "For support enforcers only" msgstr "Sólo para forzado de soportes" #. TRN Description for "WHITE BULLET" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3702 -======= #: src/slic3r/GUI/Tab.cpp:4266 ->>>>>>> master msgid "" "for the left button: indicates a non-system (or non-default) preset,\n" "for the right button: indicates that the settings hasn't been modified." msgstr "" -<<<<<<< HEAD -"para el botón izquierdo: indica un preajuste que no es del sistema (o no predeterminado),\n" -"para el botón derecho: indica que la configuración no se ha modificado." - -#: src/slic3r/GUI/ConfigManipulation.cpp:135 -======= "para el botón izquierdo: indica un ajuste que no es del sistema (o no " "predeterminado),\n" "para el botón derecho: indica que la configuración no se ha modificado." #: src/slic3r/GUI/ConfigManipulation.cpp:142 ->>>>>>> master msgid "" "For the Wipe Tower to work with the soluble supports, the support layers\n" "need to be synchronized with the object layers." msgstr "" -<<<<<<< HEAD -"Para que la Torre de Limpieza funcione con los soportes solubles, las capas de soporte\n" -======= "Para que la Torre de Limpieza funcione con los soportes solubles, las capas " "de soporte\n" ->>>>>>> master "deben sincronizarse con las capas de objetos." #: src/libslic3r/Print.cpp:594 @@ -5405,21 +5122,13 @@ msgstr "g" msgid "G-code" msgstr "Código G" -<<<<<<< HEAD -#: src/slic3r/GUI/DoubleSlider.cpp:1146 -======= #: src/slic3r/GUI/DoubleSlider.cpp:1482 ->>>>>>> master msgid "" "G-code associated to this tick mark is in a conflict with print mode.\n" "Editing it will cause changes of Slider data." msgstr "" -<<<<<<< HEAD -"El código G asociado a esta marca de verificación está en conflicto con el modo de impresión.\n" -======= "El código G asociado a esta marca de verificación está en conflicto con el " "modo de impresión.\n" ->>>>>>> master "Su edición provocará cambios en los datos del Slider." #: src/slic3r/GUI/BackgroundSlicingProcess.cpp:715 @@ -5890,13 +5599,6 @@ msgstr "Nombre del equipo" msgid "Hostname, IP or URL" msgstr "Nombre de equipo, IP o URL" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:210 -msgid "" -"Hover the cursor over buttons to find more information \n" -"or click this button." -msgstr "Sitúa el cursos sobre los botones para más información o haz clic en este botón." -======= #: src/slic3r/GUI/Tab.cpp:223 msgid "" "Hover the cursor over buttons to find more information \n" @@ -5904,7 +5606,6 @@ msgid "" msgstr "" "Sitúa el cursos sobre los botones para más información o haz clic en este " "botón." ->>>>>>> master #: src/libslic3r/PrintConfig.cpp:3637 msgid "How far should the pad extend around the contained geometry" @@ -5971,11 +5672,6 @@ msgstr "Tamaño del icono respecto al tamaño original" msgid "ID" msgstr "ID" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2015 -msgid "If checked, supports will be generated automatically based on the overhang threshold value. If unchecked, supports will be generated inside the \"Support Enforcer\" volumes only." -msgstr "Si se marca, los soportes se generarán automáticamente según el valor del umbral de voladizo. Si no se selecciona, los apoyos se generarán solo dentro de los volúmenes \"Forzado de Soportes\"." -======= #: src/libslic3r/PrintConfig.cpp:2511 msgid "" "If checked, supports will be generated automatically based on the overhang " @@ -5985,7 +5681,6 @@ msgstr "" "Si se marca, los soportes se generarán automáticamente según el valor del " "umbral de voladizo. Si no se selecciona, los apoyos se generarán solo dentro " "de los volúmenes \"Forzado de Soportes\"." ->>>>>>> master #: src/slic3r/GUI/ConfigWizard.cpp:1218 #, c-format, boost-format @@ -6018,15 +5713,6 @@ msgid "If enabled, a repetition of the next random color will be allowed." msgstr "" "Si se activa, se permitirá la repetición del siguiente color aleatorio." -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigWizard.cpp:1164 -msgid "" -"If enabled, allows the Reload from disk command to automatically find and load the files when invoked.\n" -"If not enabled, the Reload from disk command will ask to select each file using an open file dialog." -msgstr "" -"Si está activado, permite que la orden de Recarga desde el disco encuentre y cargue los archivos al invocarla. \n" -"Si no está activado, la orden de Recarga desde el disco te pedirá que selecciones cada archivo en un cuadro de abrir archivo." -======= #: src/libslic3r/PrintConfig.cpp:2466 msgid "" "If enabled, all printing extruders will be primed at the front edge of the " @@ -6034,7 +5720,6 @@ msgid "" msgstr "" "Si está habilitado, todos los extrusores de impresión estarán cebados en el " "borde frontal de la cama de impresión al comienzo de la impresión." ->>>>>>> master #: src/slic3r/GUI/ConfigWizard.cpp:1250 msgid "" @@ -6531,19 +6216,9 @@ msgstr "La importación del archivo 3mf reparado ha fallado" msgid "Import profile only" msgstr "Importar perfil únicamente" -<<<<<<< HEAD -#: src/slic3r/GUI/MainFrame.cpp:1000 -msgid "Import SL1 / SL1S archive" -msgstr "Importar archivo SL1 / SL1S" - -#: src/slic3r/GUI/MainFrame.cpp:1050 -msgid "Import SL1 archive" -msgstr "Importar archivo SL1" -======= #: src/slic3r/GUI/MainFrame.cpp:1209 msgid "Import SL1 / SL1S Archive" msgstr "Importar Archivo SL1 / SL1S" ->>>>>>> master #: src/slic3r/GUI/Plater.cpp:1684 msgid "Import SLA archive" @@ -6616,15 +6291,6 @@ msgid "Increase/decrease edit area" msgstr "Incrementar/reducir area edición" #. TRN Description for "UNLOCKED LOCK" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3695 -msgid "" -"indicates that some settings were changed and are not equal to the system (or default) values for the current option group.\n" -"Click the UNLOCKED LOCK icon to reset all settings for current option group to the system (or default) values." -msgstr "" -"indica que se modificaron algunas configuraciones y no son iguales a los valores del sistema (o predeterminados) para el grupo de opciones actual.\n" -"Haz clic en el icono CANDADO DESBLOQUEADO para restablecer todos los ajustes del grupo de opciones actual a los valores del sistema (o predeterminados)." -======= #: src/slic3r/GUI/Tab.cpp:4259 msgid "" "indicates that some settings were changed and are not equal to the system " @@ -6636,7 +6302,6 @@ msgstr "" "valores del sistema (o predeterminados) para el grupo de opciones actual.\n" "Haz clic en el icono CANDADO DESBLOQUEADO para restablecer todos los ajustes " "del grupo de opciones actual a los valores del sistema (o predeterminados)." ->>>>>>> master #. TRN Description for "LOCKED LOCK" #: src/slic3r/GUI/Tab.cpp:4255 @@ -6648,27 +6313,6 @@ msgstr "" "defecto) para el grupo de opciones actual" #. TRN Description for "BACK ARROW" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3707 -msgid "" -"indicates that the settings were changed and are not equal to the last saved preset for the current option group.\n" -"Click the BACK ARROW icon to reset all settings for the current option group to the last saved preset." -msgstr "" -"indica que los ajustes cambiaron y no son iguales que los ajustes grabados la última vez para el grupo de opciones actual.\n" -"Haz clic en el sÃmbolo de FLECHA ATRÃS para resetear todos los ajustes del grupo de opciones actual a los grabados la vez anterior." - -#: src/slic3r/GUI/ConfigManipulation.cpp:210 -#: src/slic3r/GUI/GUI_ObjectList.cpp:35 src/slic3r/GUI/GUI_ObjectList.cpp:93 -#: src/slic3r/GUI/GUI_ObjectList.cpp:652 src/slic3r/GUI/Plater.cpp:393 -#: src/slic3r/GUI/Tab.cpp:1413 src/slic3r/GUI/Tab.cpp:1414 -#: src/libslic3r/PrintConfig.cpp:237 src/libslic3r/PrintConfig.cpp:450 -#: src/libslic3r/PrintConfig.cpp:472 src/libslic3r/PrintConfig.cpp:812 -#: src/libslic3r/PrintConfig.cpp:826 src/libslic3r/PrintConfig.cpp:863 -#: src/libslic3r/PrintConfig.cpp:1025 src/libslic3r/PrintConfig.cpp:1035 -#: src/libslic3r/PrintConfig.cpp:1053 src/libslic3r/PrintConfig.cpp:1072 -#: src/libslic3r/PrintConfig.cpp:1091 src/libslic3r/PrintConfig.cpp:1843 -#: src/libslic3r/PrintConfig.cpp:1860 -======= #: src/slic3r/GUI/Tab.cpp:4271 msgid "" "indicates that the settings were changed and are not equal to the last saved " @@ -6691,7 +6335,6 @@ msgstr "" #: src/libslic3r/PrintConfig.cpp:1385 src/libslic3r/PrintConfig.cpp:1454 #: src/libslic3r/PrintConfig.cpp:1474 src/libslic3r/PrintConfig.cpp:1493 #: src/libslic3r/PrintConfig.cpp:2314 src/libslic3r/PrintConfig.cpp:2331 ->>>>>>> master msgid "Infill" msgstr "Relleno" @@ -6742,17 +6385,12 @@ msgstr "Tiempo de exposición inicial" msgid "Initial layer height" msgstr "Altura de la capa inicial" -<<<<<<< HEAD -#: src/slic3r/GUI/Field.cpp:269 -#, possible-c-format -======= #: src/libslic3r/PrintConfig.cpp:514 msgid "Inner brim only" msgstr "Sólo el borde interior" #: src/slic3r/GUI/Field.cpp:266 #, c-format, boost-format ->>>>>>> master msgid "" "Input value is out of range\n" "Are you sure that %s is a correct value and that you want to continue?" @@ -6803,19 +6441,9 @@ msgstr "Inspeccionar / activar instantáneas de configuración" msgid "Install" msgstr "Instalar" -<<<<<<< HEAD -#: src/slic3r/GUI/UpdateDialogs.cpp:136 -msgid "Install" -msgstr "Instalar" - -#: src/slic3r/GUI/ObjectDataViewModel.cpp:62 -#: src/slic3r/GUI/ObjectDataViewModel.cpp:218 -#, possible-c-format -======= #: src/slic3r/GUI/ObjectDataViewModel.cpp:98 #: src/slic3r/GUI/ObjectDataViewModel.cpp:266 #, c-format, boost-format ->>>>>>> master msgid "Instance %d" msgstr "Instancia %d" @@ -7005,13 +6633,8 @@ msgstr "Jitter" msgid "Jump to height" msgstr "Salta a la altura" -<<<<<<< HEAD -#: src/slic3r/GUI/DoubleSlider.cpp:1223 -#, possible-c-format -======= #: src/slic3r/GUI/DoubleSlider.cpp:1391 #, c-format, boost-format ->>>>>>> master msgid "" "Jump to height %s\n" "or Set ruler mode" @@ -7019,13 +6642,8 @@ msgstr "" "Salta a la altura %s\n" "o Fija el modo regla" -<<<<<<< HEAD -#: src/slic3r/GUI/DoubleSlider.cpp:1220 -#, possible-c-format -======= #: src/slic3r/GUI/DoubleSlider.cpp:1388 #, c-format, boost-format ->>>>>>> master msgid "" "Jump to height %s\n" "Set ruler mode\n" @@ -7273,19 +6891,9 @@ msgstr "Cargar un modelo" msgid "Load an model saved with imperial units" msgstr "Cargar un modelo guardado con unidades imperiales" -<<<<<<< HEAD -#: src/slic3r/GUI/MainFrame.cpp:1000 -msgid "Load an SL1 / Sl1S archive" -msgstr "Cargar un archivo SL1 / SL1S" - -#: src/slic3r/GUI/MainFrame.cpp:1058 -msgid "Load an SL1 archive" -msgstr "Cargar un archivo SL1" -======= #: src/slic3r/GUI/MainFrame.cpp:1209 msgid "Load an SL1 / Sl1S archive" msgstr "Cargar un archivo SL1 / SL1S" ->>>>>>> master #: src/libslic3r/PrintConfig.cpp:4454 msgid "" @@ -7829,13 +7437,10 @@ msgstr "" #: src/libslic3r/SLAPrintSteps.cpp:66 msgid "Merging slices and calculating statistics" msgstr "Mezclando laminados y calculando estadÃsticas" -<<<<<<< HEAD -======= #: src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:67 msgid "Mesh name" msgstr "Nombre de la malla" ->>>>>>> master #: src/slic3r/Utils/FixModelByWin10.cpp:250 msgid "Mesh repair failed." @@ -8211,13 +7816,6 @@ msgstr "Monotónico" msgid "More" msgstr "Más" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI.cpp:339 -msgid "Most likely the configuration was produced by a newer version of PrusaSlicer or by some PrusaSlicer fork." -msgstr "Lo más probable es que la configuración haya sido producida por una versión más reciente de PrusaSlicer o por algún fork de PrusaSlicer." - -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1219 -======= #: src/slic3r/GUI/GUI.cpp:326 msgid "" "Most likely the configuration was produced by a newer version of PrusaSlicer " @@ -8227,7 +7825,6 @@ msgstr "" "más reciente de PrusaSlicer o por algún fork de PrusaSlicer." #: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1224 ->>>>>>> master msgid "Mouse wheel" msgstr "Rueda del ratón" @@ -8337,11 +7934,7 @@ msgstr "" msgid "Multiple Extruders" msgstr "Múltiples Extrusores" -<<<<<<< HEAD -#: src/slic3r/GUI/Plater.cpp:2372 -======= #: src/slic3r/GUI/Plater.cpp:2648 ->>>>>>> master msgid "" "Multiple objects were loaded for a multi-material printer.\n" "Instead of considering them as multiple objects, should I consider\n" @@ -8442,20 +8035,12 @@ msgstr "Nuevo proyecto" msgid "New project, clear plater" msgstr "Nuevo proyecto, limpiar plataforma" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI.cpp:304 -msgid "new unknown value %1% was changed to default value %2%" -msgstr "el nuevo valor desconocido %1% se cambió al valor predeterminado %2%" - -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:609 -======= #: src/slic3r/GUI/GUI_App.cpp:1203 #, boost-format msgid "New release version %1% is available." msgstr "La nueva versión %1% está disponible." #: src/slic3r/GUI/UnsavedChangesDialog.cpp:832 ->>>>>>> master msgid "New Value" msgstr "Nuevo Valor" @@ -8559,29 +8144,6 @@ msgstr "No encontrado:" msgid "Note" msgstr "Nota" -<<<<<<< HEAD -#: src/slic3r/GUI/MsgDialog.cpp:114 -msgid "Note that" -msgstr "Ten en cuenta que" - -#: src/slic3r/GUI/Tab.cpp:3408 -msgid "Note, that selected preset will be deleted from this/those printer(s) too." -msgstr "Tenga en cuenta que ese ajuste preestablecido seleccionado también se eliminará de esta/esas impresoras." - -#: src/slic3r/GUI/Tab.cpp:3416 -msgid "Note, that this/those printer(s) will be deleted after deleting of the selected preset." -msgstr "Tenga en cuenta que esta(s) impresora(s) se eliminarán después de eliminar el ajuste preestablecido seleccionado." - -#: src/slic3r/GUI/Tab.cpp:2039 -msgid "" -"Note: All parameters from this group are moved to the Physical Printer settings (see changelog).\n" -"\n" -"A new Physical Printer profile is created by clicking on the \"cog\" icon right of the Printer profiles combo box, by selecting the \"Add physical printer\" item in the Printer combo box. The Physical Printer profile editor opens also when clicking on the \"cog\" icon in the Printer settings tab. The Physical Printer profiles are being stored into PrusaSlicer/physical_printer directory." -msgstr "" -"Nota: Todos los parámetros de este grupo se han desplazado a la configuración de Impresora fÃsica (consulte el registro de cambios).\n" -"\n" -"Se crea un nuevo perfil de impresora fÃsica haciendo clic en el icono de \"engranaje\" a la derecha del cuadro combinado de perfiles de impresora, seleccionando el elemento \"Agregar impresora fÃsica\" en el cuadro combinado de impresora. El editor de perfil de Impresora fÃsica también se abre al hacer clic en el icono \"engranaje\" en la pestaña Configuración de impresora. Los perfiles de la impresora fÃsica se almacenan en el directorio PrusaSlicer/physical_printer." -======= #: src/slic3r/GUI/Tab.cpp:3716 msgid "Note, that the selected preset will be deleted from this printer too." msgid_plural "" @@ -8631,7 +8193,6 @@ msgstr "" "abre al hacer clic en el icono \"engranaje\" en la pestaña Configuración de " "impresora. Los perfiles de la impresora fÃsica se almacenan en el directorio " "PrusaSlicer/physical_printer." ->>>>>>> master #: src/slic3r/Utils/AstroBox.cpp:92 msgid "Note: AstroBox version at least 1.1.0 is required." @@ -9109,13 +8670,6 @@ msgstr "" msgid "Open the software releases page in your browser" msgstr "Abre la página de lanzamientos de software en tu navegador" -<<<<<<< HEAD -#: src/slic3r/GUI/UpdateDialogs.cpp:89 -msgid "Opening Configuration Wizard" -msgstr "Abriendo Asistente de Configuración" - -#: src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp:220 src/slic3r/GUI/Plater.cpp:3961 -======= #: src/slic3r/GUI/UpdateDialogs.cpp:94 msgid "Opening Configuration Wizard" msgstr "Abriendo Asistente de Configuración" @@ -9154,7 +8708,6 @@ msgstr "" "objeto para tocar la cama de impresión si no se establece ninguna elevación." #: src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp:505 ->>>>>>> master msgid "Optimize orientation" msgstr "Optimizar la orientación" @@ -9630,15 +9183,6 @@ msgstr "Impresoras fÃsicas" msgid "Pick another vendor supported by %s" msgstr "Elije otro proveedor compatible con% s" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:67 -msgid "Picture sizes to be stored into a .gcode and .sl1 / .sl1s files, in the following format: \"XxY, XxY, ...\"" -msgstr "Tamaños de imagen que se almacenarán en archivos .gcode y .sl1 / .sl1s, en el siguiente formato: \"XxY, XxY, ...\"" - -#: src/libslic3r/PrintConfig.cpp:67 -msgid "Picture sizes to be stored into a .gcode and .sl1 files, in the following format: \"XxY, XxY, ...\"" -msgstr "Tamaños de imagen para almacenar en archivos .gcode y .sl1, en el siguiente formato: \"XxY, XxY, ...\"" -======= #: src/libslic3r/PrintConfig.cpp:257 msgid "" "Picture sizes to be stored into a .gcode and .sl1 / .sl1s files, in the " @@ -9646,7 +9190,6 @@ msgid "" msgstr "" "Tamaños de imagen que se almacenarán en archivos .gcode y .sl1 / .sl1s, en " "el siguiente formato: \"XxY, XxY, ...\"" ->>>>>>> master #: src/libslic3r/PrintConfig.cpp:3483 msgid "Pillar connection mode" @@ -9715,15 +9258,7 @@ msgstr "" "Por favor, guarda tu proyecto y reinicia PrusaSlicer. Estaremos encantados " "de que nos informes del problema." -<<<<<<< HEAD -#: src/slic3r/GUI/GUI.cpp:341 -msgid "Please review the substitutions and adjust them if needed." -msgstr "Revisa las sustituciones y ajústalas si es necesario." - -#: src/slic3r/GUI/Plater.cpp:3089 -======= #: src/slic3r/GUI/Plater.cpp:3620 ->>>>>>> master msgid "Please select the file to reload" msgstr "Por favor selecciona el archivo a volver a cargar" @@ -9890,11 +9425,7 @@ msgstr "Presionar para activar el rectángulo de deselección" msgid "Press to activate selection rectangle" msgstr "Presionar para activar el rectángulo de selección" -<<<<<<< HEAD -#: src/slic3r/GUI/KBShortcutsDialog.cpp:155 -======= #: src/slic3r/GUI/KBShortcutsDialog.cpp:136 ->>>>>>> master msgid "" "Press to select multiple objects\n" "or move multiple objects with mouse" @@ -9902,17 +9433,10 @@ msgstr "" "Presiona para seleccionar objetos múltiples\n" "o mover objetos múltiples con el ratón" -<<<<<<< HEAD -#: src/slic3r/GUI/KBShortcutsDialog.cpp:221 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:222 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:231 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:232 -======= #: src/slic3r/GUI/KBShortcutsDialog.cpp:239 #: src/slic3r/GUI/KBShortcutsDialog.cpp:240 #: src/slic3r/GUI/KBShortcutsDialog.cpp:250 #: src/slic3r/GUI/KBShortcutsDialog.cpp:251 ->>>>>>> master msgid "" "Press to speed up 5 times while moving thumb\n" "with arrow keys or mouse wheel" @@ -10217,17 +9741,6 @@ msgstr "Error de PrusaSlicer" msgid "PrusaSlicer GUI initialization failed" msgstr "Hubo un error al abrir el GUI de PrusaSlicer" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_App.cpp:586 -msgid "" -"PrusaSlicer has encountered a localization error. Please report to PrusaSlicer team, what language was active and in which scenario this issue happened. Thank you.\n" -"\n" -"The application will now terminate." -msgstr "" -"PrusaSlicer ha encontrado un error de localización. Por favor, informa al equipo de PrusaSlicer qué idioma estaba activo y en qué escenario ocurrió este problema. Gracias.\n" -"\n" -"La aplicación terminará ahora." -======= #: src/slic3r/GUI/BackgroundSlicingProcess.cpp:84 #, boost-format msgid "PrusaSlicer has encountered a fatal error: \"%1%\"" @@ -10265,7 +9778,6 @@ msgstr "" #: src/slic3r/GUI/MainFrame.cpp:232 msgid "PrusaSlicer is closing" msgstr "PrusaSlicer se está cerrando" ->>>>>>> master #: src/slic3r/GUI/UpdateDialogs.cpp:95 msgid "" @@ -10287,28 +9799,9 @@ msgstr "" "correctamente, \n" "mientras que la versión %s OpenGL, renderizado %s, vendedor %s fue detectada." -<<<<<<< HEAD -#: src/slic3r/GUI/UpdateDialogs.cpp:90 -msgid "" -"PrusaSlicer is not using the newest configuration available.\n" -"Configuration Wizard may not offer the latest printers, filaments and SLA materials to be installed. " -msgstr "" -"PrusaSlicer no utiliza la configuración más reciente disponible.\n" -"Es posible que el Asistente de Configuración no muestre las últimas impresoras, filamentos y materiales SLA para instalar." - -#: src/slic3r/GUI/OpenGLManager.cpp:259 -#, possible-c-format -msgid "" -"PrusaSlicer requires OpenGL 2.0 capable graphics driver to run correctly, \n" -"while OpenGL version %s, render %s, vendor %s was detected." -msgstr "" -"PrusaSlicer requiere el controlador de gráficos OpenGL 2.0 para que funcione correctamente, \n" -"mientras que la versión %s OpenGL, renderizado %s, vendedor %s fue detectada." -======= #: src/slic3r/GUI/GUI_App.cpp:1329 msgid "PrusaSlicer started after a crash" msgstr "PrusaSlicer se inició después de un bloqueo" ->>>>>>> master #: src/slic3r/GUI/ConfigSnapshotDialog.cpp:60 msgid "PrusaSlicer version" @@ -10318,21 +9811,9 @@ msgstr "Versión PrusaSlicer" msgid "PrusaSlicer will remember your action." msgstr "PrusaSlicer recordará tu acción." -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigWizard.cpp:1174 -msgid "" -"PrusaSlicer's user interfaces comes in three variants:\n" -"Simple, Advanced, and Expert.\n" -"The Simple mode shows only the most frequently used settings relevant for regular 3D printing. The other two offer progressively more sophisticated fine-tuning, they are suitable for advanced and expert users, respectively." -msgstr "" -"Las interfaces de usuario de PrusaSlicer tiene tres variantes:\n" -"Simple, avanzado y experto.\n" -"El modo Simple muestra solo las configuraciones usadas con más frecuencia relevantes para la impresión 3D normal. Los otros dos ofrecen ajustes progresivamente más sofisticados, son adecuados para usuarios avanzados y expertos, respectivamente." -======= #: src/slic3r/GUI/GUI_App.cpp:3074 src/slic3r/GUI/Plater.cpp:1734 msgid "PrusaSlicer will remember your choice." msgstr "PrusaSlicer recordará tu elección." ->>>>>>> master #: src/slic3r/GUI/ConfigWizard.cpp:1274 msgid "" @@ -10449,19 +9930,6 @@ msgstr "Capas de balsa" msgid "Ramming customization" msgstr "Configuración de empuje" -<<<<<<< HEAD -#: src/slic3r/GUI/WipeTowerDialog.cpp:41 -msgid "" -"Ramming denotes the rapid extrusion just before a tool change in a single-extruder MM printer. Its purpose is to properly shape the end of the unloaded filament so it does not prevent insertion of the new filament and can itself be reinserted later. This phase is important and different materials can require different extrusion speeds to get the good shape. For this reason, the extrusion rates during ramming are adjustable.\n" -"\n" -"This is an expert-level setting, incorrect adjustment will likely lead to jams, extruder wheel grinding into filament etc." -msgstr "" -"El empuje señala la extrusión rápida justo antes de un cambio de filamento en una impresora MM de un sólo extrusor. Su propósito es asegurar una forma adecuada para el extremo de filamento que se va a descargar, para que no haya problemas al insertar uno nuevo y para que se pueda volver a insertar este más tarde. Esta fase es importante y diferentes materiales puede precisar diferentes velocidades para obtener la forma correcta. Por este motivo, las velocidades extrusión durante el empuje son ajustables.\n" -"\n" -"Este es un ajuste para expertos, ajustarlo incorrectamente podrá producir atascos, que la rueda del extrusor arañe el filamento, etc." - -#: src/slic3r/GUI/WipeTowerDialog.cpp:91 -======= #: src/slic3r/GUI/WipeTowerDialog.cpp:54 msgid "" "Ramming denotes the rapid extrusion just before a tool change in a single-" @@ -10486,7 +9954,6 @@ msgstr "" "atascos, que la rueda del extrusor arañe el filamento, etc." #: src/slic3r/GUI/WipeTowerDialog.cpp:122 ->>>>>>> master msgid "Ramming line spacing" msgstr "Separación de la linea de empuje" @@ -11248,19 +10715,9 @@ msgstr "Guardar proyecto (3mf)" msgid "Save project as (3mf)" msgstr "Guarda el proyecto como (3mf)" -<<<<<<< HEAD -#: src/slic3r/GUI/Plater.cpp:5337 -msgid "Save SL1 / SL1S file as:" -msgstr "Guardar archivo SL1 / SL1S como:" - -#: src/slic3r/GUI/Plater.cpp:4975 -msgid "Save SL1 file as:" -msgstr "Guardar archivo SL1 como:" -======= #: src/slic3r/GUI/Plater.cpp:5707 msgid "Save SL1 / SL1S file as:" msgstr "Guardar archivo SL1 / SL1S como:" ->>>>>>> master #: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:898 msgid "Save support points?" @@ -11510,11 +10967,7 @@ msgstr "Selecciona que tipo de pad necesitas" msgid "Select what kind of support do you need" msgstr "Selecciona qué clase de soporte necesitas" -<<<<<<< HEAD -#: src/slic3r/GUI/DoubleSlider.cpp:2135 -======= #: src/slic3r/GUI/DoubleSlider.cpp:2532 ->>>>>>> master msgid "" "Select YES if you want to delete all saved tool changes, \n" "NO if you want all tool changes switch to color changes, \n" @@ -11919,18 +11372,6 @@ msgstr "Establecer Instancia No Imprimible" msgid "Set upper thumb as active" msgstr "Establecer el pulgar superior como activo" -<<<<<<< HEAD -#: src/slic3r/GUI/KBShortcutsDialog.cpp:217 -msgid "Set upper thumb to current slider thumb" -msgstr "Coloca el pulgar superior en el control deslizante actual" - -#: src/libslic3r/PrintConfig.cpp:3714 -msgid "" -"Sets logging sensitivity. 0:fatal, 1:error, 2:warning, 3:info, 4:debug, 5:trace\n" -"For example. loglevel=2 logs fatal, error and warning level messages." -msgstr "" -"Ajusta el nivel de avisos: 0:fallo, 1:error, 2:peligro, 3:info, 4:depuración, 5:traza\n" -======= #: src/libslic3r/PrintConfig.cpp:4458 msgid "" "Sets logging sensitivity. 0:fatal, 1:error, 2:warning, 3:info, 4:debug, 5:" @@ -11939,7 +11380,6 @@ msgid "" msgstr "" "Ajusta el nivel de avisos: 0:fallo, 1:error, 2:peligro, 3:info, 4:" "depuración, 5:traza\n" ->>>>>>> master "Por ejemplo. loglevel=2 registrará mensajes de fallo, error y peligro." #: src/slic3r/GUI/BedShapeDialog.cpp:249 src/slic3r/GUI/GCodeViewer.cpp:3705 @@ -12258,17 +11698,6 @@ msgstr "Ajuste para MM con un solo extrusor" msgid "Single Extruder Multi Material" msgstr "Extrusor único Multi Material" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:2101 -msgid "" -"Single Extruder Multi Material is selected, \n" -"and all extruders must have the same diameter.\n" -"Do you want to change the diameter for all extruders to first extruder nozzle diameter value?" -msgstr "" -"Multi Material en extrusor único seleccionado,\n" -"y todos los extrusores deben tener el mismo diámetro.\n" -"¿Deseas cambiar el diámetro de todos los extrusores al valor del diámetro del nozzle del primer extrusor?" -======= #: src/slic3r/GUI/Tab.cpp:2326 msgid "" "Single Extruder Multi Material is selected, \n" @@ -12280,7 +11709,6 @@ msgstr "" "y todos los extrusores deben tener el mismo diámetro.\n" "¿Deseas cambiar el diámetro de todos los extrusores al valor del diámetro " "del nozzle del primer extrusor?" ->>>>>>> master #: src/slic3r/GUI/Tab.cpp:2734 msgid "Single extruder multimaterial parameters" @@ -12326,19 +11754,6 @@ msgstr "Altura de la falda" msgid "Skirt Loops" msgstr "Vueltas de la falda" -<<<<<<< HEAD -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1181 -msgid "SLA gizmo keyboard shortcuts" -msgstr "Herramienta de atajos de teclado SLA" - -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:924 -msgid "SLA gizmo turned off" -msgstr "Herramienta de SLA apagada" - -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:897 -msgid "SLA gizmo turned on" -msgstr "Herramienta de SLA encendida" -======= #: src/slic3r/GUI/GUI_Preview.cpp:248 src/libslic3r/ExtrusionEntity.cpp:327 #: src/libslic3r/ExtrusionEntity.cpp:358 msgid "Skirt/Brim" @@ -12347,7 +11762,6 @@ msgstr "Falda/Balsa" #: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1186 msgid "SLA gizmo keyboard shortcuts" msgstr "Herramienta de atajos de teclado SLA" ->>>>>>> master #: src/slic3r/GUI/ConfigSnapshotDialog.cpp:69 #: src/slic3r/GUI/ConfigWizard.cpp:755 src/slic3r/GUI/GUI.cpp:340 @@ -12398,13 +11812,6 @@ msgstr "Impresoras de tecnologÃa SLA" #: src/slic3r/GUI/GUI_Factories.cpp:461 msgid "Slab" msgstr "Losa" -<<<<<<< HEAD - -#: src/libslic3r/PrintConfig.cpp:1441 -msgid "Slic3r can upload G-code files to a printer host. This field must contain the kind of the host." -msgstr "Slic3r puede subir archivos de código G a un host de impresión. Este campo debe contener el tipo de host." -======= ->>>>>>> master #: src/libslic3r/PrintConfig.cpp:1865 msgid "" @@ -12539,12 +11946,8 @@ msgstr "Lenta" #: src/libslic3r/PrintConfig.cpp:2291 msgid "Slow down if layer print time is below" -<<<<<<< HEAD -msgstr "Disminuir la velocidad si el tiempo de impresión de la capa está por debajo" -======= msgstr "" "Disminuir la velocidad si el tiempo de impresión de la capa está por debajo" ->>>>>>> master #: src/libslic3r/PrintConfig.cpp:3167 msgid "Slow tilt" @@ -12645,16 +12048,6 @@ msgstr "" msgid "Some filaments were uninstalled." msgstr "Se han desinstalado algunos filamentos." -<<<<<<< HEAD -#: src/slic3r/GUI/Plater.cpp:2309 -#, possible-c-format -msgid "" -"Some object(s) in file %s looks like saved in inches.\n" -"Should I consider them as a saved in inches and convert them?" -msgstr "" -"Alguno(s) objetos del archivo %s parecen estar guardados en pulgadas.\n" -"¿DeberÃa considerarlos como guardados en pulgadas y convertirlos?" -======= #: src/libslic3r/PrintConfig.cpp:1321 msgid "" "Some G/M-code commands, including temperature control and others, are not " @@ -12666,7 +12059,6 @@ msgstr "" "otros, no son universales. Configura esta opción en el firmware de tu " "impresora para obtener una salida compatible. El tipo \"Sin extrusión\" " "evita que PrusaSlicer exporte ningún valor de extrusión." ->>>>>>> master #: src/slic3r/GUI/GLCanvas3D.cpp:6370 msgid "Some objects are not visible during editing." @@ -12988,35 +12380,6 @@ msgstr "Comenzar un nuevo proceso de laminado" msgid "Start the application" msgstr "Inicia el programa" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_App.cpp:386 -msgid "" -"Starting with %1% 2.3, configuration directory on Linux has changed (according to XDG Base Directory Specification) to \n" -"%2%.\n" -"\n" -"This directory did not exist yet (maybe you run the new version for the first time).\n" -"However, an old %1% configuration directory was detected in \n" -"%3%.\n" -"\n" -"Consider moving the contents of the old directory to the new location in order to access your profiles, etc.\n" -"Note that if you decide to downgrade %1% in future, it will use the old location again.\n" -"\n" -"What do you want to do now?" -msgstr "" -"Comenzando con %1% 2.3, el directorio de configuración en Linux ha cambiado (de acuerdo con la Especificación de directorio base de XDG) a\n" -"%2%.\n" -"\n" -"Este directorio aún no existÃa (tal vez ejecutes la nueva versión por primera vez).\n" -"Sin embargo, se detectó un directorio de configuración antiguo %1% en\n" -"%3%.\n" -"\n" -"Puedes mover el contenido del directorio antiguo a la nueva ubicación para acceder a tus perfiles, etc.\n" -"Ten en cuenta que si decides retroceder de versión %1% en el futuro, volverás a utilizar la ubicación anterior.\n" -"\n" -"¿Qué quieres hacer ahora?" - -#: src/slic3r/GUI/PrintHostDialogs.cpp:149 -======= #: src/slic3r/GUI/GUI_App.cpp:411 #, boost-format msgid "" @@ -13053,7 +12416,6 @@ msgstr "" "¿Qué quieres hacer ahora?" #: src/slic3r/GUI/PrintHostDialogs.cpp:249 ->>>>>>> master msgid "Status" msgstr "Estado" @@ -13246,21 +12608,13 @@ msgstr "Compatible con tiempos restantes" msgid "Supports stealth mode" msgstr "Soporta modo silencioso" -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigManipulation.cpp:158 -======= #: src/slic3r/GUI/ConfigManipulation.cpp:164 ->>>>>>> master msgid "" "Supports work better, if the following feature is enabled:\n" "- Detect bridging perimeters" msgstr "" -<<<<<<< HEAD -"Los soportes funcionan mejor si la siguiente caracterÃstica está habilitada:\n" -======= "Los soportes funcionan mejor si la siguiente caracterÃstica está " "habilitada:\n" ->>>>>>> master "- Detectar perÃmetros con puentes" #: src/slic3r/GUI/Preferences.cpp:182 @@ -13326,27 +12680,13 @@ msgstr "Cambiar al modo %s" msgid "Switching Presets: Unsaved Changes" msgstr "Cambio de ajustes preestablecidos: Cambios No guardados" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_App.cpp:1608 -======= #: src/slic3r/GUI/GUI_App.cpp:2368 ->>>>>>> master msgid "" "Switching the language will trigger application restart.\n" "You will lose content of the plater." msgstr "" "Cambiar el idioma necesita reiniciar la aplicación.\n" "Perderás todo el contenido situado en la base." -<<<<<<< HEAD - -#: src/slic3r/GUI/WipeTowerDialog.cpp:365 -msgid "" -"Switching to simple settings will discard changes done in the advanced mode!\n" -"\n" -"Do you want to proceed?" -msgstr "" -"¡Cambiar a los ajustes sencillos descartará los cambios realizados en el modo avanzado!\n" -======= #: src/slic3r/GUI/Plater.cpp:4861 #, boost-format @@ -13368,7 +12708,6 @@ msgid "" msgstr "" "¡Cambiar a los ajustes sencillos descartará los cambios realizados en el " "modo avanzado!\n" ->>>>>>> master "\n" "¿Quiere continuar?" @@ -13475,16 +12814,6 @@ msgstr "" msgid "The %s device could not have been found" msgstr "El dispositivo %s no se pudo encontrar" -<<<<<<< HEAD -#: src/slic3r/GUI/FirmwareDialog.cpp:436 -#, possible-c-format -msgid "" -"The %s device was not found.\n" -"If the device is connected, please press the Reset button next to the USB connector ..." -msgstr "" -"No se encontró el dispositivo %s. \n" -"Si el dispositivo está conectado, presione el botón Reset al lado del conector USB ..." -======= #: src/slic3r/GUI/FirmwareDialog.cpp:437 #, c-format, boost-format msgid "" @@ -13495,7 +12824,6 @@ msgstr "" "No se encontró el dispositivo %s. \n" "Si el dispositivo está conectado, presione el botón Reset al lado del " "conector USB ..." ->>>>>>> master #: src/slic3r/GUI/GUI_App.cpp:957 #, boost-format @@ -13522,14 +12850,6 @@ msgid "" msgstr "" "El ajuste personalizado actual se separará del ajuste del sistema principal." -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:925 -msgid "" -"The currently manipulated object is tilted (rotation angles are not multiples of 90°).\n" -"Non-uniform scaling of tilted objects is only possible in the World coordinate system,\n" -"once the rotation is embedded into the object coordinates." -msgstr "El objeto que está manipulando está inclinado (los ángulos de rotación no son múltiplos de 90º). El escalado no uniforme de objetos inclinados sólo es posible en sistema de coordenadas Mundo, una vez que la rotación se ha aplicado a las coordenadas del objeto." -======= #: src/slic3r/GUI/GUI_ObjectManipulation.cpp:980 msgid "" "The currently manipulated object is tilted (rotation angles are not " @@ -13542,7 +12862,6 @@ msgstr "" "son múltiplos de 90º). El escalado no uniforme de objetos inclinados sólo es " "posible en sistema de coordenadas Mundo, una vez que la rotación se ha " "aplicado a las coordenadas del objeto." ->>>>>>> master #: src/libslic3r/PrintConfig.cpp:3551 msgid "The default angle for connecting support sticks and junctions." @@ -13742,19 +13061,9 @@ msgstr "" msgid "the following suffix is not allowed:" msgstr "el siguiente sufijo no está permitido:" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI.cpp:340 -msgid "The following values were substituted:" -msgstr "Se sustituyeron los siguientes valores:" - -#: src/libslic3r/PrintConfig.cpp:3035 -msgid "The gap between the object bottom and the generated pad in zero elevation mode." -msgstr "El espacio entre la parte de debajo del objeto y el pad generado en el modo de cero elevación." -======= #: src/slic3r/GUI/GUI.cpp:327 msgid "The following values were substituted:" msgstr "Se sustituyeron los siguientes valores:" ->>>>>>> master #: src/libslic3r/PrintConfig.cpp:3696 msgid "" @@ -13906,17 +13215,6 @@ msgstr "" "El objeto será elevado por este número de capas y se generará material de " "soporte debajo de él." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2567 -msgid "" -"The percentage of the bed area. \n" -"If the print area exceeds the specified value, \n" -"then a slow tilt will be used, otherwise - a fast tilt" -msgstr "" -"El porcentaje del área de la cama. \n" -"Si el área de impresión excede el valor especificado, \n" -"entonces se utilizará una inclinación lenta, de lo contrario - una inclinación rápida" -======= #: src/libslic3r/PrintConfig.cpp:3464 msgid "" "The percentage of smaller pillars compared to the normal pillar diameter " @@ -13925,7 +13223,6 @@ msgstr "" "El porcentaje de pilares más pequeños en comparación con el diámetro de " "pilar normal que se utilizan en áreas problemáticas donde no cabe un pilar " "normal." ->>>>>>> master #: src/libslic3r/PrintConfig.cpp:3176 msgid "" @@ -14091,25 +13388,6 @@ msgstr "" "El proyecto seleccionado no está disponible.\n" "¿Desea eliminarlo de la lista de proyectos recientes?" -<<<<<<< HEAD -#: src/slic3r/GUI/MainFrame.cpp:1003 -msgid "" -"The selected project is no longer available.\n" -"Do you want to remove it from the recent projects list?" -msgstr "" -"El proyecto seleccionado no está disponible.\n" -"¿Desea eliminarlo de la lista de proyectos recientes?" - -#: src/slic3r/GUI/DoubleSlider.cpp:1121 -msgid "" -"The sequential print is on.\n" -"It's impossible to apply any custom G-code for objects printing sequentually.\n" -"This code won't be processed during G-code generation." -msgstr "" -"La impresión secuencial está activada.\n" -"Es imposible incluir G-code personalizado para piezas que se imprimen secuencialmente.\n" -"Este código no se procesará durante la generación del G-code." -======= #: src/slic3r/GUI/DoubleSlider.cpp:1440 msgid "" "The sequential print is on.\n" @@ -14130,7 +13408,6 @@ msgstr "" "La impresión secuencial está activada.\n" "Es imposible aplicar cualquier código G personalizado para los objetos que " "se imprimen secuencialmente." ->>>>>>> master #: src/slic3r/GUI/ConfigWizard.cpp:1287 msgid "The size of the object can be specified in inches" @@ -14166,31 +13443,10 @@ msgstr "" "retracción (solo se aplica al motor del extrusor). Si se deja a cero, se usa " "la velocidad de retracción." -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigManipulation.cpp:80 -#, possible-c-format -msgid "" -"The Spiral Vase mode requires:\n" -"- one perimeter\n" -"- no top solid layers\n" -"- 0% fill density\n" -"- no support material\n" -"- Ensure vertical shell thickness enabled\n" -"- Detect thin walls disabled" -msgstr "" -"El modo Vaso Espiral necesita:\n" -"-un perÃmetro\n" -"-cero capas de tapa superior\n" -"-0% densidad de relleno\n" -"-sin soportes\n" -"-Comprueba que está activado el espesor de pared vertical\n" -"-Desactiva la detección de paredes finas" -======= #: src/libslic3r/PrintConfig.cpp:2198 msgid "The speed for retractions (it only applies to the extruder motor)." msgstr "" "La velocidad para las retracciones (solo se aplica al motor del extrusor)." ->>>>>>> master #: src/slic3r/GUI/ConfigManipulation.cpp:82 msgid "" @@ -14260,9 +13516,6 @@ msgstr "" "Establecer esto en 0 también evitará que Slic3r use el flujo y la velocidad " "del puente para la primera capa de los objetos." -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:2731 -======= #: src/libslic3r/PrintConfig.cpp:2568 msgid "" "The vertical distance between the object top surface and the support " @@ -14275,18 +13528,13 @@ msgstr "" "contacto superior e inferior." #: src/slic3r/GUI/Tab.cpp:3005 ->>>>>>> master msgid "" "The Wipe option is not available when using the Firmware Retraction mode.\n" "\n" "Shall I disable it in order to enable Firmware Retraction?" -<<<<<<< HEAD -msgstr "La opción Limpiar no está disponible cuando se usa el modo Retracción de firmware. ¿Lo inhabilito para habilitar la Retracción de firmware?" -======= msgstr "" "La opción Limpiar no está disponible cuando se usa el modo Retracción de " "firmware. ¿Lo inhabilito para habilitar la Retracción de firmware?" ->>>>>>> master #: src/libslic3r/Print.cpp:494 msgid "" @@ -14295,16 +13543,6 @@ msgstr "" "La Torre de Limpieza actualmente no es compatible con E volumétrico " "(use_volumetric_e=0)." -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigManipulation.cpp:114 -msgid "" -"The Wipe Tower currently supports the non-soluble supports only\n" -"if they are printed with the current extruder without triggering a tool change.\n" -"(both support_material_extruder and support_material_interface_extruder need to be set to 0)." -msgstr "" -"La Torre de Limpieza actualmente admite los soportes no solubles solo si están impresos con el extrusor actual sin activar un cambio de herramienta. \n" -"(tanto support_material_extruder como support_material_interface_extruder deben configurarse en 0)." -======= #: src/slic3r/GUI/ConfigManipulation.cpp:121 msgid "" "The Wipe Tower currently supports the non-soluble supports only\n" @@ -14318,7 +13556,6 @@ msgstr "" "herramienta. \n" "(tanto support_material_extruder como support_material_interface_extruder " "deben configurarse en 0)." ->>>>>>> master #: src/libslic3r/Print.cpp:598 msgid "" @@ -14416,11 +13653,7 @@ msgstr "" "Hay objetos no imprimibles. Intenta ajustar la configuración de soportes " "para que los objetos se puedan imprimir." -<<<<<<< HEAD -#: src/slic3r/GUI/DoubleSlider.cpp:1155 -======= #: src/slic3r/GUI/DoubleSlider.cpp:1491 ->>>>>>> master msgid "" "There is a color change for extruder that has not been used before.\n" "Check your settings to avoid redundant color changes." @@ -14428,15 +13661,6 @@ msgstr "" "Hay un cambio de color para el extrusor que no se ha usado antes. \n" "Comprueba tus ajustes para evitar cambios de color innecesarios." -<<<<<<< HEAD -#: src/slic3r/GUI/DoubleSlider.cpp:1149 -msgid "" -"There is a color change for extruder that won't be used till the end of print job.\n" -"This code won't be processed during G-code generation." -msgstr "Hay un cambio de color para el extrusor que no será usado hasta el final del trabajo de impresión. Este código no será procesado durante la generación del G-code." - -#: src/slic3r/GUI/DoubleSlider.cpp:1152 -======= #: src/slic3r/GUI/DoubleSlider.cpp:1485 msgid "" "There is a color change for extruder that won't be used till the end of " @@ -14448,7 +13672,6 @@ msgstr "" "del G-code." #: src/slic3r/GUI/DoubleSlider.cpp:1488 ->>>>>>> master msgid "" "There is an extruder change set to the same extruder.\n" "This code won't be processed during G-code generation." @@ -14469,34 +13692,13 @@ msgstr "Puentes gruesos" msgid "This %s version: %s" msgstr "Esta %s versión: %s" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:1244 -msgid "" -"This action is not revertable.\n" -======= #: src/slic3r/GUI/DoubleSlider.cpp:2087 src/slic3r/GUI/Tab.cpp:1322 msgid "" "This action is not revertible.\n" ->>>>>>> master "Do you want to proceed?" msgstr "" "Esta acción no es reversible.\n" "¿Deseas continuar?" -<<<<<<< HEAD - -#: src/libslic3r/PrintConfig.cpp:199 -msgid "This code is inserted between objects when using sequential printing. By default extruder and bed temperature are reset using non-wait command; however if M104, M109, M140 or M190 are detected in this custom code, Slic3r will not add temperature commands. Note that you can use placeholder variables for all Slic3r settings, so you can put a \"M109 S[first_layer_temperature]\" command wherever you want." -msgstr "Este código se inserta entre los objetos cuando se utiliza la impresión secuencial. Por defecto, el extrusor y la temperatura de la cama se reinician utilizando un comando de no espera; sin embargo, si se detectan M104, M109, M140 o M190 en este código personalizado, Slic3r no agregará comandos de temperatura. Tenga en cuenta que puede usar variables de marcador de posición para todas las configuraciones de Slic3r, por lo que puede poner un comando \"M109 S [first_layer_temperature]\" donde lo desee." - -#: src/libslic3r/PrintConfig.cpp:1174 -msgid "This custom code is inserted at every layer change, right after the Z move and before the extruder moves to the first layer point. Note that you can use placeholder variables for all Slic3r settings as well as [layer_num] and [layer_z]." -msgstr "Este código personalizado se inserta en cada cambio de capa, justo después del movimiento Z y antes de que el extrusor se mueva al primer punto de capa. Tenga en cuenta que puede usar variables de marcador de posición para todos los ajustes de Slic3r, asà como [layer_num] y [layer_z]." - -#: src/libslic3r/PrintConfig.cpp:188 -msgid "This custom code is inserted at every layer change, right before the Z move. Note that you can use placeholder variables for all Slic3r settings as well as [layer_num] and [layer_z]." -msgstr "Este código personalizado se inserta en cada cambio de capa, justo antes del movimiento Z. Tenga en cuenta que puede usar variables de marcador de posición para todos los ajustes de Slic3r, asà como [layer_num] y [layer_z]." -======= ->>>>>>> master #: src/slic3r/GUI/DoubleSlider.cpp:2086 msgid "This action will cause deletion of all ticks on vertical slider." @@ -14681,32 +13883,6 @@ msgstr "" "posible de capas para combinar según el diámetro de la boquilla y la altura " "de la capa." -<<<<<<< HEAD -#: src/slic3r/GUI/Plater.cpp:2319 -msgid "" -"This file contains several objects positioned at multiple heights.\n" -"Instead of considering them as multiple objects, should I consider\n" -"this file as a single object having multiple parts?" -msgstr "" -"Este archivo contiene varios objetos posicionados en múltiples alturas. En lugar de considerarlos como objetos múltiples, ¿deberÃa considerar\n" -" este archivo como un único objeto que tiene varias partes?" - -#: src/slic3r/GUI/FirmwareDialog.cpp:332 -#, possible-c-format -msgid "" -"This firmware hex file does not match the printer model.\n" -"The hex file is intended for: %s\n" -"Printer reported: %s\n" -"\n" -"Do you want to continue and flash this hex file anyway?\n" -"Please only continue if you are sure this is the right thing to do." -msgstr "" -"Este archivo hex del firmware no se corresponde con el modelo de impresora. El archivo hex está preparado para: %s\n" -"Esta Impresora: %s\n" -"\n" -"¿Quieres continuar y grabar este archivo hex de todos modos?\n" -"Por favor continúa solo si estás seguro de que es lo correcto." -======= #: src/libslic3r/PrintConfig.cpp:2382 msgid "" "This feature will raise Z gradually while printing a single-walled object in " @@ -14739,7 +13915,6 @@ msgstr "" "Este archivo contiene varios objetos colocados a varias alturas.\n" "En lugar de considerarlos como objetos múltiples, ¿deberÃa cargarse\n" "el archivo como un solo objeto con múltiples partes?" ->>>>>>> master #: src/slic3r/GUI/FirmwareDialog.cpp:333 #, c-format, boost-format @@ -14914,15 +14089,6 @@ msgstr "" "extrusión para lograr una adhesión razonable entre capas. Si se establece en " "0, la altura de la capa se limita al 75% del diámetro de la boquilla." -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:928 -msgid "" -"This operation is irreversible.\n" -"Do you want to proceed?" -msgstr "" -"Esta operación es irreversible. \n" -"¿Deseas continuar?" -======= #: src/libslic3r/PrintConfig.cpp:1822 msgid "" "This is the lowest printable layer height for this extruder and limits the " @@ -14932,7 +14098,6 @@ msgstr "" "Esta es la altura más baja de la capa imprimible para este extrusor y limita " "la resolución para la altura de la capa variable. Los valores tÃpicos están " "entre 0.05 mm y 0.1 mm." ->>>>>>> master #: src/slic3r/GUI/DoubleSlider.cpp:1398 msgid "This is wipe tower layer" @@ -15136,18 +14301,6 @@ msgstr "" "simplificar la creación de los volúmenes totales de purga más abajo." #: src/slic3r/GUI/UpdateDialogs.cpp:216 -<<<<<<< HEAD -#, possible-c-format -msgid "" -"This version of %s is not compatible with currently installed configuration bundles.\n" -"This probably happened as a result of running an older %s after using a newer one.\n" -"\n" -"You may either exit %s and try again with a newer version, or you may re-run the initial configuration. Doing so will create a backup snapshot of the existing configuration before installing files compatible with this %s." -msgstr "" -"Esta versión de %s no es compatible con los grupos de configuraciones instaladas. Esto sucede probablemente por ejecutar una versión de %s después de haber usado una más reciente.\n" -"\n" -"Puedes salir de %s e intentarlo de nuevo con una versión más reciente, o puedes volver a ejecutar la configuración inicial. Al hacerlo se creará una copia de respaldo de la configuración existente antes de instalar la nueva compatible con esta versión de %s." -======= #, c-format, boost-format msgid "" "This version of %s is not compatible with currently installed configuration " @@ -15180,7 +14333,6 @@ msgstr "" "reciente puede ampliar la lista de tipos de firmware soportados. Uno puede " "decidir abandonar o sustituir un valor desconocido con un valor por defecto " "silenciosamente o verbosamente." ->>>>>>> master #: src/libslic3r/PrintConfig.cpp:3234 msgid "" @@ -15475,17 +14627,12 @@ msgstr "Tipo de impresora." msgid "Type:" msgstr "Tipo:" -<<<<<<< HEAD -#: src/slic3r/GUI/OpenGLManager.cpp:275 -#, possible-c-format -======= #: src/libslic3r/SLAPrintSteps.cpp:441 msgid "Unable to drill the current configuration of holes into the model." msgstr "No se puede perforar la configuración actual de agujeros en el modelo." #: src/slic3r/GUI/OpenGLManager.cpp:273 #, c-format, boost-format ->>>>>>> master msgid "" "Unable to load the following shaders:\n" "%s" @@ -15511,9 +14658,6 @@ msgstr "No se puede sustituir con más de un volumen" msgid "Undef" msgstr "Undef" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI.cpp:305 -======= #: src/slic3r/GUI/UnsavedChangesDialog.cpp:1681 msgid "Undef category" msgstr "CategorÃa sin definir" @@ -15523,7 +14667,6 @@ msgid "Undef group" msgstr "Grupo sin definir" #: src/slic3r/GUI/GUI.cpp:292 ->>>>>>> master msgid "Undefined" msgstr "Indefinido" @@ -15611,23 +14754,6 @@ msgstr "Velocidad de descarga al inicio" msgid "UNLOCKED LOCK" msgstr "CANDADO ABIERTO" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3719 -msgid "" -"UNLOCKED LOCK icon indicates that some settings were changed and are not equal to the system (or default) values for the current option group.\n" -"Click to reset all settings for current option group to the system (or default) values." -msgstr "" -"El icono de CANDADO DESBLOQUEADO indica que se cambiaron algunas configuraciones y no son iguales a los valores del sistema (o predeterminados) para el grupo de opciones actual.\n" -"Haz clic para restablecer todas las configuraciones para el grupo de opciones actual a los valores del sistema (o predeterminados)." - -#: src/slic3r/GUI/Tab.cpp:3734 -msgid "" -"UNLOCKED LOCK icon indicates that the value was changed and is not equal to the system (or default) value.\n" -"Click to reset current value to the system (or default) value." -msgstr "" -"El icono de CANDADO DESBLOQUEADO indica que se cambiaron algunas configuraciones y no son iguales a los valores del sistema (o predeterminados).\n" -"Haz clic para reiniciar el valor actual a los del sistema (o predeterminados)" -======= #: src/slic3r/GUI/Tab.cpp:4283 msgid "" "UNLOCKED LOCK icon indicates that some settings were changed and are not " @@ -15655,7 +14781,6 @@ msgstr "" #: src/slic3r/GUI/UnsavedChangesDialog.cpp:771 msgid "Unsaved Changes" msgstr "Cambios No guardados" ->>>>>>> master #: src/slic3r/GUI/KBShortcutsDialog.cpp:157 msgid "Unselect gizmo or clear selection" @@ -16005,20 +15130,14 @@ msgstr "Vista" msgid "View mode" msgstr "Modo de vista" -<<<<<<< HEAD -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:666 -======= #: src/slic3r/GUI/UnsavedChangesDialog.cpp:903 #, boost-format ->>>>>>> master msgid "" "Visit \"Preferences\" and check \"%1%\"\n" "to be asked about unsaved changes again." msgstr "" "Visita \"Preferencias\" y marca\"%1%\"\n" "para que se le pregunte sobre los cambios no guardados nuevamente." -<<<<<<< HEAD -======= #: src/slic3r/GUI/GUI_App.cpp:3076 src/slic3r/GUI/Plater.cpp:1738 #, boost-format @@ -16028,7 +15147,6 @@ msgid "" msgstr "" "Visita \"Preferencias\" y marca\"%1%\"\n" "para cambiar tu elección." ->>>>>>> master #: src/libslic3r/PrintConfig.cpp:4278 msgid "Visualize an already sliced and saved G-code" @@ -16400,38 +15518,21 @@ msgstr "Con protección alrededor del soporte" msgid "World coordinates" msgstr "Coordenadas mundiales" -<<<<<<< HEAD -#: src/slic3r/GUI/UpdateDialogs.cpp:92 -msgid "" -"Would you like to install it?\n" -"\n" -"Note that a full configuration snapshot will be created first. It can then be restored at any time should there be a problem with the new version.\n" -======= #: src/slic3r/GUI/UpdateDialogs.cpp:100 msgid "" "Would you like to install it?\n" "\n" "Note that a full configuration snapshot will be created first. It can then " "be restored at any time should there be a problem with the new version.\n" ->>>>>>> master "\n" "Updated configuration bundles:" msgstr "" "¿Te gustarÃa instalarlo?\n" "\n" -<<<<<<< HEAD -"Ten en cuenta que primero se creará una instantánea de la configuración. Asà que se puede recuperar en cualquier momento en caso de que hubiera algún problema con la nueva versión.\n" -"Updated configuration bundles:" - -#: src/slic3r/GUI/GUI_App.cpp:1802 -msgid "Would you like to stop uploads and close the program?" -msgstr "¿Te gustarÃa detener las subidas y cerrar el programa?" -======= "Ten en cuenta que primero se creará una instantánea de la configuración. Asà " "que se puede recuperar en cualquier momento en caso de que hubiera algún " "problema con la nueva versión.\n" "Updated configuration bundles:" ->>>>>>> master #: src/libslic3r/miniz_extension.cpp:151 msgid "write calledback failed" @@ -16584,17 +15685,6 @@ msgstr "" "No puedes usar el modo de escala no uniforme para la selección de múltiples " "objetos/partes" -<<<<<<< HEAD -#: src/slic3r/GUI/NotificationManager.hpp:459 -msgid "" -"You have just added a G-code for color change, but its value is empty.\n" -"To export the G-code correctly, check the \"Color Change G-code\" in \"Printer Settings > Custom G-code\"" -msgstr "" -"Acabas de añadir un código G para el cambio de color, pero su valor está vacÃo.\n" -"Para exportar el código G correctamente, marca \"Código G Cambio de Color\" in \"Configuración de la Impresora > Código G Personalizado\"" - -#: src/slic3r/GUI/SavePresetDialog.cpp:277 -======= #: src/slic3r/GUI/NotificationManager.hpp:761 msgid "" "You have just added a G-code for color change, but its value is empty.\n" @@ -16608,17 +15698,12 @@ msgstr "" #: src/slic3r/GUI/SavePresetDialog.cpp:283 #, boost-format ->>>>>>> master msgid "" "You have selected physical printer \"%1%\" \n" "with related printer preset \"%2%\"" msgstr "" "Ha seleccionado una impresora fÃsica \"%1%\" \n" -<<<<<<< HEAD -"con preajuste de impresora relacionado \"%2%\"" -======= "con ajuste de impresora relacionado \"%2%\"" ->>>>>>> master #: src/slic3r/GUI/GUI_App.cpp:1656 msgid "" @@ -16635,24 +15720,9 @@ msgstr "Puede que necesites actualizar tu tarjeta de gráficos." msgid "You must install a configuration update." msgstr "Es necesario instalar una actualización de la configuración." -<<<<<<< HEAD -#: src/slic3r/GUI/Preferences.cpp:299 -#, possible-c-format -msgid "You need to restart %s to make the changes effective." -msgstr "Es necesario reiniciar %s para hacer los cambios efectivos." - -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:611 -msgid "You should change the name of your printer device." -msgstr "DeberÃas cambiar el nombre de tu dispositivo de impresión." - -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:468 -msgid "You should to change a name of your printer device. It can't be saved." -msgstr "DeberÃa cambiar el nombre de su dispositivo de impresión. No se puede guardar." -======= #: src/slic3r/GUI/PhysicalPrinterDialog.cpp:634 msgid "You should change the name of your printer device." msgstr "DeberÃas cambiar el nombre de tu dispositivo de impresión." ->>>>>>> master #: src/slic3r/GUI/GUI_ObjectList.cpp:3644 #, c-format, boost-format @@ -16755,31 +15825,9 @@ msgstr "" msgid "Z offset" msgstr "Ajuste en altura Z" -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigManipulation.cpp:59 -msgid "" -"Zero first layer height is not valid.\n" -"\n" -"The first layer height will be reset to 0.01." -msgstr "" -"Cero como la altura de la primera capa no es válido.\n" -"\n" -"La altura de la primera capa se restablecerá a 0.01." - -#: src/slic3r/GUI/ConfigManipulation.cpp:47 -msgid "" -"Zero layer height is not valid.\n" -"\n" -"The layer height will be reset to 0.01." -msgstr "" -"Cero como la altura de capa no es válido.\n" -"\n" -"La altura de capa se restablecerá a 0.01." -======= #: src/libslic3r/PrintConfig.cpp:2896 msgid "Z travel" msgstr "Recorrido en Z" ->>>>>>> master #: src/libslic3r/PrintConfig.cpp:3492 msgid "Zig-Zag" @@ -16816,11 +15864,7 @@ msgstr "Reducir zoom" msgid "Zoom to Bed" msgstr "Zoom a la Cama" -<<<<<<< HEAD -#: src/slic3r/GUI/KBShortcutsDialog.cpp:176 -======= #: src/slic3r/GUI/KBShortcutsDialog.cpp:160 ->>>>>>> master msgid "" "Zoom to selected object\n" "or all objects in scene, if none selected" @@ -16828,19 +15872,11 @@ msgstr "" "Zoom a objetos seleccionados\n" "o a todos los objetos en escena, si no se seleccionó ninguno" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:241 src/libslic3r/PrintConfig.cpp:816 -#: src/libslic3r/PrintConfig.cpp:1748 src/libslic3r/PrintConfig.cpp:1758 -#: src/libslic3r/PrintConfig.cpp:2036 src/libslic3r/PrintConfig.cpp:2191 -#: src/libslic3r/PrintConfig.cpp:2390 src/libslic3r/PrintConfig.cpp:2891 -#: src/libslic3r/PrintConfig.cpp:3012 -======= #: src/libslic3r/PrintConfig.cpp:456 src/libslic3r/PrintConfig.cpp:1075 #: src/libslic3r/PrintConfig.cpp:2232 src/libslic3r/PrintConfig.cpp:2242 #: src/libslic3r/PrintConfig.cpp:2533 src/libslic3r/PrintConfig.cpp:2774 #: src/libslic3r/PrintConfig.cpp:2991 src/libslic3r/PrintConfig.cpp:3552 #: src/libslic3r/PrintConfig.cpp:3673 ->>>>>>> master msgid "°" msgstr "°" diff --git a/resources/localization/fr/PrusaSlicer.mo b/resources/localization/fr/PrusaSlicer.mo Binary files differindex e53f7e089..d2d280e03 100644 --- a/resources/localization/fr/PrusaSlicer.mo +++ b/resources/localization/fr/PrusaSlicer.mo diff --git a/resources/localization/fr/PrusaSlicer_fr.po b/resources/localization/fr/PrusaSlicer_fr.po index f3bed792f..0e32aa260 100644 --- a/resources/localization/fr/PrusaSlicer_fr.po +++ b/resources/localization/fr/PrusaSlicer_fr.po @@ -7,12 +7,8 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Phrase (phrase.com)\n" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:4124 -======= #: src/slic3r/GUI/Tab.cpp:4707 #, boost-format ->>>>>>> master msgid "" "\"%1%\" is disabled because \"%2%\" is on in \"%3%\" category.\n" "To enable \"%1%\", please switch off \"%2%\"" @@ -20,19 +16,11 @@ msgstr "" "\"%1%\" est désactivé car \"%2%\" est activé dans la catégorie \"%3%\".\n" "Pour activer \"%1%\", veuillez désactiver \"%2%\"" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:249 src/libslic3r/PrintConfig.cpp:828 -#: src/libslic3r/PrintConfig.cpp:1148 src/libslic3r/PrintConfig.cpp:1327 -#: src/libslic3r/PrintConfig.cpp:1390 src/libslic3r/PrintConfig.cpp:1640 -#: src/libslic3r/PrintConfig.cpp:2568 src/libslic3r/PrintConfig.cpp:2805 -#: src/libslic3r/PrintConfig.cpp:2931 -======= #: src/libslic3r/PrintConfig.cpp:464 src/libslic3r/PrintConfig.cpp:1087 #: src/libslic3r/PrintConfig.cpp:1559 src/libslic3r/PrintConfig.cpp:1751 #: src/libslic3r/PrintConfig.cpp:1814 src/libslic3r/PrintConfig.cpp:2065 #: src/libslic3r/PrintConfig.cpp:2124 src/libslic3r/PrintConfig.cpp:3177 #: src/libslic3r/PrintConfig.cpp:3466 src/libslic3r/PrintConfig.cpp:3592 ->>>>>>> master msgid "%" msgstr "%" @@ -140,16 +128,8 @@ msgstr "%1% Préréglage" msgid "%1% was substituted with %2%" msgstr "%1% a été substitué avec %2%" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI.cpp:330 -msgid "%1% was substituted with %2%" -msgstr "%1% a été substitué avec %2%" - -#: src/slic3r/GUI/MainFrame.cpp:1585 -======= #: src/slic3r/GUI/MainFrame.cpp:1707 #, boost-format ->>>>>>> master msgid "%1% was successfully sliced." msgstr "%1% a été découpé avec succès." @@ -175,10 +155,6 @@ msgstr "%d lignes : %.2f mm" msgid "%d presets successfully imported." msgstr "%d préréglages importés avec succès." -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_App.cpp:718 -#, possible-c-format -======= #: src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:304 #, c-format, boost-format msgid "%d triangles" @@ -186,7 +162,6 @@ msgstr "%d triangles" #: src/slic3r/GUI/GUI_App.cpp:1126 #, c-format, boost-format ->>>>>>> master msgid "" "%s\n" "Do you want to continue?" @@ -239,23 +214,6 @@ msgstr "%s a un avertissement" msgid "%s has encountered an error" msgstr "%s a rencontré une erreur" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_App.cpp:528 -#, possible-c-format -msgid "" -"%s has encountered an error. It was likely caused by running out of memory. If you are sure you have enough RAM on your system, this may also be a bug and we would be glad if you reported it.\n" -"\n" -"The application will now terminate." -msgstr "" -"%s a rencontré une erreur. Elle a apparemment été provoquée par un manque de mémoire. Si vous êtes certain d'avoir assez de RAM sur votre système, cela peut également être un bug et nous aimerions que vous le signaliez.\n" -"\n" -"L'application va maintenant fermer." - -#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:62 -#, possible-c-format -msgid "%s has encountered an error. It was likely caused by running out of memory. If you are sure you have enough RAM on your system, this may also be a bug and we would be glad if you reported it." -msgstr "%s a rencontré une erreur. Elle a apparemment été provoquée par un manque de mémoire. Si vous êtes certain d'avoir assez de RAM sur votre système, cela peut également être un bug et nous aimerions que vous le signaliez." -======= #: src/slic3r/GUI/GUI_App.cpp:698 #, c-format, boost-format msgid "" @@ -281,7 +239,6 @@ msgstr "" "%s a rencontré une erreur. Elle a apparemment été provoquée par un manque de " "mémoire. Si vous êtes certain d'avoir assez de RAM sur votre système, cela " "peut également être un bug et nous aimerions que vous le signaliez." ->>>>>>> master #: src/slic3r/GUI/UpdateDialogs.cpp:304 #, c-format, boost-format @@ -293,29 +250,6 @@ msgstr "%s n'a aucunes mises à jour de configuration disponibles." msgid "%s incompatibility" msgstr "Incompatibilité de %s" -<<<<<<< HEAD -#: src/slic3r/GUI/MsgDialog.cpp:114 -#, possible-c-format -msgid "%s information" -msgstr "Information de %s" - -#: src/slic3r/GUI/UpdateDialogs.cpp:270 -#, possible-c-format -msgid "" -"%s now uses an updated configuration structure.\n" -"\n" -"So called 'System presets' have been introduced, which hold the built-in default settings for various printers. These System presets cannot be modified, instead, users now may create their own presets inheriting settings from one of the System presets.\n" -"An inheriting preset may either inherit a particular value from its parent or override it with a customized value.\n" -"\n" -"Please proceed with the %s that follows to set up the new presets and to choose whether to enable automatic preset updates." -msgstr "" -"%s utilise à présent une structure de configuration mise à jour.\n" -"\n" -"Il existe à présent des \"préréglages Système\", qui intègrent les réglages par défaut pour les différentes imprimantes. Ces préréglages Système ne peuvent pas être modifiés, mais les utilisateurs peuvent désormais créer leurs propres préréglages héritant des paramètres de l'un des préréglages Système.\n" -"Un tel préréglage peut ainsi hériter d'une valeur particulière de son parent ou la remplacer par une valeur personnalisée.\n" -"\n" -"Veuillez utiliser les %s qui suivent pour paramétrer les nouveaux réglages et éventuellement accepter les mises à jour de réglage automatiques." -======= #: src/slic3r/GUI/MsgDialog.cpp:246 src/slic3r/GUI/MsgDialog.cpp:259 #, c-format, boost-format msgid "%s info" @@ -325,7 +259,6 @@ msgstr "%s info" #, c-format, boost-format msgid "%s information" msgstr "Information de %s" ->>>>>>> master #: src/slic3r/GUI/UpdateDialogs.cpp:265 #, c-format, boost-format @@ -360,27 +293,10 @@ msgstr "" msgid "%s View Mode" msgstr "Mode de Vue de %s" -<<<<<<< HEAD -#: src/slic3r/GUI/UpdateDialogs.cpp:151 -#, possible-c-format -msgid "" -"%s will now start updates. Otherwise it won't be able to start.\n" -"\n" -"Note that a full configuration snapshot will be created first. It can then be restored at any time should there be a problem with the new version.\n" -"\n" -"Updated configuration bundles:" -msgstr "" -"%s va maintenant démarrer les mises à jour. Sinon, il ne pourra pas démarrer.\n" -"\n" -"Notez qu'un instantané complet de la configuration sera créé en premier. Il peut ensuite être restauré à tout moment en cas de problème avec la nouvelle version.\n" -"\n" -"Lots de configuration mis à jour :" -======= #: src/slic3r/GUI/MsgDialog.cpp:232 #, c-format, boost-format msgid "%s warning" msgstr "%s avertissement" ->>>>>>> master #: src/slic3r/GUI/UpdateDialogs.cpp:160 #, c-format, boost-format @@ -1283,11 +1199,7 @@ msgstr "" "Un objet a des générateurs de supports personnalisés qui ne seront pas " "utilisés car les supports sont désactivés." -<<<<<<< HEAD -#: src/slic3r/GUI/GLCanvas3D.cpp:638 -======= #: src/slic3r/GUI/GLCanvas3D.cpp:6372 ->>>>>>> master msgid "" "An object outside the print area was detected.\n" "Resolve the current problem to continue slicing." @@ -1366,11 +1278,7 @@ msgstr "l'archive est trop volumineuse" msgid "Are you sure you want to %1% the selected preset?" msgstr "Êtes-vous sûr de vouloir %1% le préréglage sélectionné ?" -<<<<<<< HEAD -#: src/slic3r/GUI/FirmwareDialog.cpp:902 -======= #: src/slic3r/GUI/FirmwareDialog.cpp:915 ->>>>>>> master msgid "" "Are you sure you want to cancel firmware flashing?\n" "This could leave your printer in an unusable state!" @@ -1617,22 +1525,6 @@ msgstr "Éviter de croiser les périmètres - Longueur de détour maximum" msgid "BACK ARROW" msgstr "FLÈCHE ARRIÈRE" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3727 -msgid "" -"BACK ARROW icon indicates that the settings were changed and are not equal to the last saved preset for the current option group.\n" -"Click to reset all settings for the current option group to the last saved preset." -msgstr "" -"L'icône FLÈCHE ARRIÈRE indique que les paramètres ont été changés et qu'ils ne sont pas identiques au dernier préréglage enregistré du groupe d'options en cours.\n" -"Cliquez pour restaurer tous les paramètres du groupe d'options en cours avec les valeurs du dernier préréglage enregistré." - -#: src/slic3r/GUI/Tab.cpp:3741 -msgid "" -"BACK ARROW icon indicates that the value was changed and is not equal to the last saved preset.\n" -"Click to reset current value to the last saved preset." -msgstr "" -"L'icône FLÈCHE ARRIÈRE indique que la valeur a été changée et qu'elle n'est pas identique au dernier préréglage enregistré.\n" -======= #: src/slic3r/GUI/Tab.cpp:4291 msgid "" "BACK ARROW icon indicates that the settings were changed and are not equal " @@ -1654,7 +1546,6 @@ msgid "" msgstr "" "L'icône FLÈCHE ARRIÈRE indique que la valeur a été changée et qu'elle n'est " "pas identique au dernier préréglage enregistré.\n" ->>>>>>> master "Cliquez pour restaurer la valeur à celle du dernier préréglage enregistré." #: src/slic3r/GUI/Preferences.cpp:137 @@ -1820,8 +1711,6 @@ msgstr "Vue du Dessous" #: src/slic3r/GUI/GUI_Factories.cpp:505 msgid "Box" msgstr "Boîte" -<<<<<<< HEAD -======= #: resources/data/hints.ini: [hint:Box selection] msgid "" @@ -1833,7 +1722,6 @@ msgstr "" "Saviez-vous que vous pouvez faire une sélection en boîte avec Maj.+Glisser " "la souris? Vous pouvez également désélectionner des objets avec <b>Alt" "+Glisser la souris</b> ." ->>>>>>> master #: src/libslic3r/PrintConfig.cpp:442 msgid "Bridge" @@ -1921,14 +1809,6 @@ msgstr "Pot de peinture" msgid "buffer too small" msgstr "buffer trop petit" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_App.cpp:1152 -msgid "" -"But since this version of PrusaSlicer we don't show this information in Printer Settings anymore.\n" -"Settings will be available in physical printers settings." -msgstr "" -"Mais depuis cette version de PrusaSlicer, nous ne montrons plus ces informations dans les Réglages de l'imprimante.\n" -======= #: src/slic3r/GUI/GUI_App.cpp:1660 msgid "" "But since this version of PrusaSlicer we don't show this information in " @@ -1937,22 +1817,12 @@ msgid "" msgstr "" "Mais depuis cette version de PrusaSlicer, nous ne montrons plus ces " "informations dans les Réglages de l'imprimante.\n" ->>>>>>> master "Les réglages seront disponibles dans les réglages des imprimantes physiques." #: src/slic3r/GUI/ButtonsDescription.cpp:62 msgid "Buttons And Text Colors Description" msgstr "Description des Boutons et des Couleurs de Texte" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_App.cpp:1084 -msgid "" -"By default new Printer devices will be named as \"Printer N\" during its creation.\n" -"Note: This name can be changed later from the physical printers settings" -msgstr "" -"Par défaut, les nouvelles imprimantes seront nommées \"Imprimante N\" lors de leur création.\n" -"Remarque : ce nom peut être modifié ultérieurement dans les réglages des imprimantes physiques" -======= #: src/slic3r/GUI/GUI_App.cpp:1662 msgid "" "By default new Printer devices will be named as \"Printer N\" during its " @@ -1963,7 +1833,6 @@ msgstr "" "de leur création.\n" "Remarque : ce nom peut être modifié ultérieurement dans les réglages des " "imprimantes physiques" ->>>>>>> master #: src/slic3r/GUI/PresetHints.cpp:191 msgid "by the print profile maximum" @@ -2033,45 +1902,21 @@ msgstr "" "Impossible de calculer la largeur d'extrusion pour %1% : la variable \"%2%\" " "n'est pas accessible." -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_ObjectList.cpp:3400 -======= #: src/slic3r/GUI/GUI_ObjectList.cpp:3113 ->>>>>>> master msgid "" "Cannot insert a new layer range after the current layer range.\n" "Current layer range overlaps with the next layer range." msgstr "" -<<<<<<< HEAD -"Impossible d'insérer une nouvelle zone de couche après la zone de couche actuelle.\n" -"La zone de couche actuelle chevauche la prochaine zone de couche." - -#: src/slic3r/GUI/GUI_ObjectList.cpp:3391 -======= "Impossible d'insérer une nouvelle zone de couche après la zone de couche " "actuelle.\n" "La zone de couche actuelle chevauche la prochaine zone de couche." #: src/slic3r/GUI/GUI_ObjectList.cpp:3104 ->>>>>>> master 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 "" -<<<<<<< HEAD -"Impossible d'insérer une nouvelle zone de couche après la zone de couche actuelle.\n" -"La zone de couche suivante est trop fine pour être séparée en deux sans enfreindre la hauteur de couche minimum." - -#: src/slic3r/GUI/GUI_ObjectList.cpp:3395 -msgid "" -"Cannot insert a new layer range between the current and the next layer range.\n" -"The gap between the current layer range and the next layer range\n" -"is thinner than the minimum layer height allowed." -msgstr "" -"Impossible d'insérer une nouvelle zone de couche entre l'actuelle et la prochaine.\n" -"L'espace entre la zone de couche actuelle et la prochaine est inférieur à la hauteur de couche minimum autorisée." -======= "Impossible d'insérer une nouvelle zone de couche après la zone de couche " "actuelle.\n" "La zone de couche suivante est trop fine pour être séparée en deux sans " @@ -2088,7 +1933,6 @@ msgstr "" "prochaine.\n" "L'espace entre la zone de couche actuelle et la prochaine est inférieur à la " "hauteur de couche minimum autorisée." ->>>>>>> master #: src/slic3r/GUI/SavePresetDialog.cpp:122 msgid "Cannot overwrite a system profile." @@ -2511,17 +2355,6 @@ msgstr "Assistant de Co&nfiguration" msgid "Configuration Assistant" msgstr "Assistant de Configuration" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI.cpp:368 -msgid "Configuration bundle was loaded, however some configuration values were not recognized." -msgstr "L'ensemble de configuration a été chargé, mais certaines valeurs de configuration n'ont pas été reconnues." - -#: src/slic3r/GUI/GUI.cpp:378 -msgid "Configuration file \"%1%\" was loaded, however some configuration values were not recognized." -msgstr "Le fichier de configuration \"%1%\" a été chargé, cependant certaines valeurs de configuration n'ont pas été reconnues." - -#: src/libslic3r/PrintConfig.cpp:1424 -======= #: src/slic3r/GUI/GUI.cpp:355 msgid "" "Configuration bundle was loaded, however some configuration values were not " @@ -2548,7 +2381,6 @@ msgid "Configuration is editing from ConfigWizard" msgstr "La configuration est modifiée dans l'Assistant de Configuration" #: src/libslic3r/PrintConfig.cpp:1848 ->>>>>>> master msgid "Configuration notes" msgstr "Notes de configuration" @@ -2674,23 +2506,6 @@ msgid "Connection to printers connected via the print host failed." msgstr "" "La connexion aux imprimantes connectées via l'hôte d'impression a échoué." -<<<<<<< HEAD -#: src/slic3r/Utils/OctoPrint.cpp:185 -msgid "Connection to Prusa SL1 / SL1S works correctly." -msgstr "La connexion à à la Prusa SL1 / SL1S fonctionne correctement." - -#: src/slic3r/Utils/OctoPrint.cpp:185 -msgid "Connection to Prusa SL1 works correctly." -msgstr "La connexion avec Prusa SL1 fonctionne correctement." - -#: src/slic3r/Utils/OctoPrint.cpp:229 -msgid "Connection to PrusaLink works correctly." -msgstr "La connexion à PrusaLink fonctionne correctement." - -#: src/libslic3r/PrintConfig.cpp:2051 -msgid "Contact Z distance" -msgstr "Distance de contact Z" -======= #: src/slic3r/Utils/OctoPrint.cpp:292 msgid "Connection to Prusa SL1 / SL1S works correctly." msgstr "La connexion à à la Prusa SL1 / SL1S fonctionne correctement." @@ -2698,7 +2513,6 @@ msgstr "La connexion à à la Prusa SL1 / SL1S fonctionne correctement." #: src/slic3r/Utils/OctoPrint.cpp:336 msgid "Connection to PrusaLink works correctly." msgstr "La connexion à PrusaLink fonctionne correctement." ->>>>>>> master #: src/slic3r/Utils/Repetier.cpp:84 msgid "Connection to Repetier works correctly." @@ -2815,45 +2629,6 @@ msgstr "Copier dans le Presse-Papier" msgid "Copy Version Info" msgstr "Copier les Infos de Version" -<<<<<<< HEAD -#: src/slic3r/Utils/PresetUpdater.cpp:84 -msgid "" -"Copying of file %1% to %2% failed.\n" -"Error message : %3%\n" -"Copying was triggered by function: %4%" -msgstr "" -"La copie du fichier %1% vers %2% a échoué.\n" -"Message d'erreur : %3%\n" -" La copie a été déclenchée par la fonction : %4%" - -#: src/slic3r/Utils/PresetUpdater.cpp:91 -msgid "" -"Copying of file %1% to %2% failed. Permissions fail at target file after copying.\n" -"Error message : %3%\n" -"Copying was triggered by function: %4%" -msgstr "" -"La copie du fichier %1% vers %2% a échoué. Échec d'autorisation sur le fichier cible après copie.\n" -"Message d'erreur : %3%\n" -" Cette erreur s'est produite au cours de la phase de %4%. " - -#: src/slic3r/Utils/PresetUpdater.cpp:70 -msgid "" -"Copying of file %1% to %2% failed. Permissions fail at target file before copying.\n" -"Error message : %3%\n" -"This error happend during %4% phase." -msgstr "" -"La copie du fichier %1% vers %2% a échoué. Échec d'autorisation sur le fichier cible avant copie.\n" -"Message d'erreur : %3%\n" -"Cette erreur s'est produite au cours de la phase de %4%. " - -#: src/slic3r/Utils/PresetUpdater.cpp:65 -msgid "Copying of file %1% to %2% failed: %3%" -msgstr "Échec de la copie du fichier %1% vers %2% : %3%" - -#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:156 -msgid "Copying of the temporary G-code has finished but the exported code couldn't be opened during copy check. The output G-code is at %1%.tmp." -msgstr "La copie du G-code temporaire est terminée mais le code exporté n'a pas pu être ouvert au cours de la vérification de copie. Le G-code de sortie se trouve en %1%.tmp." -======= #: src/slic3r/Utils/PresetUpdater.cpp:61 #, boost-format msgid "Copying of file %1% to %2% failed: %3%" @@ -2868,7 +2643,6 @@ msgstr "" "La copie du G-code temporaire est terminée mais le code exporté n'a pas pu " "être ouvert au cours de la vérification de copie. Le G-code de sortie se " "trouve en %1%.tmp." ->>>>>>> master #: src/slic3r/GUI/BackgroundSlicingProcess.cpp:704 #, boost-format @@ -2884,14 +2658,6 @@ msgstr "" msgid "Copying of the temporary G-code to the output G-code failed" msgstr "La copie du G-code provisoire dans le G-code final a échoué" -<<<<<<< HEAD -#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:163 -msgid "" -"Copying of the temporary G-code to the output G-code failed. Maybe the SD card is write locked?\n" -"Error message: %1%" -msgstr "" -"La copie du G-code temporaire vers le G-code de sortie a échoué. Peut-être que la carte SD est verrouillée en écriture ?\n" -======= #: src/slic3r/GUI/BackgroundSlicingProcess.cpp:695 #, boost-format msgid "" @@ -2901,7 +2667,6 @@ msgid "" msgstr "" "La copie du G-code temporaire vers le G-code de sortie a échoué. Peut-être " "que la carte SD est verrouillée en écriture ?\n" ->>>>>>> master "Message d'erreur : %1%" #: src/slic3r/GUI/BackgroundSlicingProcess.cpp:698 @@ -2975,12 +2740,6 @@ msgstr "Impossible de se connecter à OctoPrint" msgid "Could not connect to Prusa SLA" msgstr "Impossible de se connecter à Prusa SLA" -<<<<<<< HEAD -#: src/slic3r/Utils/OctoPrint.cpp:235 -msgid "Could not connect to PrusaLink" -msgstr "Impossible de se connecter à PrusaLink" - -======= #: src/slic3r/Utils/OctoPrint.cpp:342 msgid "Could not connect to PrusaLink" msgstr "Impossible de se connecter à PrusaLink" @@ -2989,7 +2748,6 @@ msgstr "Impossible de se connecter à PrusaLink" msgid "Could not connect to Repetier" msgstr "Impossible de se connecter à Repetier" ->>>>>>> master #: src/slic3r/Utils/Http.cpp:73 msgid "" "Could not detect system SSL certificate store. PrusaSlicer will be unable to " @@ -3758,22 +3516,9 @@ msgstr "" "Sélectionnez OUI si vous voulez changer cette valeur pour %s%%,\n" "ou NON si vous êtes certain que %s%s est une valeur correcte." -<<<<<<< HEAD -#: src/slic3r/GUI/Field.cpp:288 -#, possible-c-format -msgid "" -"Do you mean %s%% instead of %s %s?\n" -"Select YES if you want to change this value to %s%%, \n" -"or NO if you are sure that %s %s is a correct value." -msgstr "" -"Voulez vous dire %s%% au lieu de %s%s ?\n" -"Sélectionnez OUI si vous voulez changer cette valeur pour %s%%,\n" -"ou NON si vous êtes certain que %s%s est une valeur correcte." -======= #: src/slic3r/GUI/ConfigWizard.cpp:2625 msgid "Do you want to continue changing the configuration?" msgstr "Voulez-vous continuer à modifier la configuration ?" ->>>>>>> master #: src/slic3r/GUI/DoubleSlider.cpp:2535 msgid "Do you want to delete all saved tool changes?" @@ -3816,13 +3561,6 @@ msgstr "ne contient pas de gcode valide." msgid "Don't arrange" msgstr "Ne pas agencer" -<<<<<<< HEAD -# Don't install -msgid "Don't install" -msgstr "Ne pas installer" - -#: src/slic3r/GUI/UpdateDialogs.cpp:71 -======= #: src/slic3r/GUI/GUI_App.cpp:974 msgid "Don't import" msgstr "Ne pas importer" @@ -3832,7 +3570,6 @@ msgid "Don't install" msgstr "Ne pas installer" #: src/slic3r/GUI/UpdateDialogs.cpp:72 ->>>>>>> master msgid "Don't notify about new releases any more" msgstr "Ne plus me notifier au sujet des nouvelles publications" @@ -4779,13 +4516,6 @@ msgstr "Couches estompées" msgid "failed finding central directory" msgstr "impossible de trouver le répertoire central" -<<<<<<< HEAD -#: src/slic3r/GUI/Plater.cpp:2399 -msgid "Failed loading file \"%1%\" due to an invalid configuration." -msgstr "Échec du chargement du fichier \"%1%\" en raison d'une configuration non valide." - -#: src/slic3r/Utils/FixModelByWin10.cpp:235 -======= #: src/slic3r/GUI/Plater.cpp:2516 #, boost-format msgid "Failed loading file \"%1%\" due to an invalid configuration." @@ -4794,7 +4524,6 @@ msgstr "" "valide." #: src/slic3r/Utils/FixModelByWin10.cpp:237 ->>>>>>> master msgid "Failed loading the input model." msgstr "Échec du chargement du modèle d'entrée." @@ -5299,40 +5028,20 @@ msgid "For support enforcers only" msgstr "Seulement pour les générateur de supports" #. TRN Description for "WHITE BULLET" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3702 -======= #: src/slic3r/GUI/Tab.cpp:4266 ->>>>>>> master msgid "" "for the left button: indicates a non-system (or non-default) preset,\n" "for the right button: indicates that the settings hasn't been modified." msgstr "" -<<<<<<< HEAD -"pour le bouton gauche : indique un préréglage non-système (ou non par défaut),\n" -"pour le bouton droit : indique que le réglage n'a pas été modifié." - -#: src/slic3r/GUI/ConfigManipulation.cpp:135 -======= "pour le bouton gauche : indique un préréglage non-système (ou non par " "défaut),\n" "pour le bouton droit : indique que le réglage n'a pas été modifié." #: src/slic3r/GUI/ConfigManipulation.cpp:142 ->>>>>>> master msgid "" "For the Wipe Tower to work with the soluble supports, the support layers\n" "need to be synchronized with the object layers." msgstr "" -<<<<<<< HEAD -"Pour que la tour de nettoyage fonctionne avec les supports solubles, les couches du support\n" -"doivent être synchronisées avec les couches d'objets." - -#: src/libslic3r/Print.cpp:1422 -msgid "For the Wipe Tower to work with the soluble supports, the support layers need to be synchronized with the object layers." -msgstr "" -"Pour que la Tour de Nettoyage fonctionne avec des supports solubles, les couches de support\n" -======= "Pour que la tour de nettoyage fonctionne avec les supports solubles, les " "couches du support\n" "doivent être synchronisées avec les couches d'objets." @@ -5344,7 +5053,6 @@ msgid "" msgstr "" "Pour que la Tour de Nettoyage fonctionne avec des supports solubles, les " "couches de support\n" ->>>>>>> master "doivent être synchronisées avec les couches de l'objet." #: src/libslic3r/PrintConfig.cpp:3689 @@ -5468,22 +5176,14 @@ msgstr "g" msgid "G-code" msgstr "G-code" -<<<<<<< HEAD -#: src/slic3r/GUI/DoubleSlider.cpp:1146 -======= #: src/slic3r/GUI/DoubleSlider.cpp:1482 ->>>>>>> master msgid "" "G-code associated to this tick mark is in a conflict with print mode.\n" "Editing it will cause changes of Slider data." msgstr "" "Le G-code associé à cette coche est en conflit avec le mode d'impression.\n" -<<<<<<< HEAD -"Le modifier entraînera des modifications des données de la Barre de défilement." -======= "Le modifier entraînera des modifications des données de la Barre de " "défilement." ->>>>>>> master #: src/slic3r/GUI/BackgroundSlicingProcess.cpp:715 #, boost-format @@ -5959,11 +5659,7 @@ msgstr "Nom d'hôte" msgid "Hostname, IP or URL" msgstr "Nom d'hôte, IP ou URL" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:210 -======= #: src/slic3r/GUI/Tab.cpp:223 ->>>>>>> master msgid "" "Hover the cursor over buttons to find more information \n" "or click this button." @@ -6086,15 +5782,6 @@ msgstr "" "Si ceci est activé, tous les extrudeurs qui impriment seront positionnés sur " "la bordure avant du lit d'impression au début de l'impression." -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigWizard.cpp:1164 -msgid "" -"If enabled, allows the Reload from disk command to automatically find and load the files when invoked.\n" -"If not enabled, the Reload from disk command will ask to select each file using an open file dialog." -msgstr "" -"Si activé, permet à la commande Recharger à partir du disque de rechercher et de charger automatiquement les fichiers lorsqu'elle est invoquée.\n" -"Si non activée, la commande Recharger à partir du disque demandera de sélectionner chaque fichier à l'aide d'une boîte de dialogue d'ouverture de fichier." -======= #: src/slic3r/GUI/ConfigWizard.cpp:1250 msgid "" "If enabled, allows the Reload from disk command to automatically find and " @@ -6125,7 +5812,6 @@ msgstr "" "Si activé, l'application utilisera le menu système standard de Windows,\n" "mais sur certaines combinaisons d'échelles d'affichage, cela peut sembler " "inesthétique. Si désactivé, l'ancienne interface utilisateur sera utilisée." ->>>>>>> master #: src/libslic3r/PrintConfig.cpp:2801 msgid "" @@ -6591,19 +6277,9 @@ msgstr "Échec de l'import du fichier 3mf réparé" msgid "Import profile only" msgstr "Importer le profil uniquement" -<<<<<<< HEAD -#: src/slic3r/GUI/MainFrame.cpp:1000 -msgid "Import SL1 / SL1S archive" -msgstr "Importer l'archive SL1 / SL1S" - -#: src/slic3r/GUI/MainFrame.cpp:1050 -msgid "Import SL1 archive" -msgstr "Importer l'archive SL1" -======= #: src/slic3r/GUI/MainFrame.cpp:1209 msgid "Import SL1 / SL1S Archive" msgstr "Importer l'archive SL1 / SL1S" ->>>>>>> master #: src/slic3r/GUI/Plater.cpp:1684 msgid "Import SLA archive" @@ -6676,15 +6352,6 @@ msgid "Increase/decrease edit area" msgstr "Augmenter/diminuer la zone d'édition" #. TRN Description for "UNLOCKED LOCK" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3695 -msgid "" -"indicates that some settings were changed and are not equal to the system (or default) values for the current option group.\n" -"Click the UNLOCKED LOCK icon to reset all settings for current option group to the system (or default) values." -msgstr "" -"indique que certains paramètres ont été modifiés et ne sont pas égaux aux valeurs du système (ou par défaut) pour le groupe d'options actuel.\n" -"Cliquez sur l'icône CADENAS OUVERT pour régler tous les paramètres pour le groupe d'options actuel sur les valeurs du système (ou par défaut)." -======= #: src/slic3r/GUI/Tab.cpp:4259 msgid "" "indicates that some settings were changed and are not equal to the system " @@ -6696,7 +6363,6 @@ msgstr "" "valeurs du système (ou par défaut) pour le groupe d'options actuel.\n" "Cliquez sur l'icône CADENAS OUVERT pour régler tous les paramètres pour le " "groupe d'options actuel sur les valeurs du système (ou par défaut)." ->>>>>>> master #. TRN Description for "LOCKED LOCK" #: src/slic3r/GUI/Tab.cpp:4255 @@ -6708,27 +6374,6 @@ msgstr "" "défaut) pour le groupe d'options en cours" #. TRN Description for "BACK ARROW" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3707 -msgid "" -"indicates that the settings were changed and are not equal to the last saved preset for the current option group.\n" -"Click the BACK ARROW icon to reset all settings for the current option group to the last saved preset." -msgstr "" -"indique que les paramètres ont été changés et qu'ils ne sont pas identiques au dernier préréglage enregistré du groupe d'options en cours.\n" -"Cliquez sur l'icône FLÈCHE ARRIÈRE pour restaurer tous les paramètres du groupe d'options en cours avec les valeurs du dernier préréglage enregistré." - -#: src/slic3r/GUI/ConfigManipulation.cpp:210 -#: src/slic3r/GUI/GUI_ObjectList.cpp:35 src/slic3r/GUI/GUI_ObjectList.cpp:93 -#: src/slic3r/GUI/GUI_ObjectList.cpp:652 src/slic3r/GUI/Plater.cpp:393 -#: src/slic3r/GUI/Tab.cpp:1413 src/slic3r/GUI/Tab.cpp:1414 -#: src/libslic3r/PrintConfig.cpp:237 src/libslic3r/PrintConfig.cpp:450 -#: src/libslic3r/PrintConfig.cpp:472 src/libslic3r/PrintConfig.cpp:812 -#: src/libslic3r/PrintConfig.cpp:826 src/libslic3r/PrintConfig.cpp:863 -#: src/libslic3r/PrintConfig.cpp:1025 src/libslic3r/PrintConfig.cpp:1035 -#: src/libslic3r/PrintConfig.cpp:1053 src/libslic3r/PrintConfig.cpp:1072 -#: src/libslic3r/PrintConfig.cpp:1091 src/libslic3r/PrintConfig.cpp:1843 -#: src/libslic3r/PrintConfig.cpp:1860 -======= #: src/slic3r/GUI/Tab.cpp:4271 msgid "" "indicates that the settings were changed and are not equal to the last saved " @@ -6751,7 +6396,6 @@ msgstr "" #: src/libslic3r/PrintConfig.cpp:1385 src/libslic3r/PrintConfig.cpp:1454 #: src/libslic3r/PrintConfig.cpp:1474 src/libslic3r/PrintConfig.cpp:1493 #: src/libslic3r/PrintConfig.cpp:2314 src/libslic3r/PrintConfig.cpp:2331 ->>>>>>> master msgid "Infill" msgstr "Remplissage" @@ -6802,28 +6446,19 @@ msgstr "Temps d'exposition initial" msgid "Initial layer height" msgstr "Hauteur de couche initiale" -<<<<<<< HEAD -#: src/slic3r/GUI/Field.cpp:269 -#, possible-c-format -======= #: src/libslic3r/PrintConfig.cpp:514 msgid "Inner brim only" msgstr "Bordure intérieure uniquement" #: src/slic3r/GUI/Field.cpp:266 #, c-format, boost-format ->>>>>>> master msgid "" "Input value is out of range\n" "Are you sure that %s is a correct value and that you want to continue?" msgstr "" "La valeur d'entrée est hors limites\n" -<<<<<<< HEAD -"Êtes-vous certain que %s est une valeur correcte et que vous voulez continuer ?" -======= "Êtes-vous certain que %s est une valeur correcte et que vous voulez " "continuer ?" ->>>>>>> master #: src/slic3r/GUI/Field.cpp:282 src/slic3r/GUI/Field.cpp:390 #: src/slic3r/GUI/Field.cpp:1575 @@ -6869,19 +6504,9 @@ msgstr "Inspecter / activer les instantanés de configuration" msgid "Install" msgstr "Installer" -<<<<<<< HEAD -#: src/slic3r/GUI/UpdateDialogs.cpp:136 -msgid "Install" -msgstr "Installer" - -#: src/slic3r/GUI/ObjectDataViewModel.cpp:62 -#: src/slic3r/GUI/ObjectDataViewModel.cpp:218 -#, possible-c-format -======= #: src/slic3r/GUI/ObjectDataViewModel.cpp:98 #: src/slic3r/GUI/ObjectDataViewModel.cpp:266 #, c-format, boost-format ->>>>>>> master msgid "Instance %d" msgstr "Instance %d" @@ -7074,13 +6699,8 @@ msgstr "Gigue" msgid "Jump to height" msgstr "Sauter à la hauteur" -<<<<<<< HEAD -#: src/slic3r/GUI/DoubleSlider.cpp:1223 -#, possible-c-format -======= #: src/slic3r/GUI/DoubleSlider.cpp:1391 #, c-format, boost-format ->>>>>>> master msgid "" "Jump to height %s\n" "or Set ruler mode" @@ -7088,13 +6708,8 @@ msgstr "" "Sauter à la hauteur %s\n" "ou Définir le mode règle" -<<<<<<< HEAD -#: src/slic3r/GUI/DoubleSlider.cpp:1220 -#, possible-c-format -======= #: src/slic3r/GUI/DoubleSlider.cpp:1388 #, c-format, boost-format ->>>>>>> master msgid "" "Jump to height %s\n" "Set ruler mode\n" @@ -7343,19 +6958,9 @@ msgstr "Charger un modèle" msgid "Load an model saved with imperial units" msgstr "Charger un modèle enregistré avec des unités impériales" -<<<<<<< HEAD -#: src/slic3r/GUI/MainFrame.cpp:1000 -msgid "Load an SL1 / Sl1S archive" -msgstr "Charger une archive SL1 / SL1S" - -#: src/slic3r/GUI/MainFrame.cpp:1058 -msgid "Load an SL1 archive" -msgstr "Charger une archive SL1" -======= #: src/slic3r/GUI/MainFrame.cpp:1209 msgid "Load an SL1 / Sl1S archive" msgstr "Charger une archive SL1 / SL1S" ->>>>>>> master #: src/libslic3r/PrintConfig.cpp:4454 msgid "" @@ -8284,13 +7889,6 @@ msgstr "Monotone" msgid "More" msgstr "Plus" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI.cpp:339 -msgid "Most likely the configuration was produced by a newer version of PrusaSlicer or by some PrusaSlicer fork." -msgstr "La configuration a été très probablement générée par une version plus récente de PrusaSlicer ou par un fork de PrusaSlicer." - -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1219 -======= #: src/slic3r/GUI/GUI.cpp:326 msgid "" "Most likely the configuration was produced by a newer version of PrusaSlicer " @@ -8300,7 +7898,6 @@ msgstr "" "récente de PrusaSlicer ou par un fork de PrusaSlicer." #: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1224 ->>>>>>> master msgid "Mouse wheel" msgstr "Roulette de la souris" @@ -8406,11 +8003,7 @@ msgstr "" msgid "Multiple Extruders" msgstr "Extrudeurs Multiples" -<<<<<<< HEAD -#: src/slic3r/GUI/Plater.cpp:2372 -======= #: src/slic3r/GUI/Plater.cpp:2648 ->>>>>>> master msgid "" "Multiple objects were loaded for a multi-material printer.\n" "Instead of considering them as multiple objects, should I consider\n" @@ -8511,20 +8104,12 @@ msgstr "Nouveau Projet" msgid "New project, clear plater" msgstr "Nouveau projet, libérer le plateau" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI.cpp:304 -msgid "new unknown value %1% was changed to default value %2%" -msgstr "la nouvelle valeur inconnue %1% a été remplacée par la valeur par défaut %2%" - -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:609 -======= #: src/slic3r/GUI/GUI_App.cpp:1203 #, boost-format msgid "New release version %1% is available." msgstr "La nouvelle version %1% est disponible." #: src/slic3r/GUI/UnsavedChangesDialog.cpp:832 ->>>>>>> master msgid "New Value" msgstr "Nouvelle Valeur" @@ -8628,29 +8213,6 @@ msgstr "Introuvable:" msgid "Note" msgstr "Remarque" -<<<<<<< HEAD -#: src/slic3r/GUI/MsgDialog.cpp:114 -msgid "Note that" -msgstr "Notez que" - -#: src/slic3r/GUI/Tab.cpp:3408 -msgid "Note, that selected preset will be deleted from this/those printer(s) too." -msgstr "Notez que ce préréglage sélectionné sera également supprimé pour cette/ces imprimante(s)." - -#: src/slic3r/GUI/Tab.cpp:3416 -msgid "Note, that this/those printer(s) will be deleted after deleting of the selected preset." -msgstr "Notez que cette/ces imprimante(s) seront supprimées après la suppression du préréglage sélectionné." - -#: src/slic3r/GUI/Tab.cpp:2039 -msgid "" -"Note: All parameters from this group are moved to the Physical Printer settings (see changelog).\n" -"\n" -"A new Physical Printer profile is created by clicking on the \"cog\" icon right of the Printer profiles combo box, by selecting the \"Add physical printer\" item in the Printer combo box. The Physical Printer profile editor opens also when clicking on the \"cog\" icon in the Printer settings tab. The Physical Printer profiles are being stored into PrusaSlicer/physical_printer directory." -msgstr "" -"Remarque : Tous les paramètres de ce groupe sont déplacés vers les paramètres de l'imprimante physique (voir le journal des modifications).\n" -"\n" -"Un nouveau profil d'imprimante physique est créé en cliquant sur l'icône \"rouage\" à droite de la zone de liste déroulante de Profils d'imprimante, en sélectionnant l'élément \"Ajouter une imprimante physique\" dans la zone de liste déroulante Imprimante. L'éditeur de profil d'imprimante physique s'ouvre également en cliquant sur l'icône \"rouage\" dans l'onglet Réglages de l'imprimante. Les profils d'imprimante physique sont stockés dans le répertoire PrusaSlicer/physical_printer." -======= #: src/slic3r/GUI/Tab.cpp:3716 msgid "Note, that the selected preset will be deleted from this printer too." msgid_plural "" @@ -8700,7 +8262,6 @@ msgstr "" "s'ouvre également en cliquant sur l'icône \"rouage\" dans l'onglet Réglages " "de l'imprimante. Les profils d'imprimante physique sont stockés dans le " "répertoire PrusaSlicer/physical_printer." ->>>>>>> master #: src/slic3r/Utils/AstroBox.cpp:92 msgid "Note: AstroBox version at least 1.1.0 is required." @@ -9184,13 +8745,6 @@ msgstr "" msgid "Open the software releases page in your browser" msgstr "Ouvrir la page des publications du logiciel dans votre navigateur" -<<<<<<< HEAD -#: src/slic3r/GUI/UpdateDialogs.cpp:89 -msgid "Opening Configuration Wizard" -msgstr "Ouverture de l'Assistant de Configuration" - -#: src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp:220 src/slic3r/GUI/Plater.cpp:3961 -======= #: src/slic3r/GUI/UpdateDialogs.cpp:94 msgid "Opening Configuration Wizard" msgstr "Ouverture de l'Assistant de Configuration" @@ -9230,7 +8784,6 @@ msgstr "" "pour toucher le plateau si aucune élévation n'est définie." #: src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp:505 ->>>>>>> master msgid "Optimize orientation" msgstr "Optimiser l'orientation" @@ -9706,15 +9259,6 @@ msgstr "Imprimantes physiques" msgid "Pick another vendor supported by %s" msgstr "Choisissez un autre fournisseur pris en charge par %s" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:67 -msgid "Picture sizes to be stored into a .gcode and .sl1 / .sl1s files, in the following format: \"XxY, XxY, ...\"" -msgstr "Tailles des images à stocker dans un fichier .gcode et .sl1 / .sl1s, au format suivant : \"XxY, XxY, ...\"" - -#: src/libslic3r/PrintConfig.cpp:67 -msgid "Picture sizes to be stored into a .gcode and .sl1 files, in the following format: \"XxY, XxY, ...\"" -msgstr "Tailles de photo à stocker dans un fichier .gcode et .sl1, au format suivant : \"XxY, XxY, ...\"" -======= #: src/libslic3r/PrintConfig.cpp:257 msgid "" "Picture sizes to be stored into a .gcode and .sl1 / .sl1s files, in the " @@ -9722,7 +9266,6 @@ msgid "" msgstr "" "Tailles des images à stocker dans un fichier .gcode et .sl1 / .sl1s, au " "format suivant : \"XxY, XxY, ...\"" ->>>>>>> master #: src/libslic3r/PrintConfig.cpp:3483 msgid "Pillar connection mode" @@ -9783,13 +9326,6 @@ msgid "Please check your object list before preset changing." msgstr "" "Veuillez vérifier votre liste d'objet avant le changement de préréglage." -<<<<<<< HEAD -#: src/slic3r/GUI/GUI.cpp:341 -msgid "Please review the substitutions and adjust them if needed." -msgstr "Passez en revue les substitutions et ajustez-les si nécessaire." - -#: src/slic3r/GUI/Plater.cpp:3089 -======= #: src/slic3r/GUI/BackgroundSlicingProcess.cpp:85 msgid "" "Please save your project and restart PrusaSlicer. We would be glad if you " @@ -9799,7 +9335,6 @@ msgstr "" "heureux si vous signaliez le problème." #: src/slic3r/GUI/Plater.cpp:3620 ->>>>>>> master msgid "Please select the file to reload" msgstr "Veuillez sélectionner le fichier à recharger" @@ -9967,11 +9502,7 @@ msgstr "Appuyer pour activer le rectangle de déselection" msgid "Press to activate selection rectangle" msgstr "Appuyer pour activer le rectangle de sélection" -<<<<<<< HEAD -#: src/slic3r/GUI/KBShortcutsDialog.cpp:155 -======= #: src/slic3r/GUI/KBShortcutsDialog.cpp:136 ->>>>>>> master msgid "" "Press to select multiple objects\n" "or move multiple objects with mouse" @@ -9979,17 +9510,10 @@ msgstr "" "Clicquez pour sélectionner plusieurs objets\n" "ou pour déplacer plusieurs objets avec la souris" -<<<<<<< HEAD -#: src/slic3r/GUI/KBShortcutsDialog.cpp:221 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:222 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:231 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:232 -======= #: src/slic3r/GUI/KBShortcutsDialog.cpp:239 #: src/slic3r/GUI/KBShortcutsDialog.cpp:240 #: src/slic3r/GUI/KBShortcutsDialog.cpp:250 #: src/slic3r/GUI/KBShortcutsDialog.cpp:251 ->>>>>>> master msgid "" "Press to speed up 5 times while moving thumb\n" "with arrow keys or mouse wheel" @@ -10293,17 +9817,6 @@ msgstr "Erreur de PrusaSlicer" msgid "PrusaSlicer GUI initialization failed" msgstr "L'initialisation de la GUI de PrusaSlicer a échoué" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_App.cpp:586 -msgid "" -"PrusaSlicer has encountered a localization error. Please report to PrusaSlicer team, what language was active and in which scenario this issue happened. Thank you.\n" -"\n" -"The application will now terminate." -msgstr "" -"PrusaSlicer a rencontré une erreur de localisation. Veuillez signaler à l'équipe PrusaSlicer quelle langue était active et dans quel scénario cette erreur s'est produite. Merci.\n" -"\n" -"L'application va maintenant fermer." -======= #: src/slic3r/GUI/BackgroundSlicingProcess.cpp:84 #, boost-format msgid "PrusaSlicer has encountered a fatal error: \"%1%\"" @@ -10341,7 +9854,6 @@ msgstr "" #: src/slic3r/GUI/MainFrame.cpp:232 msgid "PrusaSlicer is closing" msgstr "PrusaSlicer se ferme" ->>>>>>> master #: src/slic3r/GUI/UpdateDialogs.cpp:95 msgid "" @@ -10363,28 +9875,9 @@ msgstr "" "fonctionner correctement,\n" "alors que OpenGL version %s, rendu %s, fournisseur %s a été détecté." -<<<<<<< HEAD -#: src/slic3r/GUI/UpdateDialogs.cpp:90 -msgid "" -"PrusaSlicer is not using the newest configuration available.\n" -"Configuration Wizard may not offer the latest printers, filaments and SLA materials to be installed. " -msgstr "" -"PrusaSlicer n'utilise pas la dernière configuration disponible.\n" -"L'assistant de configuration peut ne pas proposer les dernières imprimantes, filaments et matériaux SLA à installer." - -#: src/slic3r/GUI/OpenGLManager.cpp:259 -#, possible-c-format -msgid "" -"PrusaSlicer requires OpenGL 2.0 capable graphics driver to run correctly, \n" -"while OpenGL version %s, render %s, vendor %s was detected." -msgstr "" -"PrusaSlicer a besoin de pilotes graphiques opérationnels OpenGL 2.0 pour fonctionner correctement,\n" -"alors que OpenGL version %s, rendu %s, fournisseur %s a été détecté." -======= #: src/slic3r/GUI/GUI_App.cpp:1329 msgid "PrusaSlicer started after a crash" msgstr "PrusaSlicer a démarré après un crash" ->>>>>>> master #: src/slic3r/GUI/ConfigSnapshotDialog.cpp:60 msgid "PrusaSlicer version" @@ -10394,21 +9887,9 @@ msgstr "Version de PrusaSlicer" msgid "PrusaSlicer will remember your action." msgstr "PrusaSlicer se souviendra de votre action." -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigWizard.cpp:1174 -msgid "" -"PrusaSlicer's user interfaces comes in three variants:\n" -"Simple, Advanced, and Expert.\n" -"The Simple mode shows only the most frequently used settings relevant for regular 3D printing. The other two offer progressively more sophisticated fine-tuning, they are suitable for advanced and expert users, respectively." -msgstr "" -"Les interfaces utilisateur de PrusaSlicer se déclinent en trois variantes :\n" -"Simple, Avancé et Expert.\n" -"Le mode Simple affiche uniquement les paramètres les plus fréquemment utilisés pertinents pour l'impression 3D régulière. Les deux autres offrent des réglages fins de plus en plus sophistiqués, ils conviennent respectivement aux utilisateurs avancés et experts." -======= #: src/slic3r/GUI/GUI_App.cpp:3074 src/slic3r/GUI/Plater.cpp:1734 msgid "PrusaSlicer will remember your choice." msgstr "PrusaSlicer se souviendra de votre choix." ->>>>>>> master #: src/slic3r/GUI/ConfigWizard.cpp:1274 msgid "" @@ -10525,19 +10006,6 @@ msgstr "Couches du radeau" msgid "Ramming customization" msgstr "Personnalisation de l'expulsion" -<<<<<<< HEAD -#: src/slic3r/GUI/WipeTowerDialog.cpp:41 -msgid "" -"Ramming denotes the rapid extrusion just before a tool change in a single-extruder MM printer. Its purpose is to properly shape the end of the unloaded filament so it does not prevent insertion of the new filament and can itself be reinserted later. This phase is important and different materials can require different extrusion speeds to get the good shape. For this reason, the extrusion rates during ramming are adjustable.\n" -"\n" -"This is an expert-level setting, incorrect adjustment will likely lead to jams, extruder wheel grinding into filament etc." -msgstr "" -"L'Expulsion décrit l'extrusion rapide qui a lieu juste avant un changement d'outil sur une imprimante MM à extrudeur unique. Le but est de donner une forme correcte au filament déchargé afin qu'il n'empêche pas l'insertion du nouveau filament et puisse être réinséré lui-même plus tard. Cette phase est importante et des matériaux différents peuvent nécessiter des vitesses d'extrusion différentes pour obtenir la bonne forme. De ce fait, les débits d'extrusion pendant l'expulsion sont ajustables.\n" -"\n" -"Ceci est un paramétrage de niveau expert, et un mauvais ajustement provoquera probablement des blocages, des accrochages de la roue de l'extrudeur sur le filament , etc ..." - -#: src/slic3r/GUI/WipeTowerDialog.cpp:91 -======= #: src/slic3r/GUI/WipeTowerDialog.cpp:54 msgid "" "Ramming denotes the rapid extrusion just before a tool change in a single-" @@ -10563,7 +10031,6 @@ msgstr "" "l'extrudeur sur le filament , etc ..." #: src/slic3r/GUI/WipeTowerDialog.cpp:122 ->>>>>>> master msgid "Ramming line spacing" msgstr "Espacement de la ligne de ramming" @@ -11329,19 +10796,9 @@ msgstr "Sauvegarder le projet (3mf)" msgid "Save project as (3mf)" msgstr "Sauvegarder le projet en tant que (3mf)" -<<<<<<< HEAD -#: src/slic3r/GUI/Plater.cpp:5337 -msgid "Save SL1 / SL1S file as:" -msgstr "Enregistrer le fichier SL1 / SL1S sous :" - -#: src/slic3r/GUI/Plater.cpp:4975 -msgid "Save SL1 file as:" -msgstr "Sauvegarder le fichier SL1 sous :" -======= #: src/slic3r/GUI/Plater.cpp:5707 msgid "Save SL1 / SL1S file as:" msgstr "Enregistrer le fichier SL1 / SL1S sous :" ->>>>>>> master #: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:898 msgid "Save support points?" @@ -11592,25 +11049,16 @@ msgstr "Choisissez le type de socle dont vous avez besoin" msgid "Select what kind of support do you need" msgstr "Choisissez le type de support dont vous avez besoin" -<<<<<<< HEAD -#: src/slic3r/GUI/DoubleSlider.cpp:2135 -======= #: src/slic3r/GUI/DoubleSlider.cpp:2532 ->>>>>>> master msgid "" "Select YES if you want to delete all saved tool changes, \n" "NO if you want all tool changes switch to color changes, \n" "or CANCEL to leave it unchanged." msgstr "" -<<<<<<< HEAD -"Sélectionnez OUI si vous souhaitez supprimer tous les changements d'outil enregistrées, \n" -"NON si vous souhaitez que tous les changements d'outil soient remplacés par des modifications de couleur, \n" -======= "Sélectionnez OUI si vous souhaitez supprimer tous les changements d'outil " "enregistrées, \n" "NON si vous souhaitez que tous les changements d'outil soient remplacés par " "des modifications de couleur, \n" ->>>>>>> master "ou ANNULER pour ne pas les modifier." #: src/slic3r/GUI/Selection.cpp:168 @@ -12016,19 +11464,6 @@ msgstr "Définir une Instance non-Imprimable" msgid "Set upper thumb as active" msgstr "Définir le curseur du haut comme actif" -<<<<<<< HEAD -#: src/slic3r/GUI/KBShortcutsDialog.cpp:217 -msgid "Set upper thumb to current slider thumb" -msgstr "Régler le curseur supérieur sur la position actuelle de la barre de défilement" - -#: src/libslic3r/PrintConfig.cpp:3714 -msgid "" -"Sets logging sensitivity. 0:fatal, 1:error, 2:warning, 3:info, 4:debug, 5:trace\n" -"For example. loglevel=2 logs fatal, error and warning level messages." -msgstr "" -"Définit la sensibilité de journalisation. 0 : fatal, 1: erreur, 2 : avertissement, 3 : info, 4 : débogage, 5 : trace\n" -"Par exemple. loglevel = 2 enregistre les messages d'erreur et d'avertissement de niveau fatal." -======= #: src/libslic3r/PrintConfig.cpp:4458 msgid "" "Sets logging sensitivity. 0:fatal, 1:error, 2:warning, 3:info, 4:debug, 5:" @@ -12039,7 +11474,6 @@ msgstr "" "avertissement, 3 : info, 4 : débogage, 5 : trace\n" "Par exemple. loglevel = 2 enregistre les messages d'erreur et " "d'avertissement de niveau fatal." ->>>>>>> master #: src/slic3r/GUI/BedShapeDialog.cpp:249 src/slic3r/GUI/GCodeViewer.cpp:3705 #: src/slic3r/GUI/MainFrame.cpp:2140 @@ -12360,20 +11794,12 @@ msgstr "Réglage MM pour extrudeur unique" msgid "Single Extruder Multi Material" msgstr "Multi Material à extrudeur unique" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:2101 -msgid "" -"Single Extruder Multi Material is selected, \n" -"and all extruders must have the same diameter.\n" -"Do you want to change the diameter for all extruders to first extruder nozzle diameter value?" -======= #: src/slic3r/GUI/Tab.cpp:2326 msgid "" "Single Extruder Multi Material is selected, \n" "and all extruders must have the same diameter.\n" "Do you want to change the diameter for all extruders to first extruder " "nozzle diameter value?" ->>>>>>> master msgstr "" "Le Multi-Matériaux Extrudeur Unique est sélectionné,\n" "et tous les extrudeurs doivent avoir le même diamètre.\n" @@ -12720,16 +12146,6 @@ msgstr "" msgid "Some filaments were uninstalled." msgstr "Certains filaments ont été désinstallés." -<<<<<<< HEAD -#: src/slic3r/GUI/Plater.cpp:2309 -#, possible-c-format -msgid "" -"Some object(s) in file %s looks like saved in inches.\n" -"Should I consider them as a saved in inches and convert them?" -msgstr "" -"Certains objets du fichier %s semblent être enregistrés en pouces.\n" -"Dois-je les considérer comme enregistrés en pouces et les convertir ?" -======= #: src/libslic3r/PrintConfig.cpp:1321 msgid "" "Some G/M-code commands, including temperature control and others, are not " @@ -12742,7 +12158,6 @@ msgstr "" "firmware de votre imprimante pour obtenir une sortie compatible. L'option " "\"Pas d'extrusion\" empêche complètement PrusaSlicer d'exporter toute valeur " "d'extrusion." ->>>>>>> master #: src/slic3r/GUI/GLCanvas3D.cpp:6370 msgid "Some objects are not visible during editing." @@ -13070,33 +12485,6 @@ msgstr "Démarrer un nouveau processus de découpe" msgid "Start the application" msgstr "Démarrer l'application" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_App.cpp:386 -msgid "" -"Starting with %1% 2.3, configuration directory on Linux has changed (according to XDG Base Directory Specification) to \n" -"%2%.\n" -"\n" -"This directory did not exist yet (maybe you run the new version for the first time).\n" -"However, an old %1% configuration directory was detected in \n" -"%3%.\n" -"\n" -"Consider moving the contents of the old directory to the new location in order to access your profiles, etc.\n" -"Note that if you decide to downgrade %1% in future, it will use the old location again.\n" -"\n" -"What do you want to do now?" -msgstr "" -"À partir de %1% 2.3, le répertoire de configuration sous Linux a été modifié (selon la XDG Base Directory Specification) en %2%.\n" -"\n" -"Ce répertoire n'existait pas encore (peut-être que vous exécutez la nouvelle version pour la première fois).\n" -"Cependant, un ancien répertoire de configuration %1% a été détecté dans %3%.\n" -"\n" -"Envisagez de déplacer le contenu de l'ancien répertoire vers le nouvel emplacement afin d'accéder à vos profils, etc.\n" -"Notez que si vous décidez de rétrograder %1% à l'avenir, il utilisera à nouveau l'ancien emplacement.\n" -"\n" -"Que voulez-vous faire maintenant ?" - -#: src/slic3r/GUI/PrintHostDialogs.cpp:149 -======= #: src/slic3r/GUI/GUI_App.cpp:411 #, boost-format msgid "" @@ -13132,7 +12520,6 @@ msgstr "" "Que voulez-vous faire maintenant ?" #: src/slic3r/GUI/PrintHostDialogs.cpp:249 ->>>>>>> master msgid "Status" msgstr "État" @@ -13326,21 +12713,13 @@ msgstr "Temps de support restant" msgid "Supports stealth mode" msgstr "Supporte le mode silencieux" -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigManipulation.cpp:158 -======= #: src/slic3r/GUI/ConfigManipulation.cpp:164 ->>>>>>> master msgid "" "Supports work better, if the following feature is enabled:\n" "- Detect bridging perimeters" msgstr "" -<<<<<<< HEAD -"Les supports fonctionnent mieux, si la fonctionnalité suivante est activée :\n" -======= "Les supports fonctionnent mieux, si la fonctionnalité suivante est " "activée :\n" ->>>>>>> master "- Détecter les périmètres de pontage" #: src/slic3r/GUI/Preferences.cpp:182 @@ -13406,21 +12785,6 @@ msgstr "Basculer vers le mode %s" msgid "Switching Presets: Unsaved Changes" msgstr "Changement de préréglages : modifications non enregistrées" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_App.cpp:1608 -msgid "" -"Switching the language will trigger application restart.\n" -"You will lose content of the plater." -msgstr "Le changement de langue déclenchera le redémarrage de l’application. L'objet et tous les paramètres non enregistrés seront perdus." - -#: src/slic3r/GUI/WipeTowerDialog.cpp:365 -msgid "" -"Switching to simple settings will discard changes done in the advanced mode!\n" -"\n" -"Do you want to proceed?" -msgstr "" -"Basculer vers les réglages simples annulera les changements effectués en mode avancé !\n" -======= #: src/slic3r/GUI/GUI_App.cpp:2368 msgid "" "Switching the language will trigger application restart.\n" @@ -13449,7 +12813,6 @@ msgid "" msgstr "" "Basculer vers les réglages simples annulera les changements effectués en " "mode avancé !\n" ->>>>>>> master "\n" "Voulez-vous continuer ?" @@ -13557,16 +12920,6 @@ msgstr "" msgid "The %s device could not have been found" msgstr "L'équipement %s n'a pas pu être trouvé" -<<<<<<< HEAD -#: src/slic3r/GUI/FirmwareDialog.cpp:436 -#, possible-c-format -msgid "" -"The %s device was not found.\n" -"If the device is connected, please press the Reset button next to the USB connector ..." -msgstr "" -"L'équipement %s n'a pas été trouvé.\n" -"Si l'équipement est connecté, veuillez appuyer sur le bouton Reset à côté du connecteur USB ..." -======= #: src/slic3r/GUI/FirmwareDialog.cpp:437 #, c-format, boost-format msgid "" @@ -13577,7 +12930,6 @@ msgstr "" "L'équipement %s n'a pas été trouvé.\n" "Si l'équipement est connecté, veuillez appuyer sur le bouton Reset à côté du " "connecteur USB ..." ->>>>>>> master #: src/slic3r/GUI/GUI_App.cpp:957 #, boost-format @@ -13604,14 +12956,6 @@ msgid "" msgstr "" "Le préréglage personnalisé actuel sera détaché du préréglage système parent." -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:925 -msgid "" -"The currently manipulated object is tilted (rotation angles are not multiples of 90°).\n" -"Non-uniform scaling of tilted objects is only possible in the World coordinate system,\n" -"once the rotation is embedded into the object coordinates." -msgstr "L'objet actuel est incliné (les angles de rotation ne sont pas des multiples de 90 °). La mise à l'échelle non uniforme des objets inclinés est possible dans le système de coordonnées seulement quand la rotation est incorporée aux coordonnées de l'objet." -======= #: src/slic3r/GUI/GUI_ObjectManipulation.cpp:980 msgid "" "The currently manipulated object is tilted (rotation angles are not " @@ -13624,7 +12968,6 @@ msgstr "" "de 90 °). La mise à l'échelle non uniforme des objets inclinés est possible " "dans le système de coordonnées seulement quand la rotation est incorporée " "aux coordonnées de l'objet." ->>>>>>> master #: src/libslic3r/PrintConfig.cpp:3551 msgid "The default angle for connecting support sticks and junctions." @@ -13825,15 +13168,6 @@ msgstr "" msgid "the following suffix is not allowed:" msgstr "le suffixe suivant n'est pas autorisé :" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI.cpp:340 -msgid "The following values were substituted:" -msgstr "Les valeurs suivantes ont été remplacées :" - -#: src/libslic3r/PrintConfig.cpp:3035 -msgid "The gap between the object bottom and the generated pad in zero elevation mode." -msgstr "Espace entre le bas de l'objet et le socle généré en mode élévation zéro." -======= #: src/slic3r/GUI/GUI.cpp:327 msgid "The following values were substituted:" msgstr "Les valeurs suivantes ont été remplacées :" @@ -13844,7 +13178,6 @@ msgid "" "mode." msgstr "" "Espace entre le bas de l'objet et le socle généré en mode élévation zéro." ->>>>>>> master #: src/libslic3r/PrintConfig.cpp:3529 msgid "The height of the pillar base cone" @@ -13990,17 +13323,6 @@ msgstr "" "L'objet sera surélevé de ce nombre de couches, et du support sera généré en " "dessous." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2567 -msgid "" -"The percentage of the bed area. \n" -"If the print area exceeds the specified value, \n" -"then a slow tilt will be used, otherwise - a fast tilt" -msgstr "" -"Pourcentage de la zone du lit.\n" -"Si la zone d'impression excède la valeur spécifiée,\n" -"alors une inclinaison lente sera appliquée, sinon - une inclinaison rapide" -======= #: src/libslic3r/PrintConfig.cpp:3464 msgid "" "The percentage of smaller pillars compared to the normal pillar diameter " @@ -14009,7 +13331,6 @@ msgstr "" "Le pourcentage de piliers plus petits par rapport au diamètre de pilier " "normal qui sont utilisés dans les zones problématiques où un pilier normal " "ne peut pas rentrer." ->>>>>>> master #: src/libslic3r/PrintConfig.cpp:3176 msgid "" @@ -14174,25 +13495,6 @@ msgstr "" "Le projet sélectionné n'est plus disponible.\n" "Voulez-vous le retirer de la liste des projets récents?" -<<<<<<< HEAD -#: src/slic3r/GUI/MainFrame.cpp:1003 -msgid "" -"The selected project is no longer available.\n" -"Do you want to remove it from the recent projects list?" -msgstr "" -"Le projet sélectionné n'est plus disponible.\n" -"Voulez-vous le retirer de la liste des projets récents?" - -#: src/slic3r/GUI/DoubleSlider.cpp:1121 -msgid "" -"The sequential print is on.\n" -"It's impossible to apply any custom G-code for objects printing sequentually.\n" -"This code won't be processed during G-code generation." -msgstr "" -"L'impression séquentielle est activée.\n" -"Il est impossible d'appliquer un G-code personnalisé pour des objets en impression séquentielle.\n" -"Ce code ne sera pas traité au cours de la génération du G-code." -======= #: src/slic3r/GUI/DoubleSlider.cpp:1440 msgid "" "The sequential print is on.\n" @@ -14213,7 +13515,6 @@ msgstr "" "L'impression séquentielle est activée.\n" "Il est impossible d'appliquer un G-code personnalisé pour l'impression " "séquentielle d'objets." ->>>>>>> master #: src/slic3r/GUI/ConfigWizard.cpp:1287 msgid "The size of the object can be specified in inches" @@ -14239,26 +13540,6 @@ msgstr "" "La pente de la paroi du socle par rapport au plan du lit. 90 degrés donne " "des murs droits." -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigManipulation.cpp:80 -#, possible-c-format -msgid "" -"The Spiral Vase mode requires:\n" -"- one perimeter\n" -"- no top solid layers\n" -"- 0% fill density\n" -"- no support material\n" -"- Ensure vertical shell thickness enabled\n" -"- Detect thin walls disabled" -msgstr "" -"Les prérequis du mode Vase Spiral sont :\n" -"-Un seul périmètre\n" -"-Aucunes couches solides supérieures\n" -"-Une densité de remplissage de 0%\n" -"-Pas de support\n" -"-Vérifier que l'épaisseur de coque verticale est activée\n" -"-La détection de parois fines doit être désactivée" -======= #: src/libslic3r/PrintConfig.cpp:2206 msgid "" "The speed for loading of a filament into extruder after retraction (it only " @@ -14273,7 +13554,6 @@ msgstr "" msgid "The speed for retractions (it only applies to the extruder motor)." msgstr "" "La vitesse des rétractations (ne s'applique qu'au moteur de l'extrudeur)." ->>>>>>> master #: src/slic3r/GUI/ConfigManipulation.cpp:82 msgid "" @@ -14343,17 +13623,6 @@ msgstr "" "valeur sur zéro empêchera Slic3r d'utiliser la vitesse et le débit des ponts " "pour la première couche de l'objet." -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:2731 -msgid "" -"The Wipe option is not available when using the Firmware Retraction mode.\n" -"\n" -"Shall I disable it in order to enable Firmware Retraction?" -msgstr "" -"L'option Nettoyage n'est pas disponible lorsque vous utilisez le mode Rétractation du Firmware.\n" -"\n" -"Voulez-vous que je la désactive pour permettre la Rétractation du Firmware ?" -======= #: src/libslic3r/PrintConfig.cpp:2568 msgid "" "The vertical distance between the object top surface and the support " @@ -14364,7 +13633,6 @@ msgstr "" "du matériau de support. Si elle est défini sur zéro, " "support_material_contact_distance sera utilisé pour les distances Z de " "contact supérieur et inférieur." ->>>>>>> master #: src/slic3r/GUI/Tab.cpp:3005 msgid "" @@ -14377,24 +13645,12 @@ msgstr "" "\n" "Voulez-vous que je la désactive pour permettre la Rétractation du Firmware ?" -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigManipulation.cpp:114 -msgid "" -"The Wipe Tower currently supports the non-soluble supports only\n" -"if they are printed with the current extruder without triggering a tool change.\n" -"(both support_material_extruder and support_material_interface_extruder need to be set to 0)." -msgstr "" -"La tour de nettoyage prend actuellement en charge les supports non solubles seulement\n" -"si ils sont imprimés avec l'extrudeur actuel sans déclencher un changement d'outil.\n" -"(support_material_extruder et support_material_interface_extruder doivent être réglés sur 0)." -======= #: src/libslic3r/Print.cpp:494 msgid "" "The Wipe Tower currently does not support volumetric E (use_volumetric_e=0)." msgstr "" "À l'heure actuelle, la Tour de Nettoyage ne prend pas en charge l'E " "volumétrique (use_volumetric_e-0)." ->>>>>>> master #: src/slic3r/GUI/ConfigManipulation.cpp:121 msgid "" @@ -14516,31 +13772,6 @@ msgstr "" "auparavant.\n" "Vérifiez vos paramètres pour éviter les changements de couleur redondants." -<<<<<<< HEAD -#: src/slic3r/GUI/DoubleSlider.cpp:1155 -msgid "" -"There is a color change for extruder that has not been used before.\n" -"Check your settings to avoid redundant color changes." -msgstr "" -"Il y a un changement de couleur pour un extrudeur qui n'a pas été utilisé auparavant.\n" -"Vérifiez vos paramètres pour éviter les changements de couleur redondants." - -#: src/slic3r/GUI/DoubleSlider.cpp:1149 -msgid "" -"There is a color change for extruder that won't be used till the end of print job.\n" -"This code won't be processed during G-code generation." -msgstr "" -"Il y a un changement de couleur pour un extrudeur qui ne sera pas utilisé avant la fin du travail d'impression.\n" -"Ce code ne sera pas traité lors de la génération du G-code." - -#: src/slic3r/GUI/DoubleSlider.cpp:1152 -msgid "" -"There is an extruder change set to the same extruder.\n" -"This code won't be processed during G-code generation." -msgstr "" -"Une modification d'extrudeur est défini sur le même extrudeur.\n" -"Ce code ne sera pas traité lors de la génération du G-code." -======= #: src/slic3r/GUI/DoubleSlider.cpp:1485 msgid "" "There is a color change for extruder that won't be used till the end of " @@ -14562,7 +13793,6 @@ msgstr "" #: src/libslic3r/GCode.cpp:539 msgid "There is an object with no extrusions in the first layer." msgstr "Il y a un objet sans extrusions dans la première couche." ->>>>>>> master #: src/libslic3r/PrintConfig.cpp:2799 msgid "Thick bridges" @@ -14573,27 +13803,6 @@ msgstr "Ponts épais" msgid "This %s version: %s" msgstr "Version de ce %s : %s" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:1244 -msgid "" -"This action is not revertable.\n" -"Do you want to proceed?" -msgstr "" -"Cette action n'est pas réversible.\n" -"Voulez-vous continuer ?" - -#: src/libslic3r/PrintConfig.cpp:199 -msgid "This code is inserted between objects when using sequential printing. By default extruder and bed temperature are reset using non-wait command; however if M104, M109, M140 or M190 are detected in this custom code, Slic3r will not add temperature commands. Note that you can use placeholder variables for all Slic3r settings, so you can put a \"M109 S[first_layer_temperature]\" command wherever you want." -msgstr "Ce code est inséré entre des objets lorsque vous utilisez l'impression séquentielle. Par défaut la température de l'extrudeur et du plateau est réinitialisée et utilise la commande sans-attente ; toutefois si des commandes M104, M109, M140 ou M190 sont détectées dans ce code personnalisé, Slic3r n'ajoutera pas de commandes de température. Notez que vous pouvez utiliser des variables génériques pour tous les réglages de Slic3r, donc vous pouvez entrer une commande \"M109S[first_layer_temperature]\" où vous le souhaitez." - -#: src/libslic3r/PrintConfig.cpp:1174 -msgid "This custom code is inserted at every layer change, right after the Z move and before the extruder moves to the first layer point. Note that you can use placeholder variables for all Slic3r settings as well as [layer_num] and [layer_z]." -msgstr "Ce code personnalisé est inséré à chaque changement de couche, juste après le mouvement Z et avant le déplacement de l'extrudeur au point de départ de la couche suivante. Notez que vous pouvez utiliser des variables génériques pour tous les réglages de Slic3r de même que [layer_num] et [layer_z]." - -#: src/libslic3r/PrintConfig.cpp:188 -msgid "This custom code is inserted at every layer change, right before the Z move. Note that you can use placeholder variables for all Slic3r settings as well as [layer_num] and [layer_z]." -msgstr "Ce code personnalisé est inséré à chaque changement de couche, juste avant le mouvement en Z. Notez que vous pouvez utiliser des variables génériques pour tous les réglages de Slic3r de même que [layer_num] et [layer_z]." -======= #: src/slic3r/GUI/DoubleSlider.cpp:2087 src/slic3r/GUI/Tab.cpp:1322 msgid "" "This action is not revertible.\n" @@ -14601,7 +13810,6 @@ msgid "" msgstr "" "Cette action n'est pas réversible.\n" "Voulez-vous poursuivre ?" ->>>>>>> master #: src/slic3r/GUI/DoubleSlider.cpp:2086 msgid "This action will cause deletion of all ticks on vertical slider." @@ -14789,33 +13997,6 @@ msgstr "" "automatiquement le nombre maximum de couches a combiner en fonction du " "diamètre de la buse et de l'épaisseur des couches." -<<<<<<< HEAD -#: src/slic3r/GUI/Plater.cpp:2319 -msgid "" -"This file contains several objects positioned at multiple heights.\n" -"Instead of considering them as multiple objects, should I consider\n" -"this file as a single object having multiple parts?" -msgstr "" -"Ce fichier contient plusieurs objets positionnés à différentes hauteurs. Au lieu de les considérer comme des objets distincts, voulez-vous que je considère\n" -"ce fichier comme un seul objet en plusieurs parties?" - -#: src/slic3r/GUI/FirmwareDialog.cpp:332 -#, possible-c-format -msgid "" -"This firmware hex file does not match the printer model.\n" -"The hex file is intended for: %s\n" -"Printer reported: %s\n" -"\n" -"Do you want to continue and flash this hex file anyway?\n" -"Please only continue if you are sure this is the right thing to do." -msgstr "" -"Le fichier hex de ce firmware ne correspond pas au modèle d'imprimante.\n" -"Le fichier hex est prévu pour : %s\n" -"Imprimante détectée : %s\n" -"\n" -"Voulez-vous continuer et flasher ce fichier hex quand même ?\n" -"S'il vous plait, ne continuez que si vous êtes certain de faire le bon choix." -======= #: src/libslic3r/PrintConfig.cpp:2382 msgid "" "This feature will raise Z gradually while printing a single-walled object in " @@ -14849,7 +14030,6 @@ msgstr "" "Ce fichier contient plusieurs objets positionnés à plusieurs hauteurs.\n" "Au lieu de les considérer comme plusieurs objets, le fichier\n" "doit-il être chargé comme un seul objet comportant plusieurs parties ?" ->>>>>>> master #: src/slic3r/GUI/FirmwareDialog.cpp:333 #, c-format, boost-format @@ -15039,15 +14219,6 @@ msgstr "" msgid "This is wipe tower layer" msgstr "C'est la couche de tour d'essuyage" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:928 -msgid "" -"This operation is irreversible.\n" -"Do you want to proceed?" -msgstr "" -"Cette opération est irréversible.\n" -"Voulez-vous continuer?" -======= #: src/libslic3r/PrintConfig.cpp:2959 msgid "" "This matrix describes volumes (in cubic milimetres) required to purge the " @@ -15056,7 +14227,6 @@ msgstr "" "Cette matrice décrit les volumes (en millimètres cube) nécessaires pour " "purger le nouveau filament dans la tour de nettoyage pour une paire d'outils " "donnée." ->>>>>>> master #: src/libslic3r/GCode.cpp:766 msgid "" @@ -15249,19 +14419,6 @@ msgstr "" "des volumes de purge complets ci-dessous." #: src/slic3r/GUI/UpdateDialogs.cpp:216 -<<<<<<< HEAD -#, possible-c-format -msgid "" -"This version of %s is not compatible with currently installed configuration bundles.\n" -"This probably happened as a result of running an older %s after using a newer one.\n" -"\n" -"You may either exit %s and try again with a newer version, or you may re-run the initial configuration. Doing so will create a backup snapshot of the existing configuration before installing files compatible with this %s." -msgstr "" -"Cette version de %s n'est pas compatible avec les ensembles de configuration actuellement installés.\n" -"Cela survient probablement du fait d'avoir lancé une ancienne version de %s après en avoir utilisé une nouvelle.\n" -"\n" -"Vous pouvez soit quitter %s et essayer à nouveau avec une version plus récente, ou vous pouvez relancer la configuration initiale. Procéder ainsi permettra de créer une sauvegarde de la configuration existante avant d'installer les fichiers compatibles avec ce %s." -======= #, c-format, boost-format msgid "" "This version of %s is not compatible with currently installed configuration " @@ -15295,7 +14452,6 @@ msgstr "" "PrusaSlicer peut étendre la liste des versions de firmware prises en charge. " "On peut décider de renflouer ou de substituer une valeur inconnue par une " "valeur par défaut de manière silencieuse ou verbeuse." ->>>>>>> master #: src/libslic3r/PrintConfig.cpp:3234 msgid "" @@ -15594,10 +14750,6 @@ msgstr "Type d'imprimante." msgid "Type:" msgstr "Type :" -<<<<<<< HEAD -#: src/slic3r/GUI/OpenGLManager.cpp:275 -#, possible-c-format -======= #: src/libslic3r/SLAPrintSteps.cpp:441 msgid "Unable to drill the current configuration of holes into the model." msgstr "" @@ -15605,7 +14757,6 @@ msgstr "" #: src/slic3r/GUI/OpenGLManager.cpp:273 #, c-format, boost-format ->>>>>>> master msgid "" "Unable to load the following shaders:\n" "%s" @@ -15631,9 +14782,6 @@ msgstr "Impossible de remplacer par plus d'un volume" msgid "Undef" msgstr "Undef" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI.cpp:305 -======= #: src/slic3r/GUI/UnsavedChangesDialog.cpp:1681 msgid "Undef category" msgstr "Catégorie non définie" @@ -15643,7 +14791,6 @@ msgid "Undef group" msgstr "Groupe non défini" #: src/slic3r/GUI/GUI.cpp:292 ->>>>>>> master msgid "Undefined" msgstr "Non défini" @@ -15731,23 +14878,6 @@ msgstr "Vitesse de déchargement au démarrage" msgid "UNLOCKED LOCK" msgstr "CADENAS OUVERT" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3719 -msgid "" -"UNLOCKED LOCK icon indicates that some settings were changed and are not equal to the system (or default) values for the current option group.\n" -"Click to reset all settings for current option group to the system (or default) values." -msgstr "" -"L'icône CADENAS OUVERT indique que certains paramètres ont été modifiés et ne sont pas égaux aux valeurs du système (ou par défaut) pour le groupe d'options actuel.\n" -"Cliquez pour régler tous les paramètres pour le groupe d'options actuel sur les valeurs du système (ou par défaut)." - -#: src/slic3r/GUI/Tab.cpp:3734 -msgid "" -"UNLOCKED LOCK icon indicates that the value was changed and is not equal to the system (or default) value.\n" -"Click to reset current value to the system (or default) value." -msgstr "" -"L'icône CADENAS OUVERT indique que la valeur a été changée et n'est pas égale à la valeur du système (ou par défaut).\n" -"Cliquez pour réinitialiser la valeur actuelle sur les valeurs du système (ou par défaut)." -======= #: src/slic3r/GUI/Tab.cpp:4283 msgid "" "UNLOCKED LOCK icon indicates that some settings were changed and are not " @@ -15775,7 +14905,6 @@ msgstr "" #: src/slic3r/GUI/UnsavedChangesDialog.cpp:771 msgid "Unsaved Changes" msgstr "Modifications non enregistrées" ->>>>>>> master #: src/slic3r/GUI/KBShortcutsDialog.cpp:157 msgid "Unselect gizmo or clear selection" @@ -16127,20 +15256,14 @@ msgstr "Vue" msgid "View mode" msgstr "Mode de vue" -<<<<<<< HEAD -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:666 -======= #: src/slic3r/GUI/UnsavedChangesDialog.cpp:903 #, boost-format ->>>>>>> master msgid "" "Visit \"Preferences\" and check \"%1%\"\n" "to be asked about unsaved changes again." msgstr "" "Accédez aux \"Préférences\" et cochez \"%1%\"\n" "pour être à nouveau interrogé sur les modifications non enregistrées." -<<<<<<< HEAD -======= #: src/slic3r/GUI/GUI_App.cpp:3076 src/slic3r/GUI/Plater.cpp:1738 #, boost-format @@ -16150,7 +15273,6 @@ msgid "" msgstr "" "Accédez aux \"Préférences\" et cochez \"%1%\"\n" "pour modifier votre choix." ->>>>>>> master #: src/libslic3r/PrintConfig.cpp:4278 msgid "Visualize an already sliced and saved G-code" @@ -16530,40 +15652,22 @@ msgstr "Avec une enveloppe autour du support" msgid "World coordinates" msgstr "Les coordonnées mondiales" -<<<<<<< HEAD -#: src/slic3r/GUI/UpdateDialogs.cpp:92 -msgid "" -"Would you like to install it?\n" -"\n" -"Note that a full configuration snapshot will be created first. It can then be restored at any time should there be a problem with the new version.\n" -======= #: src/slic3r/GUI/UpdateDialogs.cpp:100 msgid "" "Would you like to install it?\n" "\n" "Note that a full configuration snapshot will be created first. It can then " "be restored at any time should there be a problem with the new version.\n" ->>>>>>> master "\n" "Updated configuration bundles:" msgstr "" "Voulez-vous l'installer ?\n" "\n" -<<<<<<< HEAD -"Notez qu'un instantané complet de la configuration sera sauvegardé d'abord. Elle peut être restaurée à tout moment si vous rencontrez un problème avec la nouvelle version.\n" -"\n" -"Ensembles de configuration mis à jour :" - -#: src/slic3r/GUI/GUI_App.cpp:1802 -msgid "Would you like to stop uploads and close the program?" -msgstr "Souhaitez-vous arrêter les téléchargements et fermer le programme ?" -======= "Notez qu'un instantané complet de la configuration sera sauvegardé d'abord. " "Elle peut être restaurée à tout moment si vous rencontrez un problème avec " "la nouvelle version.\n" "\n" "Ensembles de configuration mis à jour :" ->>>>>>> master #: src/libslic3r/miniz_extension.cpp:151 msgid "write calledback failed" @@ -16724,17 +15828,6 @@ msgstr "" "Vous ne pouvez pas utiliser un mode de redimensionnement non-uniforme pour " "une sélection d'objets/de parties multiples" -<<<<<<< HEAD -#: src/slic3r/GUI/NotificationManager.hpp:459 -msgid "" -"You have just added a G-code for color change, but its value is empty.\n" -"To export the G-code correctly, check the \"Color Change G-code\" in \"Printer Settings > Custom G-code\"" -msgstr "" -"Vous venez d'ajouter un G-code de changement de couleur, mais sa valeur est vide.\n" -"Pour exporter le G-code correctement, référez-vous à \"G-code de Changement de Couleur\" dans \"Réglages de l'Imprimante > G-code Personnalisé\"" - -#: src/slic3r/GUI/SavePresetDialog.cpp:277 -======= #: src/slic3r/GUI/NotificationManager.hpp:761 msgid "" "You have just added a G-code for color change, but its value is empty.\n" @@ -16748,7 +15841,6 @@ msgstr "" #: src/slic3r/GUI/SavePresetDialog.cpp:283 #, boost-format ->>>>>>> master msgid "" "You have selected physical printer \"%1%\" \n" "with related printer preset \"%2%\"" @@ -16773,24 +15865,9 @@ msgstr "" msgid "You must install a configuration update." msgstr "Il est nécessaire d'installer une mise à niveau de configuration." -<<<<<<< HEAD -#: src/slic3r/GUI/Preferences.cpp:299 -#, possible-c-format -msgid "You need to restart %s to make the changes effective." -msgstr "Vous devez redémarrer %s afin que les modifications soient appliquées." - -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:611 -msgid "You should change the name of your printer device." -msgstr "Vous devez changer le nom de votre périphérique d'impression." - -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:468 -msgid "You should to change a name of your printer device. It can't be saved." -msgstr "Vous devez changer le nom de votre imprimante. Il ne peut pas être enregistré." -======= #: src/slic3r/GUI/PhysicalPrinterDialog.cpp:634 msgid "You should change the name of your printer device." msgstr "Vous devez changer le nom de votre périphérique d'impression." ->>>>>>> master #: src/slic3r/GUI/GUI_ObjectList.cpp:3644 #, c-format, boost-format @@ -16898,31 +15975,9 @@ msgstr "" msgid "Z offset" msgstr "Décalage Z" -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigManipulation.cpp:59 -msgid "" -"Zero first layer height is not valid.\n" -"\n" -"The first layer height will be reset to 0.01." -msgstr "" -"Une hauteur de première couche de zéro n'est pas valide.\n" -"\n" -"La hauteur de la première couche sera réinitialisée à 0,01." - -#: src/slic3r/GUI/ConfigManipulation.cpp:47 -msgid "" -"Zero layer height is not valid.\n" -"\n" -"The layer height will be reset to 0.01." -msgstr "" -"Une hauteur de couche de zéro n'est pas valide.\n" -"\n" -"La hauteur de la couche sera réinitialisée à 0,01." -======= #: src/libslic3r/PrintConfig.cpp:2896 msgid "Z travel" msgstr "Déplacement Z" ->>>>>>> master #: src/libslic3r/PrintConfig.cpp:3492 msgid "Zig-Zag" @@ -16959,11 +16014,7 @@ msgstr "Zoom arrière" msgid "Zoom to Bed" msgstr "Zoomer sur le Lit" -<<<<<<< HEAD -#: src/slic3r/GUI/KBShortcutsDialog.cpp:176 -======= #: src/slic3r/GUI/KBShortcutsDialog.cpp:160 ->>>>>>> master msgid "" "Zoom to selected object\n" "or all objects in scene, if none selected" @@ -16971,19 +16022,11 @@ msgstr "" "Zoomer sur l'objet sélectionné\n" "ou sur tous les objets sur la scène, si aucun n'est sélectionné" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:241 src/libslic3r/PrintConfig.cpp:816 -#: src/libslic3r/PrintConfig.cpp:1748 src/libslic3r/PrintConfig.cpp:1758 -#: src/libslic3r/PrintConfig.cpp:2036 src/libslic3r/PrintConfig.cpp:2191 -#: src/libslic3r/PrintConfig.cpp:2390 src/libslic3r/PrintConfig.cpp:2891 -#: src/libslic3r/PrintConfig.cpp:3012 -======= #: src/libslic3r/PrintConfig.cpp:456 src/libslic3r/PrintConfig.cpp:1075 #: src/libslic3r/PrintConfig.cpp:2232 src/libslic3r/PrintConfig.cpp:2242 #: src/libslic3r/PrintConfig.cpp:2533 src/libslic3r/PrintConfig.cpp:2774 #: src/libslic3r/PrintConfig.cpp:2991 src/libslic3r/PrintConfig.cpp:3552 #: src/libslic3r/PrintConfig.cpp:3673 ->>>>>>> master msgid "°" msgstr "°" diff --git a/resources/localization/it/PrusaSlicer.mo b/resources/localization/it/PrusaSlicer.mo Binary files differindex 504931b0a..60bd8dc12 100644 --- a/resources/localization/it/PrusaSlicer.mo +++ b/resources/localization/it/PrusaSlicer.mo diff --git a/resources/localization/it/PrusaSlicer_it.po b/resources/localization/it/PrusaSlicer_it.po index 74377c81d..949027657 100644 --- a/resources/localization/it/PrusaSlicer_it.po +++ b/resources/localization/it/PrusaSlicer_it.po @@ -7,12 +7,8 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Phrase (phrase.com)\n" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:4124 -======= #: src/slic3r/GUI/Tab.cpp:4707 #, boost-format ->>>>>>> master msgid "" "\"%1%\" is disabled because \"%2%\" is on in \"%3%\" category.\n" "To enable \"%1%\", please switch off \"%2%\"" @@ -20,19 +16,11 @@ msgstr "" "\"%1%\" è disattivato perchè \"%2%\" è nella categoria \"%3%\".\n" "Per attivare \"%1%\", si prega di spegnere \"%2%\"" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:249 src/libslic3r/PrintConfig.cpp:828 -#: src/libslic3r/PrintConfig.cpp:1148 src/libslic3r/PrintConfig.cpp:1327 -#: src/libslic3r/PrintConfig.cpp:1390 src/libslic3r/PrintConfig.cpp:1640 -#: src/libslic3r/PrintConfig.cpp:2568 src/libslic3r/PrintConfig.cpp:2805 -#: src/libslic3r/PrintConfig.cpp:2931 -======= #: src/libslic3r/PrintConfig.cpp:464 src/libslic3r/PrintConfig.cpp:1087 #: src/libslic3r/PrintConfig.cpp:1559 src/libslic3r/PrintConfig.cpp:1751 #: src/libslic3r/PrintConfig.cpp:1814 src/libslic3r/PrintConfig.cpp:2065 #: src/libslic3r/PrintConfig.cpp:2124 src/libslic3r/PrintConfig.cpp:3177 #: src/libslic3r/PrintConfig.cpp:3466 src/libslic3r/PrintConfig.cpp:3592 ->>>>>>> master msgid "%" msgstr "%" @@ -140,16 +128,8 @@ msgstr "%1% Preset" msgid "%1% was substituted with %2%" msgstr "%1% è stato sostituito con %2%" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI.cpp:330 -msgid "%1% was substituted with %2%" -msgstr "%1% è stato sostituito con %2%" - -#: src/slic3r/GUI/MainFrame.cpp:1585 -======= #: src/slic3r/GUI/MainFrame.cpp:1707 #, boost-format ->>>>>>> master msgid "%1% was successfully sliced." msgstr "%1% slice generato correttamente." @@ -174,10 +154,6 @@ msgstr "%d linee: %.2f mm" msgid "%d presets successfully imported." msgstr "%d preset importati correttamente." -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_App.cpp:718 -#, possible-c-format -======= #: src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:304 #, c-format, boost-format msgid "%d triangles" @@ -185,7 +161,6 @@ msgstr "%d triangoli" #: src/slic3r/GUI/GUI_App.cpp:1126 #, c-format, boost-format ->>>>>>> master msgid "" "%s\n" "Do you want to continue?" @@ -238,23 +213,6 @@ msgstr "%s ha un avviso" msgid "%s has encountered an error" msgstr "%s ha riscontrato un errore" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_App.cpp:528 -#, possible-c-format -msgid "" -"%s has encountered an error. It was likely caused by running out of memory. If you are sure you have enough RAM on your system, this may also be a bug and we would be glad if you reported it.\n" -"\n" -"The application will now terminate." -msgstr "" -"%s ha riscontrato un errore. Probabilmente è stato causato dalla memoria piena. Se sei sicuro di avere abbastanza RAM nel sistema, questo potrebbe essere un bug e te ne saremmo grati se potessi informarci.\n" -"\n" -"L'applicazione verrà chiusa." - -#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:62 -#, possible-c-format -msgid "%s has encountered an error. It was likely caused by running out of memory. If you are sure you have enough RAM on your system, this may also be a bug and we would be glad if you reported it." -msgstr "%s ha riscontrato un errore. Probabilmente è stato causato dalla memoria piena. Se sei sicuro di avere abbastanza RAM nel sistema, questo potrebbe essere un bug e te ne saremmo grati se potessi informarci." -======= #: src/slic3r/GUI/GUI_App.cpp:698 #, c-format, boost-format msgid "" @@ -280,7 +238,6 @@ msgstr "" "%s ha riscontrato un errore. Probabilmente è stato causato dalla memoria " "piena. Se sei sicuro di avere abbastanza RAM nel sistema, questo potrebbe " "essere un bug e te ne saremmo grati se potessi informarci." ->>>>>>> master #: src/slic3r/GUI/UpdateDialogs.cpp:304 #, c-format, boost-format @@ -292,29 +249,6 @@ msgstr "Non sono disponibili aggiornamenti di configurazione per %s." msgid "%s incompatibility" msgstr "incompatibilità %s" -<<<<<<< HEAD -#: src/slic3r/GUI/MsgDialog.cpp:114 -#, possible-c-format -msgid "%s information" -msgstr "%s informazioni" - -#: src/slic3r/GUI/UpdateDialogs.cpp:270 -#, possible-c-format -msgid "" -"%s now uses an updated configuration structure.\n" -"\n" -"So called 'System presets' have been introduced, which hold the built-in default settings for various printers. These System presets cannot be modified, instead, users now may create their own presets inheriting settings from one of the System presets.\n" -"An inheriting preset may either inherit a particular value from its parent or override it with a customized value.\n" -"\n" -"Please proceed with the %s that follows to set up the new presets and to choose whether to enable automatic preset updates." -msgstr "" -"%s adesso utilizza uno schema aggiornato di configurazioni.\n" -"\n" -"Sono stati introdotti i così detti 'Preset di sistema', che contengono i settaggi integrati predefiniti per varie stampanti. Questi preset di sistema non possono essere modificati, però l'utente può creare i propri preset ereditando le impostazioni da quelli di sistema.\n" -"Un preset ereditato può sia ereditare un valore particolare dal genitore, o sovrascriverlo con un valore personalizzato.\n" -"\n" -"Si prega di procedere con il %s che segue per impostare i nuovi preset e scegliere se abilitare gli aggiornamenti automatici del preset." -======= #: src/slic3r/GUI/MsgDialog.cpp:246 src/slic3r/GUI/MsgDialog.cpp:259 #, c-format, boost-format msgid "%s info" @@ -324,7 +258,6 @@ msgstr "Informazioni %s " #, c-format, boost-format msgid "%s information" msgstr "%s informazioni" ->>>>>>> master #: src/slic3r/GUI/UpdateDialogs.cpp:265 #, c-format, boost-format @@ -358,27 +291,10 @@ msgstr "" msgid "%s View Mode" msgstr "%s Modalità Visualizzazione" -<<<<<<< HEAD -#: src/slic3r/GUI/UpdateDialogs.cpp:151 -#, possible-c-format -msgid "" -"%s will now start updates. Otherwise it won't be able to start.\n" -"\n" -"Note that a full configuration snapshot will be created first. It can then be restored at any time should there be a problem with the new version.\n" -"\n" -"Updated configuration bundles:" -msgstr "" -"%s avvierà gli aggiornamenti. In caso contrario non sarà in grado di avviarsi.\n" -"\n" -"Si fa noto che prima verrà creata un'istantanea della configurazione completa. Questa potrà essere ripristinata in qualunque momento se dovesse esserci un problema con la nuova versione.\n" -"\n" -"Pacchetti di configurazione aggiornati:" -======= #: src/slic3r/GUI/MsgDialog.cpp:232 #, c-format, boost-format msgid "%s warning" msgstr "Avviso %s" ->>>>>>> master #: src/slic3r/GUI/UpdateDialogs.cpp:160 #, c-format, boost-format @@ -1271,11 +1187,7 @@ msgstr "" "Un oggetto ha dei rinforzi di supporto personalizzati che non saranno " "utilizzati perché i supporti sono disabilitati." -<<<<<<< HEAD -#: src/slic3r/GUI/GLCanvas3D.cpp:638 -======= #: src/slic3r/GUI/GLCanvas3D.cpp:6372 ->>>>>>> master msgid "" "An object outside the print area was detected.\n" "Resolve the current problem to continue slicing." @@ -1354,11 +1266,7 @@ msgstr "l'archivio è troppo grande" msgid "Are you sure you want to %1% the selected preset?" msgstr "Sei sicuro di voler %1% il preset selezionato?" -<<<<<<< HEAD -#: src/slic3r/GUI/FirmwareDialog.cpp:902 -======= #: src/slic3r/GUI/FirmwareDialog.cpp:915 ->>>>>>> master msgid "" "Are you sure you want to cancel firmware flashing?\n" "This could leave your printer in an unusable state!" @@ -1604,22 +1512,6 @@ msgstr "Evita incrocio perimetri - Lunghezza massima della deviazione" msgid "BACK ARROW" msgstr "FRECCIA INDIETRO" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3727 -msgid "" -"BACK ARROW icon indicates that the settings were changed and are not equal to the last saved preset for the current option group.\n" -"Click to reset all settings for the current option group to the last saved preset." -msgstr "" -"L'icona FRECCIA INDIETRO indica che le impostazioni sono state cambiate e non corrispondono all'ultimo preset salvato per il seguente gruppo di opzioni.\n" -"Clicca per reimpostare all'ultimo preset salvato tutte le impostazioni per il seguente gruppo di opzioni." - -#: src/slic3r/GUI/Tab.cpp:3741 -msgid "" -"BACK ARROW icon indicates that the value was changed and is not equal to the last saved preset.\n" -"Click to reset current value to the last saved preset." -msgstr "" -"L'icona FRECCIA ALL'INDIETRO indica che il valore è stato cambiato e non corrisponde all'ultimo preset salvato.\n" -======= #: src/slic3r/GUI/Tab.cpp:4291 msgid "" "BACK ARROW icon indicates that the settings were changed and are not equal " @@ -1641,7 +1533,6 @@ msgid "" msgstr "" "L'icona FRECCIA ALL'INDIETRO indica che il valore è stato cambiato e non " "corrisponde all'ultimo preset salvato.\n" ->>>>>>> master "Cliccare per reimpostare il valore corrente all'ultimo preset salvato." #: src/slic3r/GUI/Preferences.cpp:137 @@ -1902,15 +1793,6 @@ msgstr "Riempimento di colore" msgid "buffer too small" msgstr "buffer troppo piccolo" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_App.cpp:1152 -msgid "" -"But since this version of PrusaSlicer we don't show this information in Printer Settings anymore.\n" -"Settings will be available in physical printers settings." -msgstr "" -"Ma da questa versione di PrusaSlicer non mostriamo più queste informazioni nelle impostazioni della stampante.\n" -"Le impostazioni saranno disponibili nelle impostazioni delle stampanti fisiche." -======= #: src/slic3r/GUI/GUI_App.cpp:1660 msgid "" "But since this version of PrusaSlicer we don't show this information in " @@ -1921,21 +1803,11 @@ msgstr "" "nelle impostazioni della stampante.\n" "Le impostazioni saranno disponibili nelle impostazioni delle stampanti " "fisiche." ->>>>>>> master #: src/slic3r/GUI/ButtonsDescription.cpp:62 msgid "Buttons And Text Colors Description" msgstr "Descrizione colori testo e pulsanti" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_App.cpp:1084 -msgid "" -"By default new Printer devices will be named as \"Printer N\" during its creation.\n" -"Note: This name can be changed later from the physical printers settings" -msgstr "" -"Per impostazione predefinita le nuove stampanti saranno denominate \"Printer N\" durante la loro creazione.\n" -"Nota: Questo nome può essere cambiato in seguito dalle impostazioni delle stampanti fisiche" -======= #: src/slic3r/GUI/GUI_App.cpp:1662 msgid "" "By default new Printer devices will be named as \"Printer N\" during its " @@ -1946,7 +1818,6 @@ msgstr "" "N\" durante la loro creazione.\n" "Nota: Questo nome può essere cambiato in seguito dalle impostazioni delle " "stampanti fisiche" ->>>>>>> master #: src/slic3r/GUI/PresetHints.cpp:191 msgid "by the print profile maximum" @@ -2016,11 +1887,7 @@ msgstr "" "Non è possibile calcolare la larghezza di estrusione per %1%: Variabile \"%2%" "\" non accessibile." -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_ObjectList.cpp:3400 -======= #: src/slic3r/GUI/GUI_ObjectList.cpp:3113 ->>>>>>> master msgid "" "Cannot insert a new layer range after the current layer range.\n" "Current layer range overlaps with the next layer range." @@ -2028,11 +1895,7 @@ msgstr "" "Non è possibile inserire un nuovo intervallo layer dopo quello attuale.\n" "L'intervallo layer attuale si sovrappone alla quello successivo." -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_ObjectList.cpp:3391 -======= #: src/slic3r/GUI/GUI_ObjectList.cpp:3104 ->>>>>>> master 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" @@ -2042,15 +1905,6 @@ msgstr "" "L'intervallo layer successivo è troppo sottile per essere diviso in due\n" "senza violare l'altezza layer minima." -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_ObjectList.cpp:3395 -msgid "" -"Cannot insert a new layer range between the current and the next layer range.\n" -"The gap between the current layer range and the next layer range\n" -"is thinner than the minimum layer height allowed." -msgstr "" -"Non è possibile inserire un nuovo intervallo layer tra quello attuale e quello successivo.\n" -======= #: src/slic3r/GUI/GUI_ObjectList.cpp:3108 msgid "" "Cannot insert a new layer range between the current and the next layer " @@ -2060,7 +1914,6 @@ msgid "" msgstr "" "Non è possibile inserire un nuovo intervallo layer tra quello attuale e " "quello successivo.\n" ->>>>>>> master "Lo spazio tra l'intervallo layer corrente e quello successivo\n" "è più sottile dell'altezza layer minima consentita." @@ -2483,17 +2336,6 @@ msgstr "Co&nfigurazione guidata" msgid "Configuration Assistant" msgstr "Assistente configurazione" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI.cpp:368 -msgid "Configuration bundle was loaded, however some configuration values were not recognized." -msgstr "Il bundle di configurazione è stato caricato, ma alcuni valori di configurazione non sono stati riconosciuti." - -#: src/slic3r/GUI/GUI.cpp:378 -msgid "Configuration file \"%1%\" was loaded, however some configuration values were not recognized." -msgstr "Il file di configurazione \"%1%\" è stato caricato, ma alcuni valori di configurazione non sono stati riconosciuti." - -#: src/libslic3r/PrintConfig.cpp:1424 -======= #: src/slic3r/GUI/GUI.cpp:355 msgid "" "Configuration bundle was loaded, however some configuration values were not " @@ -2520,7 +2362,6 @@ msgid "Configuration is editing from ConfigWizard" msgstr "La configurazione viene modificata da ConfigWizard" #: src/libslic3r/PrintConfig.cpp:1848 ->>>>>>> master msgid "Configuration notes" msgstr "Note di configurazione" @@ -2668,23 +2509,6 @@ msgstr "Continua" msgid "Continue and import newer configuration?" msgstr "Continuare e importare una configurazione più recente?" -<<<<<<< HEAD -#: src/slic3r/Utils/OctoPrint.cpp:185 -msgid "Connection to Prusa SL1 / SL1S works correctly." -msgstr "Collegamento a Prusa SL1 / SL1S correttamente funzionante." - -#: src/slic3r/Utils/OctoPrint.cpp:185 -msgid "Connection to Prusa SL1 works correctly." -msgstr "La connessione a Prusa SL1 funziona correttamente." - -#: src/slic3r/Utils/OctoPrint.cpp:229 -msgid "Connection to PrusaLink works correctly." -msgstr "Il collegamento a PrusaLink funziona correttamente." - -#: src/libslic3r/PrintConfig.cpp:2051 -msgid "Contact Z distance" -msgstr "Distanza di contatto Z" -======= #: src/slic3r/Utils/PresetUpdater.cpp:645 #: src/slic3r/Utils/PresetUpdater.cpp:662 msgid "Continue and install configuration updates?" @@ -2694,7 +2518,6 @@ msgstr "Continuare e installare gli aggiornamenti della configurazione?" #, boost-format msgid "Continue to activate a configuration snapshot %1%?" msgstr "Continuare ad attivare un'istantanea di configurazione %1%?" ->>>>>>> master #: src/slic3r/GUI/AboutDialog.cpp:272 msgid "" @@ -2783,42 +2606,8 @@ msgstr "Copia negli appunti" msgid "Copy Version Info" msgstr "Copia info versione" -<<<<<<< HEAD -#: src/slic3r/Utils/PresetUpdater.cpp:84 -msgid "" -"Copying of file %1% to %2% failed.\n" -"Error message : %3%\n" -"Copying was triggered by function: %4%" -msgstr "" -"Copia del file %1% a %2% non riuscita.\n" -"Messaggio errore : %3%\n" -"L'errore è stato causata dalla funzione: %4%" - -#: src/slic3r/Utils/PresetUpdater.cpp:91 -msgid "" -"Copying of file %1% to %2% failed. Permissions fail at target file after copying.\n" -"Error message : %3%\n" -"Copying was triggered by function: %4%" -msgstr "" -"Copia del file %1% su %2% non riuscita. Permessi non validi nel file di destinazione dopo la copia.\n" -"Messaggio errore : %3%\n" -" Questo errore è causato dalla funzione: %4%." - -#: src/slic3r/Utils/PresetUpdater.cpp:70 -msgid "" -"Copying of file %1% to %2% failed. Permissions fail at target file before copying.\n" -"Error message : %3%\n" -"This error happend during %4% phase." -msgstr "" -"Copia del file %1% su %2% non riuscita. Permessi non validi nel file di destinazione prima della copia.\n" -"Messaggio errore : %3%\n" -" Questo errore si è verificato durante la fase %4%." - -#: src/slic3r/Utils/PresetUpdater.cpp:65 -======= #: src/slic3r/Utils/PresetUpdater.cpp:61 #, boost-format ->>>>>>> master msgid "Copying of file %1% to %2% failed: %3%" msgstr "Copia del file %1% su %2% non riuscita: %3%" @@ -2846,14 +2635,6 @@ msgstr "" msgid "Copying of the temporary G-code to the output G-code failed" msgstr "Copia del G-code temporaneo nel G-code di output non riuscita" -<<<<<<< HEAD -#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:163 -msgid "" -"Copying of the temporary G-code to the output G-code failed. Maybe the SD card is write locked?\n" -"Error message: %1%" -msgstr "" -"Copia del G-code temporaneo sul G-code di uscita non riuscita. Forse la scheda SD è bloccata in scrittura?\n" -======= #: src/slic3r/GUI/BackgroundSlicingProcess.cpp:695 #, boost-format msgid "" @@ -2863,7 +2644,6 @@ msgid "" msgstr "" "Copia del G-code temporaneo sul G-code di uscita non riuscita. Forse la " "scheda SD è bloccata in scrittura?\n" ->>>>>>> master "Messaggio di errore: %1%" #: src/slic3r/GUI/BackgroundSlicingProcess.cpp:698 @@ -2937,12 +2717,6 @@ msgstr "Impossibile connettersi ad OctoPrint" msgid "Could not connect to Prusa SLA" msgstr "Connessione a Prusa SLA fallita" -<<<<<<< HEAD -#: src/slic3r/Utils/OctoPrint.cpp:235 -msgid "Could not connect to PrusaLink" -msgstr "Impossibile connettersi a PrusaLink" - -======= #: src/slic3r/Utils/OctoPrint.cpp:342 msgid "Could not connect to PrusaLink" msgstr "Impossibile connettersi a PrusaLink" @@ -2951,7 +2725,6 @@ msgstr "Impossibile connettersi a PrusaLink" msgid "Could not connect to Repetier" msgstr "Impossibile connettersi a Repetier" ->>>>>>> master #: src/slic3r/Utils/Http.cpp:73 msgid "" "Could not detect system SSL certificate store. PrusaSlicer will be unable to " @@ -3716,22 +3489,9 @@ msgstr "" "Seleziona SI se vuoi cambiare il valore a %s %%,\n" "o NO se sei sicuro che %s %s è il valore corretto." -<<<<<<< HEAD -#: src/slic3r/GUI/Field.cpp:288 -#, possible-c-format -msgid "" -"Do you mean %s%% instead of %s %s?\n" -"Select YES if you want to change this value to %s%%, \n" -"or NO if you are sure that %s %s is a correct value." -msgstr "" -"Intendevi %s invece di %s %s?\n" -"Seleziona SI se vuoi cambiare il valore a %s %%,\n" -"o NO se sei sicuro che %s %s è il valore corretto." -======= #: src/slic3r/GUI/ConfigWizard.cpp:2625 msgid "Do you want to continue changing the configuration?" msgstr "Vuoi continuare a modificare la configurazione?" ->>>>>>> master #: src/slic3r/GUI/DoubleSlider.cpp:2535 msgid "Do you want to delete all saved tool changes?" @@ -3772,13 +3532,6 @@ msgstr "non contiene un g-code valido." msgid "Don't arrange" msgstr "Non disporre" -<<<<<<< HEAD -# Don't install -msgid "Don't install" -msgstr "Non installare" - -#: src/slic3r/GUI/UpdateDialogs.cpp:71 -======= #: src/slic3r/GUI/GUI_App.cpp:974 msgid "Don't import" msgstr "Non importare" @@ -3788,7 +3541,6 @@ msgid "Don't install" msgstr "Non installare" #: src/slic3r/GUI/UpdateDialogs.cpp:72 ->>>>>>> master msgid "Don't notify about new releases any more" msgstr "Non notificare più i nuovi rilasci" @@ -4725,13 +4477,6 @@ msgstr "Layer sfumati" msgid "failed finding central directory" msgstr "directory centrale non trovata" -<<<<<<< HEAD -#: src/slic3r/GUI/Plater.cpp:2399 -msgid "Failed loading file \"%1%\" due to an invalid configuration." -msgstr "Impossibile caricare il file \"%1%\" a causa di una configurazione non valida." - -#: src/slic3r/Utils/FixModelByWin10.cpp:235 -======= #: src/slic3r/GUI/Plater.cpp:2516 #, boost-format msgid "Failed loading file \"%1%\" due to an invalid configuration." @@ -4740,7 +4485,6 @@ msgstr "" "valida." #: src/slic3r/Utils/FixModelByWin10.cpp:237 ->>>>>>> master msgid "Failed loading the input model." msgstr "Caricamento modello input fallito." @@ -5239,11 +4983,7 @@ msgid "For support enforcers only" msgstr "Solo per rinforzi supporto" #. TRN Description for "WHITE BULLET" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3702 -======= #: src/slic3r/GUI/Tab.cpp:4266 ->>>>>>> master msgid "" "for the left button: indicates a non-system (or non-default) preset,\n" "for the right button: indicates that the settings hasn't been modified." @@ -5251,13 +4991,6 @@ msgstr "" "per il tasto sinistro: indica un preset non di sistema (o non-predefinito),\n" "per il tasto destro: indica che le impostazioni non sono state modificate." -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigManipulation.cpp:135 -msgid "" -"For the Wipe Tower to work with the soluble supports, the support layers\n" -"need to be synchronized with the object layers." -msgstr "Per far sì che la torre di spurgo funzioni con i supporti solubili, i layer dei supporti devono essere sincronizzati con quelli del modello." -======= #: src/slic3r/GUI/ConfigManipulation.cpp:142 msgid "" "For the Wipe Tower to work with the soluble supports, the support layers\n" @@ -5265,7 +4998,6 @@ msgid "" msgstr "" "Per far sì che la torre di pulitura funzioni con i supporti solubili, i " "layer dei supporti devono essere sincronizzati con quelli del modello." ->>>>>>> master #: src/libslic3r/Print.cpp:594 msgid "" @@ -5396,21 +5128,13 @@ msgstr "g" msgid "G-code" msgstr "G-code" -<<<<<<< HEAD -#: src/slic3r/GUI/DoubleSlider.cpp:1146 -======= #: src/slic3r/GUI/DoubleSlider.cpp:1482 ->>>>>>> master msgid "" "G-code associated to this tick mark is in a conflict with print mode.\n" "Editing it will cause changes of Slider data." msgstr "" -<<<<<<< HEAD -"Il G-code associato a questo segno di spunta è in conflitto con la modalità di stampa.\n" -======= "Il G-code associato a questo segno di spunta è in conflitto con la modalità " "di stampa.\n" ->>>>>>> master "La modifica causerà cambiamenti nei dati della barra di scorrimento." #: src/slic3r/GUI/BackgroundSlicingProcess.cpp:715 @@ -5878,13 +5602,6 @@ msgstr "Nome Host" msgid "Hostname, IP or URL" msgstr "Nome Host, IP o URL" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:210 -msgid "" -"Hover the cursor over buttons to find more information \n" -"or click this button." -msgstr "Scorri il cursore sui bottoni per ottenere maggiori informazioni o clicca su questo bottone." -======= #: src/slic3r/GUI/Tab.cpp:223 msgid "" "Hover the cursor over buttons to find more information \n" @@ -5892,7 +5609,6 @@ msgid "" msgstr "" "Scorri il cursore sui bottoni per ottenere maggiori informazioni o clicca su " "questo bottone." ->>>>>>> master #: src/libslic3r/PrintConfig.cpp:3637 msgid "How far should the pad extend around the contained geometry" @@ -6045,15 +5761,6 @@ msgstr "" "più lunghe, ma possono avere un aspetto peggiore. Se disabilitato, i ponti " "hanno un aspetto migliore ma sono affidabili solo per distanze più brevi." -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigWizard.cpp:1164 -msgid "" -"If enabled, allows the Reload from disk command to automatically find and load the files when invoked.\n" -"If not enabled, the Reload from disk command will ask to select each file using an open file dialog." -msgstr "" -"Se attivo, permette al comando di Ricarica da disco di trovare e caricare automaticamente i file quando richiesti.\n" -"Se non attivo, il comando Ricarica da disco chiederà di selezionare ciascun file tramite finestra di apertura file." -======= #: src/slic3r/GUI/Preferences.cpp:368 msgid "" "If enabled, changes made using the sequential slider, in preview, apply only " @@ -6064,7 +5771,6 @@ msgstr "" "nell'anteprima, si applicano solo al gcode top layer. Se disabilitato, le " "modifiche fatte usando il cursore sequenziale, nell'anteprima, si applicano " "a tutto il gcode." ->>>>>>> master #: src/slic3r/GUI/Preferences.cpp:289 msgid "If enabled, PrusaSlicer will be open at the position it was closed" @@ -6507,19 +6213,9 @@ msgstr "Importazione del file 3mf riparato non riuscita" msgid "Import profile only" msgstr "Solo profilo di importazione" -<<<<<<< HEAD -#: src/slic3r/GUI/MainFrame.cpp:1000 -msgid "Import SL1 / SL1S archive" -msgstr "Importa archivio SL1 / SL1S" - -#: src/slic3r/GUI/MainFrame.cpp:1050 -msgid "Import SL1 archive" -msgstr "Importa archivio SL1" -======= #: src/slic3r/GUI/MainFrame.cpp:1209 msgid "Import SL1 / SL1S Archive" msgstr "Importa archivio SL1 / SL1S" ->>>>>>> master #: src/slic3r/GUI/Plater.cpp:1684 msgid "Import SLA archive" @@ -6592,15 +6288,6 @@ msgid "Increase/decrease edit area" msgstr "Aumenta/diminuisci l'area di modifica" #. TRN Description for "UNLOCKED LOCK" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3695 -msgid "" -"indicates that some settings were changed and are not equal to the system (or default) values for the current option group.\n" -"Click the UNLOCKED LOCK icon to reset all settings for current option group to the system (or default) values." -msgstr "" -"indica che è stata modificata qualche impostazione e non è uguale ai valori di sistema (o predefiniti) del corrente gruppo di opzioni.\n" -"Clicca l'icona LUCCHETTO APERTO per reimpostare tutte le impostazioni del corrente gruppo di opzioni ai valori di sistema (o predefiniti)." -======= #: src/slic3r/GUI/Tab.cpp:4259 msgid "" "indicates that some settings were changed and are not equal to the system " @@ -6612,7 +6299,6 @@ msgstr "" "di sistema (o predefiniti) del corrente gruppo di opzioni.\n" "Clicca l'icona LUCCHETTO APERTO per reimpostare tutte le impostazioni del " "corrente gruppo di opzioni ai valori di sistema (o predefiniti)." ->>>>>>> master #. TRN Description for "LOCKED LOCK" #: src/slic3r/GUI/Tab.cpp:4255 @@ -6624,27 +6310,6 @@ msgstr "" "per l'attuale gruppo di opzioni" #. TRN Description for "BACK ARROW" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3707 -msgid "" -"indicates that the settings were changed and are not equal to the last saved preset for the current option group.\n" -"Click the BACK ARROW icon to reset all settings for the current option group to the last saved preset." -msgstr "" -"indica che le impostazioni sono state modificate e non corrispondono all'ultimo preset salvato per l'attuale gruppo opzioni.\n" -"Clicca l'icona FRECCIA INDIETRO per reimpostare all'ultimo preset salvato tutte le impostazioni per il seguente gruppo di opzioni." - -#: src/slic3r/GUI/ConfigManipulation.cpp:210 -#: src/slic3r/GUI/GUI_ObjectList.cpp:35 src/slic3r/GUI/GUI_ObjectList.cpp:93 -#: src/slic3r/GUI/GUI_ObjectList.cpp:652 src/slic3r/GUI/Plater.cpp:393 -#: src/slic3r/GUI/Tab.cpp:1413 src/slic3r/GUI/Tab.cpp:1414 -#: src/libslic3r/PrintConfig.cpp:237 src/libslic3r/PrintConfig.cpp:450 -#: src/libslic3r/PrintConfig.cpp:472 src/libslic3r/PrintConfig.cpp:812 -#: src/libslic3r/PrintConfig.cpp:826 src/libslic3r/PrintConfig.cpp:863 -#: src/libslic3r/PrintConfig.cpp:1025 src/libslic3r/PrintConfig.cpp:1035 -#: src/libslic3r/PrintConfig.cpp:1053 src/libslic3r/PrintConfig.cpp:1072 -#: src/libslic3r/PrintConfig.cpp:1091 src/libslic3r/PrintConfig.cpp:1843 -#: src/libslic3r/PrintConfig.cpp:1860 -======= #: src/slic3r/GUI/Tab.cpp:4271 msgid "" "indicates that the settings were changed and are not equal to the last saved " @@ -6667,7 +6332,6 @@ msgstr "" #: src/libslic3r/PrintConfig.cpp:1385 src/libslic3r/PrintConfig.cpp:1454 #: src/libslic3r/PrintConfig.cpp:1474 src/libslic3r/PrintConfig.cpp:1493 #: src/libslic3r/PrintConfig.cpp:2314 src/libslic3r/PrintConfig.cpp:2331 ->>>>>>> master msgid "Infill" msgstr "Riempimento" @@ -6717,17 +6381,12 @@ msgstr "Tempo di esposizione iniziale" msgid "Initial layer height" msgstr "Altezza layer iniziale" -<<<<<<< HEAD -#: src/slic3r/GUI/Field.cpp:269 -#, possible-c-format -======= #: src/libslic3r/PrintConfig.cpp:514 msgid "Inner brim only" msgstr "Solo Brim interno" #: src/slic3r/GUI/Field.cpp:266 #, c-format, boost-format ->>>>>>> master msgid "" "Input value is out of range\n" "Are you sure that %s is a correct value and that you want to continue?" @@ -6778,19 +6437,9 @@ msgstr "Ispeziona / attiva istantanee di configurazione" msgid "Install" msgstr "Installa" -<<<<<<< HEAD -#: src/slic3r/GUI/UpdateDialogs.cpp:136 -msgid "Install" -msgstr "Installa" - -#: src/slic3r/GUI/ObjectDataViewModel.cpp:62 -#: src/slic3r/GUI/ObjectDataViewModel.cpp:218 -#, possible-c-format -======= #: src/slic3r/GUI/ObjectDataViewModel.cpp:98 #: src/slic3r/GUI/ObjectDataViewModel.cpp:266 #, c-format, boost-format ->>>>>>> master msgid "Instance %d" msgstr "Istanza %d" @@ -6978,13 +6627,8 @@ msgstr "Jitter" msgid "Jump to height" msgstr "Salta all'altezza" -<<<<<<< HEAD -#: src/slic3r/GUI/DoubleSlider.cpp:1223 -#, possible-c-format -======= #: src/slic3r/GUI/DoubleSlider.cpp:1391 #, c-format, boost-format ->>>>>>> master msgid "" "Jump to height %s\n" "or Set ruler mode" @@ -6992,13 +6636,8 @@ msgstr "" "Vai all'altezza %s \n" "o Imposta la modalità righello" -<<<<<<< HEAD -#: src/slic3r/GUI/DoubleSlider.cpp:1220 -#, possible-c-format -======= #: src/slic3r/GUI/DoubleSlider.cpp:1388 #, c-format, boost-format ->>>>>>> master msgid "" "Jump to height %s\n" "Set ruler mode\n" @@ -7246,19 +6885,9 @@ msgstr "Carica modello" msgid "Load an model saved with imperial units" msgstr "Carica un modello salvato con unità imperiali" -<<<<<<< HEAD -#: src/slic3r/GUI/MainFrame.cpp:1000 -msgid "Load an SL1 / Sl1S archive" -msgstr "Carica un archivio SL1 / SL1S" - -#: src/slic3r/GUI/MainFrame.cpp:1058 -msgid "Load an SL1 archive" -msgstr "Carica un archivio SL1" -======= #: src/slic3r/GUI/MainFrame.cpp:1209 msgid "Load an SL1 / Sl1S archive" msgstr "Carica un archivio SL1 / SL1S" ->>>>>>> master #: src/libslic3r/PrintConfig.cpp:4454 msgid "" @@ -8183,13 +7812,6 @@ msgstr "Monotonico" msgid "More" msgstr "Altro" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI.cpp:339 -msgid "Most likely the configuration was produced by a newer version of PrusaSlicer or by some PrusaSlicer fork." -msgstr "Molto probabilmente la configurazione è stata creata da una versione più recente di PrusaSlicer o da qualche fork di PrusaSlicer." - -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1219 -======= #: src/slic3r/GUI/GUI.cpp:326 msgid "" "Most likely the configuration was produced by a newer version of PrusaSlicer " @@ -8199,7 +7821,6 @@ msgstr "" "recente di PrusaSlicer o da qualche fork di PrusaSlicer." #: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1224 ->>>>>>> master msgid "Mouse wheel" msgstr "Rotella del mouse" @@ -8305,23 +7926,15 @@ msgstr "" msgid "Multiple Extruders" msgstr "Estrusori multipli" -<<<<<<< HEAD -#: src/slic3r/GUI/Plater.cpp:2372 -======= #: src/slic3r/GUI/Plater.cpp:2648 ->>>>>>> master msgid "" "Multiple objects were loaded for a multi-material printer.\n" "Instead of considering them as multiple objects, should I consider\n" "these files to represent a single object having multiple parts?" msgstr "" "Sono stati caricati oggetti multipli per stampante multi-material.\n" -<<<<<<< HEAD -"Invece di considerarli come oggetti multipli, devo considerarli come parte di un singolo oggetto avente parti multiple?" -======= "Invece di considerarli come oggetti multipli, devo considerarli come parte " "di un singolo oggetto avente parti multiple?" ->>>>>>> master #: src/libslic3r/PrintConfig.cpp:4368 msgid "Multiply copies by creating a grid." @@ -8413,20 +8026,10 @@ msgstr "Nuovo progetto" msgid "New project, clear plater" msgstr "Nuovo progetto, pulisci piano" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI.cpp:304 -msgid "new unknown value %1% was changed to default value %2%" -msgstr "il nuovo valore sconosciuto %1% è stato sostituito al valore predefinito %2%" - -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:609 -msgid "New Value" -msgstr "Nuovo valore" -======= #: src/slic3r/GUI/GUI_App.cpp:1203 #, boost-format msgid "New release version %1% is available." msgstr "La nuova versione %1% è disponibile." ->>>>>>> master #: src/slic3r/GUI/UnsavedChangesDialog.cpp:832 msgid "New Value" @@ -8534,29 +8137,6 @@ msgstr "Non trovato:" msgid "Note" msgstr "Nota" -<<<<<<< HEAD -#: src/slic3r/GUI/MsgDialog.cpp:114 -msgid "Note that" -msgstr "Si noti che" - -#: src/slic3r/GUI/Tab.cpp:3408 -msgid "Note, that selected preset will be deleted from this/those printer(s) too." -msgstr "Nota: il preset selezionato verrà eliminato anche da questa/e stampante/i." - -#: src/slic3r/GUI/Tab.cpp:3416 -msgid "Note, that this/those printer(s) will be deleted after deleting of the selected preset." -msgstr "Nota: questa/e stampante/i saranno cancellate dopo aver cancellato il preset selezionato." - -#: src/slic3r/GUI/Tab.cpp:2039 -msgid "" -"Note: All parameters from this group are moved to the Physical Printer settings (see changelog).\n" -"\n" -"A new Physical Printer profile is created by clicking on the \"cog\" icon right of the Printer profiles combo box, by selecting the \"Add physical printer\" item in the Printer combo box. The Physical Printer profile editor opens also when clicking on the \"cog\" icon in the Printer settings tab. The Physical Printer profiles are being stored into PrusaSlicer/physical_printer directory." -msgstr "" -"Nota: Tutti i parametri di questo gruppo vengono spostati nelle impostazioni della stampante fisica (vedi changelog).\n" -"\n" -"Un nuovo profilo di stampante fisica viene creato cliccando sull'icona \"ingranaggio\" a destra della casella combinata dei profili della stampante, selezionando la voce \"Aggiungi stampante fisica\" nella casella combinata della stampante. L'editor dei profili della stampante fisica si apre anche cliccando sull'icona \"ingranaggio\" nella scheda Impostazioni della stampante. I profili della stampante fisica vengono memorizzati nella directory PrusaSlicer/physical_printer." -======= #: src/slic3r/GUI/Tab.cpp:3716 msgid "Note, that the selected preset will be deleted from this printer too." msgid_plural "" @@ -8604,7 +8184,6 @@ msgstr "" "apre anche cliccando sull'icona \"ingranaggio\" nella scheda Impostazioni " "della stampante. I profili della stampante fisica vengono memorizzati nella " "directory PrusaSlicer/physical_printer." ->>>>>>> master #: src/slic3r/Utils/AstroBox.cpp:92 msgid "Note: AstroBox version at least 1.1.0 is required." @@ -9084,13 +8663,6 @@ msgstr "Apri la pagina di download dei driver Prusa3D sul browser" msgid "Open the software releases page in your browser" msgstr "Apri la pagina delle versioni software sul browser" -<<<<<<< HEAD -#: src/slic3r/GUI/UpdateDialogs.cpp:89 -msgid "Opening Configuration Wizard" -msgstr "Apertura Configurazione Guidata" - -#: src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp:220 src/slic3r/GUI/Plater.cpp:3961 -======= #: src/slic3r/GUI/UpdateDialogs.cpp:94 msgid "Opening Configuration Wizard" msgstr "Apertura Configurazione Guidata" @@ -9129,7 +8701,6 @@ msgstr "" "impostata." #: src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp:505 ->>>>>>> master msgid "Optimize orientation" msgstr "Ottimizza orientamento" @@ -9606,15 +9177,6 @@ msgstr "Stampanti fisiche" msgid "Pick another vendor supported by %s" msgstr "Scegli un altro produttore supportato da %s" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:67 -msgid "Picture sizes to be stored into a .gcode and .sl1 / .sl1s files, in the following format: \"XxY, XxY, ...\"" -msgstr "Dimensioni delle immagini da memorizzare in un file .gcode e .sl1 / .sl1s, nel seguente formato: \"XxY, XxY, ...\"" - -#: src/libslic3r/PrintConfig.cpp:67 -msgid "Picture sizes to be stored into a .gcode and .sl1 files, in the following format: \"XxY, XxY, ...\"" -msgstr "Dimensioni delle immagini da memorizzare in un file .gcode e .sl1, nel seguente formato: \"XxY, XxY, ...\"" -======= #: src/libslic3r/PrintConfig.cpp:257 msgid "" "Picture sizes to be stored into a .gcode and .sl1 / .sl1s files, in the " @@ -9622,7 +9184,6 @@ msgid "" msgstr "" "Dimensioni delle immagini da memorizzare in un file .gcode e .sl1 / .sl1s, " "nel seguente formato: \"XxY, XxY, ...\"" ->>>>>>> master #: src/libslic3r/PrintConfig.cpp:3483 msgid "Pillar connection mode" @@ -9691,15 +9252,7 @@ msgstr "" "Salva il tuo progetto e riavvia PrusaSlicer. Ti saremmo grati se ci " "segnalassi il problema." -<<<<<<< HEAD -#: src/slic3r/GUI/GUI.cpp:341 -msgid "Please review the substitutions and adjust them if needed." -msgstr "Rivedere le sostituzioni e regolarle se necessario." - -#: src/slic3r/GUI/Plater.cpp:3089 -======= #: src/slic3r/GUI/Plater.cpp:3620 ->>>>>>> master msgid "Please select the file to reload" msgstr "Seleziona il file da ricaricare" @@ -9864,11 +9417,7 @@ msgstr "Premi per attivare il rettangolo di deselezione" msgid "Press to activate selection rectangle" msgstr "Premi per attivare il rettangolo di selezione" -<<<<<<< HEAD -#: src/slic3r/GUI/KBShortcutsDialog.cpp:155 -======= #: src/slic3r/GUI/KBShortcutsDialog.cpp:136 ->>>>>>> master msgid "" "Press to select multiple objects\n" "or move multiple objects with mouse" @@ -9876,17 +9425,10 @@ msgstr "" "Premi per selezionare o spostare\n" "oggetti multipli con il mouse" -<<<<<<< HEAD -#: src/slic3r/GUI/KBShortcutsDialog.cpp:221 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:222 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:231 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:232 -======= #: src/slic3r/GUI/KBShortcutsDialog.cpp:239 #: src/slic3r/GUI/KBShortcutsDialog.cpp:240 #: src/slic3r/GUI/KBShortcutsDialog.cpp:250 #: src/slic3r/GUI/KBShortcutsDialog.cpp:251 ->>>>>>> master msgid "" "Press to speed up 5 times while moving thumb\n" "with arrow keys or mouse wheel" @@ -10190,17 +9732,6 @@ msgstr "Errore PrusaSlicer" msgid "PrusaSlicer GUI initialization failed" msgstr "Inizializzazione GUI PrusaSlicer non riuscita" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_App.cpp:586 -msgid "" -"PrusaSlicer has encountered a localization error. Please report to PrusaSlicer team, what language was active and in which scenario this issue happened. Thank you.\n" -"\n" -"The application will now terminate." -msgstr "" -"PrusaSlicer ha riscontrato un errore di localizzazione. Si prega di riferire al team di PrusaSlicer, quale lingua era attiva e in quale scenario si è verificato questo problema. Grazie.\n" -"\n" -"L'applicazione terminerà ora." -======= #: src/slic3r/GUI/BackgroundSlicingProcess.cpp:84 #, boost-format msgid "PrusaSlicer has encountered a fatal error: \"%1%\"" @@ -10237,7 +9768,6 @@ msgstr "" #: src/slic3r/GUI/MainFrame.cpp:232 msgid "PrusaSlicer is closing" msgstr "PrusaSlicer si sta chiudendo" ->>>>>>> master #: src/slic3r/GUI/UpdateDialogs.cpp:95 msgid "" @@ -10259,26 +9789,9 @@ msgstr "" "correttamente, mentre è stata rilevata la versione %s OpenGL, render %s, " "distributore %s." -<<<<<<< HEAD -#: src/slic3r/GUI/UpdateDialogs.cpp:90 -msgid "" -"PrusaSlicer is not using the newest configuration available.\n" -"Configuration Wizard may not offer the latest printers, filaments and SLA materials to be installed. " -msgstr "" -"PrusaSlicer non sta usando la configurazione più recente disponibile.\n" -"La configurazione guidata potrebbe non offrire la possibilità di installare le ultime stampanti, filamenti e materiali SLA." - -#: src/slic3r/GUI/OpenGLManager.cpp:259 -#, possible-c-format -msgid "" -"PrusaSlicer requires OpenGL 2.0 capable graphics driver to run correctly, \n" -"while OpenGL version %s, render %s, vendor %s was detected." -msgstr "PrusaSlicer richiede un driver video con supporto OpenGL 2.0 per funzionare correttamente, mentre è stata rilevata la versione %s OpenGL, render %s, distributore %s." -======= #: src/slic3r/GUI/GUI_App.cpp:1329 msgid "PrusaSlicer started after a crash" msgstr "PrusaSlicer è stato avviato dopo un crash" ->>>>>>> master #: src/slic3r/GUI/ConfigSnapshotDialog.cpp:60 msgid "PrusaSlicer version" @@ -10288,21 +9801,9 @@ msgstr "versione PrusaSlicer" msgid "PrusaSlicer will remember your action." msgstr "PrusaSlicer ricorderà la tua azione." -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigWizard.cpp:1174 -msgid "" -"PrusaSlicer's user interfaces comes in three variants:\n" -"Simple, Advanced, and Expert.\n" -"The Simple mode shows only the most frequently used settings relevant for regular 3D printing. The other two offer progressively more sophisticated fine-tuning, they are suitable for advanced and expert users, respectively." -msgstr "" -"L'interfaccia utente di PrusaSlicer è disponibile in tre varianti:\n" -"Semplice, Avanzata ed Esperto.\n" -"La modalità Semplice mostra solo le impostazioni rilevanti utilizzate più spesso per una semplice stampa 3D. Le altre due offrono progressivamente ottimizzazioni più sofisticate, sono adatte ad utenti avanzati ed esperti, rispettivamente." -======= #: src/slic3r/GUI/GUI_App.cpp:3074 src/slic3r/GUI/Plater.cpp:1734 msgid "PrusaSlicer will remember your choice." msgstr "PrusaSlicer ricorderà la tua scelta." ->>>>>>> master #: src/slic3r/GUI/ConfigWizard.cpp:1274 msgid "" @@ -10418,19 +9919,6 @@ msgstr "Layer raft" msgid "Ramming customization" msgstr "Personalizzazione del ramming" -<<<<<<< HEAD -#: src/slic3r/GUI/WipeTowerDialog.cpp:41 -msgid "" -"Ramming denotes the rapid extrusion just before a tool change in a single-extruder MM printer. Its purpose is to properly shape the end of the unloaded filament so it does not prevent insertion of the new filament and can itself be reinserted later. This phase is important and different materials can require different extrusion speeds to get the good shape. For this reason, the extrusion rates during ramming are adjustable.\n" -"\n" -"This is an expert-level setting, incorrect adjustment will likely lead to jams, extruder wheel grinding into filament etc." -msgstr "" -"Il ramming è la rapida estrusione appena prima di un cambio di attrezzo in una stampante MM ad estrusore singolo. Lo scopo è di dare la forma corretta al capo del filamento scaricato cosicché non prevenga l'inserzione del nuovo filamento e perché possa essere inserito più facilmente esso stesso. Questa fase è importante e materiali diversi possono richiedere velocità diverse per ottenere la forma corretta. Per questo motivo le velocità di estrusione del ramming possono essere modificate.\n" -"\n" -"Questa è un'impostazione per esperti, valori scorretti produrranno facilmente dei blocchi, o porteranno l'ingranaggio di estrusione a macinare il filamento etc." - -#: src/slic3r/GUI/WipeTowerDialog.cpp:91 -======= #: src/slic3r/GUI/WipeTowerDialog.cpp:54 msgid "" "Ramming denotes the rapid extrusion just before a tool change in a single-" @@ -10456,7 +9944,6 @@ msgstr "" "il filamento etc." #: src/slic3r/GUI/WipeTowerDialog.cpp:122 ->>>>>>> master msgid "Ramming line spacing" msgstr "Spaziatura tra linee di ramming" @@ -11217,19 +10704,9 @@ msgstr "Salva progetto (3mf)" msgid "Save project as (3mf)" msgstr "Salva progetto come (3mf)" -<<<<<<< HEAD -#: src/slic3r/GUI/Plater.cpp:5337 -msgid "Save SL1 / SL1S file as:" -msgstr "Salva file SL1 / SL1S come:" - -#: src/slic3r/GUI/Plater.cpp:4975 -msgid "Save SL1 file as:" -msgstr "Salva file SL1 come:" -======= #: src/slic3r/GUI/Plater.cpp:5707 msgid "Save SL1 / SL1S file as:" msgstr "Salva file SL1 / SL1S come:" ->>>>>>> master #: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:898 msgid "Save support points?" @@ -11477,23 +10954,14 @@ msgstr "Seleziona il tipo di Pad richiesto" msgid "Select what kind of support do you need" msgstr "Seleziona il tipo di supporto richiesto" -<<<<<<< HEAD -#: src/slic3r/GUI/DoubleSlider.cpp:2135 -======= #: src/slic3r/GUI/DoubleSlider.cpp:2532 ->>>>>>> master msgid "" "Select YES if you want to delete all saved tool changes, \n" "NO if you want all tool changes switch to color changes, \n" "or CANCEL to leave it unchanged." msgstr "" -<<<<<<< HEAD -"Seleziona SI se vuoi cancellare tutti i cambi attrezzo salvati,\n" -"NO se vuoi che tutti i cambi attrezzo passino a cambi colore,\n" -======= "Seleziona SI se vuoi cancellare tutti i cambi strumento salvati,\n" "NO se vuoi che tutti i cambi strumento passino a cambi colore,\n" ->>>>>>> master "o ANNULLA per lasciarlo invariato." #: src/slic3r/GUI/Selection.cpp:168 @@ -11891,18 +11359,6 @@ msgstr "Imposta Istanza non stampabile" msgid "Set upper thumb as active" msgstr "Imposta cursore superiore come attivo" -<<<<<<< HEAD -#: src/slic3r/GUI/KBShortcutsDialog.cpp:217 -msgid "Set upper thumb to current slider thumb" -msgstr "Imposta il cursore superiore alla barra di scorrimento attuale" - -#: src/libslic3r/PrintConfig.cpp:3714 -msgid "" -"Sets logging sensitivity. 0:fatal, 1:error, 2:warning, 3:info, 4:debug, 5:trace\n" -"For example. loglevel=2 logs fatal, error and warning level messages." -msgstr "" -"Imposta la sensibilità di log. 0:fatale, 1:errore, 2:avviso, 3:informazioni, 4:debug, 5:traccia\n" -======= #: src/libslic3r/PrintConfig.cpp:4458 msgid "" "Sets logging sensitivity. 0:fatal, 1:error, 2:warning, 3:info, 4:debug, 5:" @@ -11911,7 +11367,6 @@ msgid "" msgstr "" "Imposta la sensibilità di log. 0:fatale, 1:errore, 2:avviso, 3:informazioni, " "4:debug, 5:traccia\n" ->>>>>>> master "Per esempio. loglevel=2 registra messaggi fatali, di errore e di avviso." #: src/slic3r/GUI/BedShapeDialog.cpp:249 src/slic3r/GUI/GCodeViewer.cpp:3705 @@ -12235,17 +11690,6 @@ msgstr "Setup Estrusore singolo MM" msgid "Single Extruder Multi Material" msgstr "Estrusore singolo Multi Material" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:2101 -msgid "" -"Single Extruder Multi Material is selected, \n" -"and all extruders must have the same diameter.\n" -"Do you want to change the diameter for all extruders to first extruder nozzle diameter value?" -msgstr "" -"Materiale multiplo a singolo estrusore selezionato,\n" -"tutti gli estrusori devono avere lo stesso diametro.\n" -"Vuoi modificare il diametro di tutti gli estrusori al valore del diametro dell'ugello del primo estrusore?" -======= #: src/slic3r/GUI/Tab.cpp:2326 msgid "" "Single Extruder Multi Material is selected, \n" @@ -12257,7 +11701,6 @@ msgstr "" "tutti gli estrusori devono avere lo stesso diametro.\n" "Vuoi modificare il diametro di tutti gli estrusori al valore del diametro " "dell'ugello del primo estrusore?" ->>>>>>> master #: src/slic3r/GUI/Tab.cpp:2734 msgid "Single extruder multimaterial parameters" @@ -12597,16 +12040,6 @@ msgstr "" msgid "Some filaments were uninstalled." msgstr "Alcuni filamenti sono stati disinstallati." -<<<<<<< HEAD -#: src/slic3r/GUI/Plater.cpp:2309 -#, possible-c-format -msgid "" -"Some object(s) in file %s looks like saved in inches.\n" -"Should I consider them as a saved in inches and convert them?" -msgstr "" -"Alcuni oggetti nel file %s sembrano salvati in pollici.\n" -"Devo considerarli come salvati in pollici e convertirli?" -======= #: src/libslic3r/PrintConfig.cpp:1321 msgid "" "Some G/M-code commands, including temperature control and others, are not " @@ -12618,7 +12051,6 @@ msgstr "" "sono universali. Imposta questa opzione nel firmware della tua stampante per " "ottenere un output compatibile. La versione \"No extrusion\" evita che " "PrusaSlicer non esporti alcun valore." ->>>>>>> master #: src/slic3r/GUI/GLCanvas3D.cpp:6370 msgid "Some objects are not visible during editing." @@ -12940,35 +12372,6 @@ msgstr "Avvia un nuovo processo di slicing" msgid "Start the application" msgstr "Avvia l'applicazione" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_App.cpp:386 -msgid "" -"Starting with %1% 2.3, configuration directory on Linux has changed (according to XDG Base Directory Specification) to \n" -"%2%.\n" -"\n" -"This directory did not exist yet (maybe you run the new version for the first time).\n" -"However, an old %1% configuration directory was detected in \n" -"%3%.\n" -"\n" -"Consider moving the contents of the old directory to the new location in order to access your profiles, etc.\n" -"Note that if you decide to downgrade %1% in future, it will use the old location again.\n" -"\n" -"What do you want to do now?" -msgstr "" -"A partire da %1% 2.3, la directory di configurazione su Linux è cambiata (secondo la XDG Base Directory Specification) in \n" -"%2%.\n" -"\n" -"Questa directory non esiste ancora (forse stai usando la nuova versione per la prima volta).\n" -"Tuttavia, è stata rilevata una vecchia directory di configurazione %1% in \n" -"%3%.\n" -"\n" -"Prendere in considerazione la possibilità di spostare il contenuto della vecchia directory nella nuova posizione per accedere ai propri profili, ecc.\n" -"Notare che se si decide di fare un downgrade di %1% in futuro, si utilizzerà di nuovo la vecchia posizione.\n" -"\n" -"Cosa vuoi fare adesso?" - -#: src/slic3r/GUI/PrintHostDialogs.cpp:149 -======= #: src/slic3r/GUI/GUI_App.cpp:411 #, boost-format msgid "" @@ -13006,7 +12409,6 @@ msgstr "" "Cosa vuoi fare adesso?" #: src/slic3r/GUI/PrintHostDialogs.cpp:249 ->>>>>>> master msgid "Status" msgstr "Stato" @@ -13199,11 +12601,7 @@ msgstr "Supporto Tempo residuo" msgid "Supports stealth mode" msgstr "Supporto modalità silenziosa" -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigManipulation.cpp:158 -======= #: src/slic3r/GUI/ConfigManipulation.cpp:164 ->>>>>>> master msgid "" "Supports work better, if the following feature is enabled:\n" "- Detect bridging perimeters" @@ -13273,27 +12671,13 @@ msgstr "Passa alla modalità %s" msgid "Switching Presets: Unsaved Changes" msgstr "Cambio di preset: Modifiche non salvate" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_App.cpp:1608 -======= #: src/slic3r/GUI/GUI_App.cpp:2368 ->>>>>>> master msgid "" "Switching the language will trigger application restart.\n" "You will lose content of the plater." msgstr "" "Il cambio della lingua necessita il riavvio dell'applicazione.\n" "Verrà cancellato il contenuto del piano." -<<<<<<< HEAD - -#: src/slic3r/GUI/WipeTowerDialog.cpp:365 -msgid "" -"Switching to simple settings will discard changes done in the advanced mode!\n" -"\n" -"Do you want to proceed?" -msgstr "" -"Cambiare alle impostazioni semplici eliminerà tutte le modifiche fatte alle impostazioni complesse!\n" -======= #: src/slic3r/GUI/Plater.cpp:4861 #, boost-format @@ -13315,7 +12699,6 @@ msgid "" msgstr "" "Cambiare alle impostazioni semplici eliminerà tutte le modifiche fatte alle " "impostazioni complesse!\n" ->>>>>>> master "\n" "Procedere?" @@ -13421,16 +12804,6 @@ msgstr "" msgid "The %s device could not have been found" msgstr "Il dispositivo %s non è stato trovato" -<<<<<<< HEAD -#: src/slic3r/GUI/FirmwareDialog.cpp:436 -#, possible-c-format -msgid "" -"The %s device was not found.\n" -"If the device is connected, please press the Reset button next to the USB connector ..." -msgstr "" -"Il dispositivo %s non è stato trovato.\n" -"Se il dispositivo è connesso, premi il pulsante Reset vicino al connettore USB ..." -======= #: src/slic3r/GUI/FirmwareDialog.cpp:437 #, c-format, boost-format msgid "" @@ -13441,7 +12814,6 @@ msgstr "" "Il dispositivo %s non è stato trovato.\n" "Se il dispositivo è connesso, premi il pulsante Reset vicino al connettore " "USB ..." ->>>>>>> master #: src/slic3r/GUI/GUI_App.cpp:957 #, boost-format @@ -13468,16 +12840,6 @@ msgid "" msgstr "" "Il preset personalizzato corrente sarà staccato dal preset del sistema padre." -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:925 -msgid "" -"The currently manipulated object is tilted (rotation angles are not multiples of 90°).\n" -"Non-uniform scaling of tilted objects is only possible in the World coordinate system,\n" -"once the rotation is embedded into the object coordinates." -msgstr "" -"L'oggetto modificato corrente è inclinato (angoli di rotazione non multipli di 90°).\n" -"Un ridimensionamento non uniforme di un oggetto inclinato è possibile solamente su un sistema di coordinate reali, non appena la rotazione è inclusa nelle coordinate dell'oggetto." -======= #: src/slic3r/GUI/GUI_ObjectManipulation.cpp:980 msgid "" "The currently manipulated object is tilted (rotation angles are not " @@ -13491,7 +12853,6 @@ msgstr "" "Un ridimensionamento non uniforme di un oggetto inclinato è possibile " "solamente su un sistema di coordinate reali, non appena la rotazione è " "inclusa nelle coordinate dell'oggetto." ->>>>>>> master #: src/libslic3r/PrintConfig.cpp:3551 msgid "The default angle for connecting support sticks and junctions." @@ -13693,15 +13054,6 @@ msgstr "" msgid "the following suffix is not allowed:" msgstr "il seguente suffisso non è permesso:" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI.cpp:340 -msgid "The following values were substituted:" -msgstr "I seguenti valori sono stati sostituiti:" - -#: src/libslic3r/PrintConfig.cpp:3035 -msgid "The gap between the object bottom and the generated pad in zero elevation mode." -msgstr "Lo spazio tra la parte inferiore dell'oggetto e il pad generato nella modalità ad elevazione zero." -======= #: src/slic3r/GUI/GUI.cpp:327 msgid "The following values were substituted:" msgstr "I seguenti valori sono stati sostituiti:" @@ -13713,7 +13065,6 @@ msgid "" msgstr "" "Lo spazio tra la parte inferiore dell'oggetto e il pad generato nella " "modalità ad elevazione zero." ->>>>>>> master #: src/libslic3r/PrintConfig.cpp:3529 msgid "The height of the pillar base cone" @@ -13858,17 +13209,6 @@ msgstr "" "L'oggetto verrà sollevato per questo numero di layer e verrà generato il " "materiale di supporto al di sotto di esso." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2567 -msgid "" -"The percentage of the bed area. \n" -"If the print area exceeds the specified value, \n" -"then a slow tilt will be used, otherwise - a fast tilt" -msgstr "" -"La percentuale dell'area del piano.\n" -"Se l'area di stampa supera un determinato valore,\n" -"verrà utilizzata l'inclinazione lenta, in caso contrario - l'inclinazione veloce" -======= #: src/libslic3r/PrintConfig.cpp:3464 msgid "" "The percentage of smaller pillars compared to the normal pillar diameter " @@ -13877,7 +13217,6 @@ msgstr "" "La percentuale di pilastri più piccoli rispetto al diametro normale dei " "pilastri che vengono utilizzati in aree problematiche in cui un normale " "pilastro non può adattarsi." ->>>>>>> master #: src/libslic3r/PrintConfig.cpp:3176 msgid "" @@ -14040,25 +13379,6 @@ msgstr "" "Il progetto selezionato non è più disponibile.\n" "Vuoi rimuoverlo dall'elenco dei progetti recenti?" -<<<<<<< HEAD -#: src/slic3r/GUI/MainFrame.cpp:1003 -msgid "" -"The selected project is no longer available.\n" -"Do you want to remove it from the recent projects list?" -msgstr "" -"Il progetto selezionato non è più disponibile.\n" -"Vuoi rimuoverlo dall'elenco dei progetti recenti?" - -#: src/slic3r/GUI/DoubleSlider.cpp:1121 -msgid "" -"The sequential print is on.\n" -"It's impossible to apply any custom G-code for objects printing sequentually.\n" -"This code won't be processed during G-code generation." -msgstr "" -"La stampa sequenziale è attiva.\n" -"Non è possibile applicare alcun G-code personalizzato per oggetti con stampa sequenziale.\n" -"Questo codice non sarà processato durante la generazione del G-code." -======= #: src/slic3r/GUI/DoubleSlider.cpp:1440 msgid "" "The sequential print is on.\n" @@ -14079,7 +13399,6 @@ msgstr "" "La stampa sequenziale è attiva.\n" "È impossibile applicare qualsiasi G-code personalizzato per gli oggetti che " "vengono stampati in sequenza." ->>>>>>> master #: src/slic3r/GUI/ConfigWizard.cpp:1287 msgid "The size of the object can be specified in inches" @@ -14115,31 +13434,10 @@ msgstr "" "(si applica solamente al motore dell'estrusore). Se lasciato a zero, verrà " "utilizzata la velocità di retrazione." -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigManipulation.cpp:80 -#, possible-c-format -msgid "" -"The Spiral Vase mode requires:\n" -"- one perimeter\n" -"- no top solid layers\n" -"- 0% fill density\n" -"- no support material\n" -"- Ensure vertical shell thickness enabled\n" -"- Detect thin walls disabled" -msgstr "" -"La modalità Vaso a spirale necessita:\n" -"-un solo perimetro\n" -"-nessun layer solido superiore\n" -"-densità riempimento 0%\n" -"-nessun materiale di supporto\n" -"-Mantieni spessore guscio verticale attivo\n" -"-Rileva perimetri sottili disattivo" -======= #: src/libslic3r/PrintConfig.cpp:2198 msgid "The speed for retractions (it only applies to the extruder motor)." msgstr "" "Velocità delle retrazioni (si applica solamente al motore dell'estrusore)." ->>>>>>> master #: src/slic3r/GUI/ConfigManipulation.cpp:82 msgid "" @@ -14220,22 +13518,14 @@ msgstr "" "support_material_contact_distance sarà usato per entrambe le distanze di " "contatto Z superiore e inferiore." -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:2731 -======= #: src/slic3r/GUI/Tab.cpp:3005 ->>>>>>> master msgid "" "The Wipe option is not available when using the Firmware Retraction mode.\n" "\n" "Shall I disable it in order to enable Firmware Retraction?" msgstr "" -<<<<<<< HEAD -"La funzione Wipe non è disponibile quando si usa la modalità Retrazione Firmware.\n" -======= "La funzione Pulitura non è disponibile quando si usa la modalità Retrazione " "Firmware.\n" ->>>>>>> master "\n" "Devo disattivarla per poter abilitare la Retrazione Firmware?" @@ -14246,14 +13536,6 @@ msgstr "" "La Torre di Pulitura attualmente non supporta la volumetrica E " "(use_volumetric_e=0)." -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigManipulation.cpp:114 -msgid "" -"The Wipe Tower currently supports the non-soluble supports only\n" -"if they are printed with the current extruder without triggering a tool change.\n" -"(both support_material_extruder and support_material_interface_extruder need to be set to 0)." -msgstr "La Torre di Spurgo attualmente è compatibile con i supporti non solubili solamente se questi sono stampati con l'attuale estrusore senza l'innesco di un cambio attrezzo. (entrambi support_material_extruder e support_material_interface_extruder devono essere impostati a 0)." -======= #: src/slic3r/GUI/ConfigManipulation.cpp:121 msgid "" "The Wipe Tower currently supports the non-soluble supports only\n" @@ -14266,7 +13548,6 @@ msgstr "" "solamente se questi sono stampati con l'attuale estrusore senza l'innesco di " "un cambio strumento. (entrambi support_material_extruder e " "support_material_interface_extruder devono essere impostati a 0)." ->>>>>>> master #: src/libslic3r/Print.cpp:598 msgid "" @@ -14372,31 +13653,6 @@ msgstr "" "È presente un cambio colore per l'estrusore che non è stato usato prima.\n" "Controlla le impostazioni per evitare cambi colore ridondanti." -<<<<<<< HEAD -#: src/slic3r/GUI/DoubleSlider.cpp:1155 -msgid "" -"There is a color change for extruder that has not been used before.\n" -"Check your settings to avoid redundant color changes." -msgstr "" -"È presente un cambio colore per l'estrusore che non è stato usato prima.\n" -"Controlla le impostazioni per evitare cambi colore ridondanti." - -#: src/slic3r/GUI/DoubleSlider.cpp:1149 -msgid "" -"There is a color change for extruder that won't be used till the end of print job.\n" -"This code won't be processed during G-code generation." -msgstr "" -"È presente un cambio colore per l'estrusore che non sarà utilizzato fino alla fine del lavoro di stampa.\n" -"Questo codice non sarà processato durante la generazione del G-code." - -#: src/slic3r/GUI/DoubleSlider.cpp:1152 -msgid "" -"There is an extruder change set to the same extruder.\n" -"This code won't be processed during G-code generation." -msgstr "" -"È presente un cambio estrusore impostato nello stesso estrusore.\n" -"Questo codice non verrà processato durante la generazione del G-code." -======= #: src/slic3r/GUI/DoubleSlider.cpp:1485 msgid "" "There is a color change for extruder that won't be used till the end of " @@ -14418,7 +13674,6 @@ msgstr "" #: src/libslic3r/GCode.cpp:539 msgid "There is an object with no extrusions in the first layer." msgstr "C'è un oggetto senza estrusioni nel primo layer." ->>>>>>> master #: src/libslic3r/PrintConfig.cpp:2799 msgid "Thick bridges" @@ -14429,27 +13684,6 @@ msgstr "Ponti spessi" msgid "This %s version: %s" msgstr "%s versione: %s" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:1244 -msgid "" -"This action is not revertable.\n" -"Do you want to proceed?" -msgstr "" -"Questa azione non è reversibile.\n" -"Vuoi continuare?" - -#: src/libslic3r/PrintConfig.cpp:199 -msgid "This code is inserted between objects when using sequential printing. By default extruder and bed temperature are reset using non-wait command; however if M104, M109, M140 or M190 are detected in this custom code, Slic3r will not add temperature commands. Note that you can use placeholder variables for all Slic3r settings, so you can put a \"M109 S[first_layer_temperature]\" command wherever you want." -msgstr "Questo codice è inserito tra gli oggetti quando si utilizza una stampa sequenziale. Come predefinito, la temperatura di estrusione e del piano sono resettate con il comando non-attesa; in ogni caso se nel codice personalizzato vengono rilevati i comandi M104,M109,M140 o M190, Slic3r non aggiungerà i comandi di temperatura. Si fa presente che puoi usare variabili sostitutive per tutte le impostazioni di Slic3r, quindi puoi inserire un comando \"M109 S[first_layer_temperature]\" quando preferisci." - -#: src/libslic3r/PrintConfig.cpp:1174 -msgid "This custom code is inserted at every layer change, right after the Z move and before the extruder moves to the first layer point. Note that you can use placeholder variables for all Slic3r settings as well as [layer_num] and [layer_z]." -msgstr "Questo codice personalizzato è inserito ad ogni cambio layer, subito dopo il movimento Z e prima che l'estrusore si sposti al punto del primo layer. Si fa presente che puoi usare variabili sostitutive per tutte le impostazioni di Slic3r sia per [layer_num] che per [layer_z]." - -#: src/libslic3r/PrintConfig.cpp:188 -msgid "This custom code is inserted at every layer change, right before the Z move. Note that you can use placeholder variables for all Slic3r settings as well as [layer_num] and [layer_z]." -msgstr "Questo codice personalizzato è inserito ad ogni cambio layer, subito prima del movimento Z. Si fa presente che puoi usare variabili sostitutive per tutte le impostazioni di Slic3r sia per [layer_num] che per [layer_z]." -======= #: src/slic3r/GUI/DoubleSlider.cpp:2087 src/slic3r/GUI/Tab.cpp:1322 msgid "" "This action is not revertible.\n" @@ -14457,7 +13691,6 @@ msgid "" msgstr "" "Questa azione non è reversibile.\n" "Vuoi procedere?" ->>>>>>> master #: src/slic3r/GUI/DoubleSlider.cpp:2086 msgid "This action will cause deletion of all ticks on vertical slider." @@ -14643,33 +13876,6 @@ msgstr "" "Slic3r sceglierà automaticamente il maggior numero possibile di layer da " "combinare secondo il diametro dell'ugello e l'altezza layer." -<<<<<<< HEAD -#: src/slic3r/GUI/Plater.cpp:2319 -msgid "" -"This file contains several objects positioned at multiple heights.\n" -"Instead of considering them as multiple objects, should I consider\n" -"this file as a single object having multiple parts?" -msgstr "" -"Questo file contiene numerosi oggetti posizionati ad altezze multiple. Invece di considerarli come oggetti multipli, devo considerare \n" -"questo file come un oggetto singolo con parti multiple?" - -#: src/slic3r/GUI/FirmwareDialog.cpp:332 -#, possible-c-format -msgid "" -"This firmware hex file does not match the printer model.\n" -"The hex file is intended for: %s\n" -"Printer reported: %s\n" -"\n" -"Do you want to continue and flash this hex file anyway?\n" -"Please only continue if you are sure this is the right thing to do." -msgstr "" -"Questo file hex di firmware non è corretto per il modello della stampante. \n" -"Il file hex è per: %s\n" -"La stampante è: %s\n" -"\n" -"Vuoi continuare ed installare il firmware comunque?\n" -"Continua solo se sei certo che sia la cosa giusta da fare." -======= #: src/libslic3r/PrintConfig.cpp:2382 msgid "" "This feature will raise Z gradually while printing a single-walled object in " @@ -14702,7 +13908,6 @@ msgstr "" "Questo file contiene diversi oggetti posizionati ad altezze multiple.\n" "Invece di considerarli come oggetti multipli,\n" "il file dovrebbe essere caricato come un singolo oggetto con più parti?" ->>>>>>> master #: src/slic3r/GUI/FirmwareDialog.cpp:333 #, c-format, boost-format @@ -14888,19 +14093,9 @@ msgstr "" "risoluzione per l'altezza variabile dei layer. Valori tipici sono compresi " "tra 0.05 mm e 0.1 mm." -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:928 -msgid "" -"This operation is irreversible.\n" -"Do you want to proceed?" -msgstr "" -"Questa operazione è irreversibile.\n" -"Vuoi continuare?" -======= #: src/slic3r/GUI/DoubleSlider.cpp:1398 msgid "This is wipe tower layer" msgstr "Questo è un layer della torre di pulitura" ->>>>>>> master #: src/libslic3r/PrintConfig.cpp:2959 msgid "" @@ -15101,19 +14296,6 @@ msgstr "" "la creazione dei volumi di spurgo completi." #: src/slic3r/GUI/UpdateDialogs.cpp:216 -<<<<<<< HEAD -#, possible-c-format -msgid "" -"This version of %s is not compatible with currently installed configuration bundles.\n" -"This probably happened as a result of running an older %s after using a newer one.\n" -"\n" -"You may either exit %s and try again with a newer version, or you may re-run the initial configuration. Doing so will create a backup snapshot of the existing configuration before installing files compatible with this %s." -msgstr "" -"Questa versione di %s non è compatibile con gli attuali gruppi di configurazioni installati.\n" -"Probabilmente è causato dall'esecuzione di una vecchia versione di %s dopo averne utilizzata una più recente.\n" -"\n" -"Prova a chiudere %s e riprovare con una versione più recente, o prova ad effettuare nuovamente la configurazione iniziale. Così facendo creerai un'istantanea di backup della configurazione esistente prima di istallare i file compatibili con questo %s." -======= #, c-format, boost-format msgid "" "This version of %s is not compatible with currently installed configuration " @@ -15147,7 +14329,6 @@ msgstr "" "PrusaSlicer più recente può estendere la lista dei flavor di firmware " "supportati. Si può decidere di abbandonare o di sostituire un valore " "sconosciuto con un valore predefinito in modo silenzioso o verboso." ->>>>>>> master #: src/libslic3r/PrintConfig.cpp:3234 msgid "" @@ -15442,20 +14623,9 @@ msgstr "Tipologia stampante." msgid "Type:" msgstr "Tipo:" -<<<<<<< HEAD -#: src/slic3r/GUI/OpenGLManager.cpp:275 -#, possible-c-format -msgid "" -"Unable to load the following shaders:\n" -"%s" -msgstr "" -"Impossibile caricare i seguenti shader:\n" -"%s" -======= #: src/libslic3r/SLAPrintSteps.cpp:441 msgid "Unable to drill the current configuration of holes into the model." msgstr "Impossibile forare il modello con la configurazione attuale dei fori." ->>>>>>> master #: src/slic3r/GUI/OpenGLManager.cpp:273 #, c-format, boost-format @@ -15484,9 +14654,6 @@ msgstr "Impossibile sostituire con più di un volume" msgid "Undef" msgstr "Undef" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI.cpp:305 -======= #: src/slic3r/GUI/UnsavedChangesDialog.cpp:1681 msgid "Undef category" msgstr "Categoria indefinita" @@ -15496,7 +14663,6 @@ msgid "Undef group" msgstr "Gruppo non definito" #: src/slic3r/GUI/GUI.cpp:292 ->>>>>>> master msgid "Undefined" msgstr "Indefinito" @@ -15585,21 +14751,6 @@ msgstr "Velocità iniziale di scaricamento" msgid "UNLOCKED LOCK" msgstr "LUCCHETTO APERTO" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3719 -msgid "" -"UNLOCKED LOCK icon indicates that some settings were changed and are not equal to the system (or default) values for the current option group.\n" -"Click to reset all settings for current option group to the system (or default) values." -msgstr "" -"L'icona del LUCCHETTO APERTO indica che alcune impostazioni sono state modificate e non sono uguali ai valori di sistema (o predefinite) per il gruppo di opzioni corrente.\n" -"Clicca qui per reimpostare tutte le impostazioni del gruppo corrente ai valori di sistema (o predefiniti)." - -#: src/slic3r/GUI/Tab.cpp:3734 -msgid "" -"UNLOCKED LOCK icon indicates that the value was changed and is not equal to the system (or default) value.\n" -"Click to reset current value to the system (or default) value." -msgstr "L'icona del LUCCHETTO APERTO indica che il valore è stato cambiato e non è uguale al valore di sistema (o predefinito). Clicca per reimpostare il valore corrente al valore di sistema (o predefinito)." -======= #: src/slic3r/GUI/Tab.cpp:4283 msgid "" "UNLOCKED LOCK icon indicates that some settings were changed and are not " @@ -15622,7 +14773,6 @@ msgstr "" "L'icona del LUCCHETTO APERTO indica che il valore è stato cambiato e non è " "uguale al valore di sistema (o predefinito). Clicca per reimpostare il " "valore corrente al valore di sistema (o predefinito)." ->>>>>>> master #: src/slic3r/GUI/UnsavedChangesDialog.cpp:771 msgid "Unsaved Changes" @@ -15976,20 +15126,14 @@ msgstr "Vista" msgid "View mode" msgstr "Modalità Visualizzazione" -<<<<<<< HEAD -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:666 -======= #: src/slic3r/GUI/UnsavedChangesDialog.cpp:903 #, boost-format ->>>>>>> master msgid "" "Visit \"Preferences\" and check \"%1%\"\n" "to be asked about unsaved changes again." msgstr "" "Visita \"Prefereze\" e controlla \"%1%\"\n" "per ricevere nuovamente informazioni sui cambiamenti non salvati." -<<<<<<< HEAD -======= #: src/slic3r/GUI/GUI_App.cpp:3076 src/slic3r/GUI/Plater.cpp:1738 #, boost-format @@ -15999,7 +15143,6 @@ msgid "" msgstr "" "Visita le \"Preferenze\" e controlla \"%1%\"\n" "per modificare la tua scelta." ->>>>>>> master #: src/libslic3r/PrintConfig.cpp:4278 msgid "Visualize an already sliced and saved G-code" @@ -16375,40 +15518,22 @@ msgstr "Con guaina attorno al supporto" msgid "World coordinates" msgstr "Coordinate reali" -<<<<<<< HEAD -#: src/slic3r/GUI/UpdateDialogs.cpp:92 -msgid "" -"Would you like to install it?\n" -"\n" -"Note that a full configuration snapshot will be created first. It can then be restored at any time should there be a problem with the new version.\n" -======= #: src/slic3r/GUI/UpdateDialogs.cpp:100 msgid "" "Would you like to install it?\n" "\n" "Note that a full configuration snapshot will be created first. It can then " "be restored at any time should there be a problem with the new version.\n" ->>>>>>> master "\n" "Updated configuration bundles:" msgstr "" "Vuoi installarlo?\n" "\n" -<<<<<<< HEAD -"Nota: verrà prima creata un'istantanea della configurazione completa. Potrà essere ripristinata in qualunque momento se dovessero presentarsi problemi con la nuova versione.\n" -"\n" -"Gruppo di configurazioni aggiornate:" - -#: src/slic3r/GUI/GUI_App.cpp:1802 -msgid "Would you like to stop uploads and close the program?" -msgstr "Desideri interrompere il caricamento e chiudere il programma?" -======= "Nota: verrà prima creata un'istantanea della configurazione completa. Potrà " "essere ripristinata in qualunque momento se dovessero presentarsi problemi " "con la nuova versione.\n" "\n" "Gruppo di configurazioni aggiornate:" ->>>>>>> master #: src/libslic3r/miniz_extension.cpp:151 msgid "write calledback failed" @@ -16561,17 +15686,6 @@ msgstr "" "Non è possibile utilizzare la modalità di ridimensionamento non uniforme per " "una selezione di più oggetti/parti" -<<<<<<< HEAD -#: src/slic3r/GUI/NotificationManager.hpp:459 -msgid "" -"You have just added a G-code for color change, but its value is empty.\n" -"To export the G-code correctly, check the \"Color Change G-code\" in \"Printer Settings > Custom G-code\"" -msgstr "" -"Hai aggiunto un G-code per il cambio colore, ma il suo valore è vuoto.\n" -"Per esportare correttamente il G-code, controlla \"Color Change G-code\" su \"Impostazioni stampante > G-code personalizzato\"" - -#: src/slic3r/GUI/SavePresetDialog.cpp:277 -======= #: src/slic3r/GUI/NotificationManager.hpp:761 msgid "" "You have just added a G-code for color change, but its value is empty.\n" @@ -16584,7 +15698,6 @@ msgstr "" #: src/slic3r/GUI/SavePresetDialog.cpp:283 #, boost-format ->>>>>>> master msgid "" "You have selected physical printer \"%1%\" \n" "with related printer preset \"%2%\"" @@ -16607,24 +15720,9 @@ msgstr "Dovresti aggiornare i driver della scheda video." msgid "You must install a configuration update." msgstr "È necessario installare un aggiornamento della configurazione." -<<<<<<< HEAD -#: src/slic3r/GUI/Preferences.cpp:299 -#, possible-c-format -msgid "You need to restart %s to make the changes effective." -msgstr "È necessario riavviare %s per rendere effettive le modifiche." - -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:611 -msgid "You should change the name of your printer device." -msgstr "Dovresti cambiare il nome del tuo dispositivo di stampa." - -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:468 -msgid "You should to change a name of your printer device. It can't be saved." -msgstr "Devi cambiare il nome del dispositivo di stampa. Non può essere salvato." -======= #: src/slic3r/GUI/PhysicalPrinterDialog.cpp:634 msgid "You should change the name of your printer device." msgstr "Dovresti cambiare il nome del tuo dispositivo di stampa." ->>>>>>> master #: src/slic3r/GUI/GUI_ObjectList.cpp:3644 #, c-format, boost-format @@ -16728,31 +15826,9 @@ msgstr "" msgid "Z offset" msgstr "Offset Z" -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigManipulation.cpp:59 -msgid "" -"Zero first layer height is not valid.\n" -"\n" -"The first layer height will be reset to 0.01." -msgstr "" -"Altezza primo layer a zero non è valida.\n" -"\n" -"L'altezza del primo layer verrà reimpostata a 0.01." - -#: src/slic3r/GUI/ConfigManipulation.cpp:47 -msgid "" -"Zero layer height is not valid.\n" -"\n" -"The layer height will be reset to 0.01." -msgstr "" -"Altezza layer zero non valida.\n" -"\n" -"L'altezza layer verrà reimpostata a 0.01." -======= #: src/libslic3r/PrintConfig.cpp:2896 msgid "Z travel" msgstr "Spostamento Z" ->>>>>>> master #: src/libslic3r/PrintConfig.cpp:3492 msgid "Zig-Zag" @@ -16789,11 +15865,7 @@ msgstr "Zoom out" msgid "Zoom to Bed" msgstr "Zoom sul piano" -<<<<<<< HEAD -#: src/slic3r/GUI/KBShortcutsDialog.cpp:176 -======= #: src/slic3r/GUI/KBShortcutsDialog.cpp:160 ->>>>>>> master msgid "" "Zoom to selected object\n" "or all objects in scene, if none selected" @@ -16801,19 +15873,11 @@ msgstr "" "Zoom sull'oggetto selezionato\n" "o tutti gli oggetti in scena, se nessuno è selezionato" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:241 src/libslic3r/PrintConfig.cpp:816 -#: src/libslic3r/PrintConfig.cpp:1748 src/libslic3r/PrintConfig.cpp:1758 -#: src/libslic3r/PrintConfig.cpp:2036 src/libslic3r/PrintConfig.cpp:2191 -#: src/libslic3r/PrintConfig.cpp:2390 src/libslic3r/PrintConfig.cpp:2891 -#: src/libslic3r/PrintConfig.cpp:3012 -======= #: src/libslic3r/PrintConfig.cpp:456 src/libslic3r/PrintConfig.cpp:1075 #: src/libslic3r/PrintConfig.cpp:2232 src/libslic3r/PrintConfig.cpp:2242 #: src/libslic3r/PrintConfig.cpp:2533 src/libslic3r/PrintConfig.cpp:2774 #: src/libslic3r/PrintConfig.cpp:2991 src/libslic3r/PrintConfig.cpp:3552 #: src/libslic3r/PrintConfig.cpp:3673 ->>>>>>> master msgid "°" msgstr "°" diff --git a/resources/localization/ko/PrusaSlicer.mo b/resources/localization/ko/PrusaSlicer.mo Binary files differindex 07c81b77e..75f030ce3 100644 --- a/resources/localization/ko/PrusaSlicer.mo +++ b/resources/localization/ko/PrusaSlicer.mo diff --git a/resources/localization/nl/PrusaSlicer.mo b/resources/localization/nl/PrusaSlicer.mo Binary files differindex 3b32ea02f..87ce3f492 100644 --- a/resources/localization/nl/PrusaSlicer.mo +++ b/resources/localization/nl/PrusaSlicer.mo diff --git a/resources/localization/pl/PrusaSlicer.mo b/resources/localization/pl/PrusaSlicer.mo Binary files differindex 4673f175f..4fc344334 100644 --- a/resources/localization/pl/PrusaSlicer.mo +++ b/resources/localization/pl/PrusaSlicer.mo diff --git a/resources/localization/pl/PrusaSlicer_pl.po b/resources/localization/pl/PrusaSlicer_pl.po index b10880815..c5bf7bfd4 100644 --- a/resources/localization/pl/PrusaSlicer_pl.po +++ b/resources/localization/pl/PrusaSlicer_pl.po @@ -4,12 +4,6 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -<<<<<<< HEAD -"Plural-Forms: nplurals=4; plural=(n == 1) ? 0 : ((n%10 >= 2 && n%10 <=4 && (n%100 < 12 || n%100 > 14)) ? 1 : ((n%10 == 0 || n%10 == 1 || (n%10 >= 5 && n%10 <=9)) || (n%100 >= 12 && n%100 <= 14)) ? 2 : 3);\n" -"X-Generator: Phrase (phrase.com)\n" - -#: src/slic3r/GUI/Tab.cpp:4124 -======= "Plural-Forms: nplurals=4; plural=(n == 1) ? 0 : ((n%10 >= 2 && n%10 <=4 && (n" "%100 < 12 || n%100 > 14)) ? 1 : ((n%10 == 0 || n%10 == 1 || (n%10 >= 5 && n" "%10 <=9)) || (n%100 >= 12 && n%100 <= 14)) ? 2 : 3);\n" @@ -17,7 +11,6 @@ msgstr "" #: src/slic3r/GUI/Tab.cpp:4707 #, boost-format ->>>>>>> master msgid "" "\"%1%\" is disabled because \"%2%\" is on in \"%3%\" category.\n" "To enable \"%1%\", please switch off \"%2%\"" @@ -25,19 +18,11 @@ msgstr "" "\"%1%\" jest wyÅ‚Ä…czony ponieważ \"%2%\" znajduje siÄ™ w kategorii \"%3%\".\n" "Aby wÅ‚Ä…czyć \"%1%\", wyÅ‚Ä…cz \"%2%\"." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:249 src/libslic3r/PrintConfig.cpp:828 -#: src/libslic3r/PrintConfig.cpp:1148 src/libslic3r/PrintConfig.cpp:1327 -#: src/libslic3r/PrintConfig.cpp:1390 src/libslic3r/PrintConfig.cpp:1640 -#: src/libslic3r/PrintConfig.cpp:2568 src/libslic3r/PrintConfig.cpp:2805 -#: src/libslic3r/PrintConfig.cpp:2931 -======= #: src/libslic3r/PrintConfig.cpp:464 src/libslic3r/PrintConfig.cpp:1087 #: src/libslic3r/PrintConfig.cpp:1559 src/libslic3r/PrintConfig.cpp:1751 #: src/libslic3r/PrintConfig.cpp:1814 src/libslic3r/PrintConfig.cpp:2065 #: src/libslic3r/PrintConfig.cpp:2124 src/libslic3r/PrintConfig.cpp:3177 #: src/libslic3r/PrintConfig.cpp:3466 src/libslic3r/PrintConfig.cpp:3592 ->>>>>>> master msgid "%" msgstr "%" @@ -169,16 +154,8 @@ msgstr "%1% Zestaw ustawieÅ„" msgid "%1% was substituted with %2%" msgstr "%1% zamieniono na %2%" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI.cpp:330 -msgid "%1% was substituted with %2%" -msgstr "%1% zamieniono na %2%" - -#: src/slic3r/GUI/MainFrame.cpp:1585 -======= #: src/slic3r/GUI/MainFrame.cpp:1707 #, boost-format ->>>>>>> master msgid "%1% was successfully sliced." msgstr "%1% zostaÅ‚ pomyÅ›lnie pociÄ™ty." @@ -204,10 +181,6 @@ msgstr "%d linii: %.2f mm" msgid "%d presets successfully imported." msgstr "pomyÅ›lnie zaimportowano %d zestawów ustawieÅ„." -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_App.cpp:718 -#, possible-c-format -======= #: src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:304 #, c-format, boost-format msgid "%d triangles" @@ -215,7 +188,6 @@ msgstr "%d trójkÄ…ty" #: src/slic3r/GUI/GUI_App.cpp:1126 #, c-format, boost-format ->>>>>>> master msgid "" "%s\n" "Do you want to continue?" @@ -268,23 +240,6 @@ msgstr "%s ma ostrzeżenie" msgid "%s has encountered an error" msgstr "%s napotkaÅ‚ bÅ‚Ä…d" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_App.cpp:528 -#, possible-c-format -msgid "" -"%s has encountered an error. It was likely caused by running out of memory. If you are sure you have enough RAM on your system, this may also be a bug and we would be glad if you reported it.\n" -"\n" -"The application will now terminate." -msgstr "" -"BÅ‚Ä…d %s . Prawdopodobnie wystÄ…piÅ‚ przez brak pamiÄ™ci. JeÅ›li masz pewność, że ilość RAMu jest wystarczajÄ…ca, to może to być bug, a którego zgÅ‚oszenie bÄ™dziemy wdziÄ™czni.\n" -"\n" -"Aplikacja zostanie zamkniÄ™ta." - -#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:62 -#, possible-c-format -msgid "%s has encountered an error. It was likely caused by running out of memory. If you are sure you have enough RAM on your system, this may also be a bug and we would be glad if you reported it." -msgstr "BÅ‚Ä…d %s . Prawdopodobnie wystÄ…piÅ‚ przez brak pamiÄ™ci. JeÅ›li masz pewność, że ilość RAMu jest wystarczajÄ…ca, to może to być bug, a którego zgÅ‚oszenie bÄ™dziemy wdziÄ™czni." -======= #: src/slic3r/GUI/GUI_App.cpp:698 #, c-format, boost-format msgid "" @@ -310,7 +265,6 @@ msgstr "" "BÅ‚Ä…d %s . Prawdopodobnie wystÄ…piÅ‚ przez brak pamiÄ™ci. JeÅ›li masz pewność, że " "ilość RAMu jest wystarczajÄ…ca, to może to być bug, a którego zgÅ‚oszenie " "bÄ™dziemy wdziÄ™czni." ->>>>>>> master #: src/slic3r/GUI/UpdateDialogs.cpp:304 #, c-format, boost-format @@ -322,29 +276,6 @@ msgstr "%s nie ma dostÄ™pnych aktualizacji konfiguracji." msgid "%s incompatibility" msgstr "niekompatybilność: %s" -<<<<<<< HEAD -#: src/slic3r/GUI/MsgDialog.cpp:114 -#, possible-c-format -msgid "%s information" -msgstr "%s informacje" - -#: src/slic3r/GUI/UpdateDialogs.cpp:270 -#, possible-c-format -msgid "" -"%s now uses an updated configuration structure.\n" -"\n" -"So called 'System presets' have been introduced, which hold the built-in default settings for various printers. These System presets cannot be modified, instead, users now may create their own presets inheriting settings from one of the System presets.\n" -"An inheriting preset may either inherit a particular value from its parent or override it with a customized value.\n" -"\n" -"Please proceed with the %s that follows to set up the new presets and to choose whether to enable automatic preset updates." -msgstr "" -"%s używa teraz zaktualizowanej struktury konfiguracji.\n" -"\n" -"ZostaÅ‚y wprowadzone tzw. \"Ustawienia systemowe\", w których zachowane sÄ… domyÅ›lne ustawienia dla wielu drukarek. Te ustawienia nie mogÄ… być modyfikowane, ale użytkownicy mogÄ… tworzyć wÅ‚asne profile, bazujÄ…ce na Ustawieniach systemowych.\n" -"Zestaw ustawieÅ„ może dziedziczyć wartoÅ›ci ustawieÅ„ z profilu źródÅ‚owego lub nadpisać je wÅ‚asnymi.\n" -"\n" -"Kontynuuj do %s , które pozwoli ustawić nowe Zestawy i wybrać automatycznÄ… aktualizacjÄ™ wbudowanych Zestawów." -======= #: src/slic3r/GUI/MsgDialog.cpp:246 src/slic3r/GUI/MsgDialog.cpp:259 #, c-format, boost-format msgid "%s info" @@ -354,7 +285,6 @@ msgstr "%s info" #, c-format, boost-format msgid "%s information" msgstr "%s informacje" ->>>>>>> master #: src/slic3r/GUI/UpdateDialogs.cpp:265 #, c-format, boost-format @@ -388,27 +318,10 @@ msgstr "" msgid "%s View Mode" msgstr "Tryb %s" -<<<<<<< HEAD -#: src/slic3r/GUI/UpdateDialogs.cpp:151 -#, possible-c-format -msgid "" -"%s will now start updates. Otherwise it won't be able to start.\n" -"\n" -"Note that a full configuration snapshot will be created first. It can then be restored at any time should there be a problem with the new version.\n" -"\n" -"Updated configuration bundles:" -msgstr "" -"%s rozpocznie aktualizacjÄ™. W innym przypadku nie bÄ™dzie możliwe uruchomienie.\n" -"\n" -"Weź pod uwagÄ™, że najpierw zostanie wykonany caÅ‚kowity zrzut konfiguracji. Może być wczytany w dowolnym momencie, jeÅ›li okazaÅ‚oby siÄ™, że nowa wersja powoduje problemy.\n" -"\n" -"Zaktualizowane zestawy ustawieÅ„:" -======= #: src/slic3r/GUI/MsgDialog.cpp:232 #, c-format, boost-format msgid "%s warning" msgstr "%s ostrzeżenie" ->>>>>>> master #: src/slic3r/GUI/UpdateDialogs.cpp:160 #, c-format, boost-format @@ -1306,11 +1219,7 @@ msgstr "" "Obiekt posiada niestandardowe modyfikatory wymuszajÄ…ce podpory, które nie " "bÄ™dÄ… używane, ponieważ generowanie podpór jest wyÅ‚Ä…czone." -<<<<<<< HEAD -#: src/slic3r/GUI/GLCanvas3D.cpp:638 -======= #: src/slic3r/GUI/GLCanvas3D.cpp:6372 ->>>>>>> master msgid "" "An object outside the print area was detected.\n" "Resolve the current problem to continue slicing." @@ -1389,11 +1298,7 @@ msgstr "archiwum jest zbyt duże" msgid "Are you sure you want to %1% the selected preset?" msgstr "Czy na pewno chcesz %1% ten zestaw ustawieÅ„?" -<<<<<<< HEAD -#: src/slic3r/GUI/FirmwareDialog.cpp:902 -======= #: src/slic3r/GUI/FirmwareDialog.cpp:915 ->>>>>>> master msgid "" "Are you sure you want to cancel firmware flashing?\n" "This could leave your printer in an unusable state!" @@ -1636,23 +1541,6 @@ msgstr "Unikaj ruchów nad obrysami - maksymalna dÅ‚ugość objazdu" msgid "BACK ARROW" msgstr "STRZAÅKA W TYÅ" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3727 -msgid "" -"BACK ARROW icon indicates that the settings were changed and are not equal to the last saved preset for the current option group.\n" -"Click to reset all settings for the current option group to the last saved preset." -msgstr "" -"STRZAÅKA W TYÅ oznacza, że ustawienia zostaÅ‚y zmodyfikowane i nie odpowiadajÄ… tym z ostatnio zapisanego zestawu ustawieÅ„ dla obecnej grupy opcji.\n" -"Kliknij, aby zresetować wszystkie ustawienia w obecnej grupie opcji do tych z ostatnio zapisanego zestawu ustawieÅ„." - -#: src/slic3r/GUI/Tab.cpp:3741 -msgid "" -"BACK ARROW icon indicates that the value was changed and is not equal to the last saved preset.\n" -"Click to reset current value to the last saved preset." -msgstr "" -"STRZAÅKA W TYÅ oznacza, że ustawienia zostaÅ‚y zmodyfikowane i nie odpowiadajÄ… tym z ostatnio zapisanego zestawu ustawieÅ„.\n" -"Kliknij, aby zresetować wszystkie ustawienia do tych z ostatnio zapisanego zestawu ustawieÅ„." -======= #: src/slic3r/GUI/Tab.cpp:4291 msgid "" "BACK ARROW icon indicates that the settings were changed and are not equal " @@ -1676,7 +1564,6 @@ msgstr "" "odpowiadajÄ… tym z ostatnio zapisanego zestawu ustawieÅ„.\n" "Kliknij, aby zresetować wszystkie ustawienia do tych z ostatnio zapisanego " "zestawu ustawieÅ„." ->>>>>>> master #: src/slic3r/GUI/Preferences.cpp:137 msgid "Background processing" @@ -1937,14 +1824,6 @@ msgstr "Wiaderko z farbÄ…" msgid "buffer too small" msgstr "niewystarczajÄ…cy bufor" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_App.cpp:1152 -msgid "" -"But since this version of PrusaSlicer we don't show this information in Printer Settings anymore.\n" -"Settings will be available in physical printers settings." -msgstr "" -"Od tej wersji PrusaSlicer nie pokazujemy już tej informacji w Ustawieniach drukarki.\n" -======= #: src/slic3r/GUI/GUI_App.cpp:1660 msgid "" "But since this version of PrusaSlicer we don't show this information in " @@ -1953,23 +1832,16 @@ msgid "" msgstr "" "Od tej wersji PrusaSlicer nie pokazujemy już tej informacji w Ustawieniach " "drukarki.\n" ->>>>>>> master "Ustawienia bÄ™dÄ… dostÄ™pne w ustawieniach fizycznej drukarki." #: src/slic3r/GUI/ButtonsDescription.cpp:62 msgid "Buttons And Text Colors Description" msgstr "Opis Przycisków i Kolorów Tekstu" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_App.cpp:1084 -msgid "" -"By default new Printer devices will be named as \"Printer N\" during its creation.\n" -======= #: src/slic3r/GUI/GUI_App.cpp:1662 msgid "" "By default new Printer devices will be named as \"Printer N\" during its " "creation.\n" ->>>>>>> master "Note: This name can be changed later from the physical printers settings" msgstr "" "DomyÅ›lnie nowe drukarki bÄ™dÄ… nazywane \"Printer N\" podczas tworzenia.\n" @@ -2043,11 +1915,7 @@ msgstr "" "Nie można przeliczyć szerokoÅ›ci ekstruzji dla %1%: zmienna \"%2%\" jest " "niedostÄ™pna." -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_ObjectList.cpp:3400 -======= #: src/slic3r/GUI/GUI_ObjectList.cpp:3113 ->>>>>>> master msgid "" "Cannot insert a new layer range after the current layer range.\n" "Current layer range overlaps with the next layer range." @@ -2055,11 +1923,7 @@ msgstr "" "Nie można wstawić nowego zakresu wysokoÅ›ci po obecnym.\n" "Zakres pokrywaÅ‚by siÄ™ z kolejnym." -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_ObjectList.cpp:3391 -======= #: src/slic3r/GUI/GUI_ObjectList.cpp:3104 ->>>>>>> master 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" @@ -2069,16 +1933,10 @@ msgstr "" "Kolejny zakres jest zbyt niski, aby można byÅ‚o go podzielić\n" "z powodu minimalnej gruboÅ›ci warstwy." -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_ObjectList.cpp:3395 -msgid "" -"Cannot insert a new layer range between the current and the next layer range.\n" -======= #: src/slic3r/GUI/GUI_ObjectList.cpp:3108 msgid "" "Cannot insert a new layer range between the current and the next layer " "range.\n" ->>>>>>> master "The gap between the current layer range and the next layer range\n" "is thinner than the minimum layer height allowed." msgstr "" @@ -2502,17 +2360,6 @@ msgstr "Asystent Ko&nfiguracji" msgid "Configuration Assistant" msgstr "Asystent konfiguracji" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI.cpp:368 -msgid "Configuration bundle was loaded, however some configuration values were not recognized." -msgstr "Wczytano paczkÄ™ konfiguracji, jednak niektóre wartoÅ›ci konfiguracji nie zostaÅ‚y rozpoznane." - -#: src/slic3r/GUI/GUI.cpp:378 -msgid "Configuration file \"%1%\" was loaded, however some configuration values were not recognized." -msgstr "Wczytano plik konfiguracyjny \"%1%\", jednak niektóre wartoÅ›ci konfiguracji nie zostaÅ‚y rozpoznane." - -#: src/libslic3r/PrintConfig.cpp:1424 -======= #: src/slic3r/GUI/GUI.cpp:355 msgid "" "Configuration bundle was loaded, however some configuration values were not " @@ -2539,7 +2386,6 @@ msgid "Configuration is editing from ConfigWizard" msgstr "Konfiguracja jest edytowana z Asystenta konfiguracji" #: src/libslic3r/PrintConfig.cpp:1848 ->>>>>>> master msgid "Configuration notes" msgstr "Notatki konfiguracyjne" @@ -2657,23 +2503,6 @@ msgstr "PoÅ‚Ä…czenie z OctoPrint pomyÅ›lne." msgid "Connection to printers connected via the print host failed." msgstr "Niepowodzenie poÅ‚Ä…czenia z drukarkÄ… podÅ‚Ä…czonÄ… do serwera druku." -<<<<<<< HEAD -#: src/slic3r/Utils/OctoPrint.cpp:185 -msgid "Connection to Prusa SL1 / SL1S works correctly." -msgstr "PoÅ‚Ä…czenie z Prusa SL1 / SL1S dziaÅ‚a prawidÅ‚owo." - -#: src/slic3r/Utils/OctoPrint.cpp:185 -msgid "Connection to Prusa SL1 works correctly." -msgstr "PoÅ‚Ä…czenie z Prusa SL1 dziaÅ‚a prawidÅ‚owo." - -#: src/slic3r/Utils/OctoPrint.cpp:229 -msgid "Connection to PrusaLink works correctly." -msgstr "PoÅ‚Ä…czenie z PrusaLink dziaÅ‚a prawidÅ‚owo." - -#: src/libslic3r/PrintConfig.cpp:2051 -msgid "Contact Z distance" -msgstr "OdstÄ™p w osi Z" -======= #: src/slic3r/Utils/OctoPrint.cpp:292 msgid "Connection to Prusa SL1 / SL1S works correctly." msgstr "PoÅ‚Ä…czenie z Prusa SL1 / SL1S dziaÅ‚a prawidÅ‚owo." @@ -2707,7 +2536,6 @@ msgstr "Kontynuować i zainstalować aktualizacje konfiguracji?" #, boost-format msgid "Continue to activate a configuration snapshot %1%?" msgstr "Kontynuować przywracanie zrzutu konfiguracji %1%?" ->>>>>>> master #: src/slic3r/GUI/AboutDialog.cpp:272 msgid "" @@ -2793,45 +2621,6 @@ msgstr "Kopiuj do Schowka" msgid "Copy Version Info" msgstr "Skopiuj informacje o wersji" -<<<<<<< HEAD -#: src/slic3r/Utils/PresetUpdater.cpp:84 -msgid "" -"Copying of file %1% to %2% failed.\n" -"Error message : %3%\n" -"Copying was triggered by function: %4%" -msgstr "" -"Niepowodzenie kopiowania pliku %1% do %2%. \n" -"Komunikat bÅ‚Ä™du: %3%\n" -" Kopiowanie zostaÅ‚o wywoÅ‚ane przez funkcjÄ™: %4%" - -#: src/slic3r/Utils/PresetUpdater.cpp:91 -msgid "" -"Copying of file %1% to %2% failed. Permissions fail at target file after copying.\n" -"Error message : %3%\n" -"Copying was triggered by function: %4%" -msgstr "" -"Niepowodzenie kopiowania pliku %1% do %2%. BÅ‚Ä…d uprawnieÅ„ pliku docelowego po skopiowaniu.\n" -"Komunikat bÅ‚Ä™du: %3%\n" -" Kopiowanie zostaÅ‚o wywoÅ‚ane przez funkcjÄ™: %4%" - -#: src/slic3r/Utils/PresetUpdater.cpp:70 -msgid "" -"Copying of file %1% to %2% failed. Permissions fail at target file before copying.\n" -"Error message : %3%\n" -"This error happend during %4% phase." -msgstr "" -"Niepowodzenie kopiowania pliku %1% do %2%. BÅ‚Ä…d uprawnieÅ„ pliku docelowego przed kopiowaniem.\n" -"Komunikat bÅ‚Ä™du: %3%\n" -" BÅ‚Ä…d wystÄ…piÅ‚ podczas fazy: %4%" - -#: src/slic3r/Utils/PresetUpdater.cpp:65 -msgid "Copying of file %1% to %2% failed: %3%" -msgstr "Kopiowanie pliku %1% do %2% nie powiodÅ‚o siÄ™: %3%" - -#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:156 -msgid "Copying of the temporary G-code has finished but the exported code couldn't be opened during copy check. The output G-code is at %1%.tmp." -msgstr "Kopiowanie tymczasowego pliku G-code zostaÅ‚o zakoÅ„czone, ale nie można otworzyć wyeksportowanego pliku w celu weryfikacji kopiowania. Wynikowy G-code znajduje siÄ™ w lokalizacji %2%.tmp." -======= #: src/slic3r/Utils/PresetUpdater.cpp:61 #, boost-format msgid "Copying of file %1% to %2% failed: %3%" @@ -2846,7 +2635,6 @@ msgstr "" "Kopiowanie tymczasowego pliku G-code zostaÅ‚o zakoÅ„czone, ale nie można " "otworzyć wyeksportowanego pliku w celu weryfikacji kopiowania. Wynikowy G-" "code znajduje siÄ™ w lokalizacji %1%.tmp." ->>>>>>> master #: src/slic3r/GUI/BackgroundSlicingProcess.cpp:704 #, boost-format @@ -2862,14 +2650,6 @@ msgstr "" msgid "Copying of the temporary G-code to the output G-code failed" msgstr "Kopiowanie tymczasowego G-code do wyjÅ›ciowego nie powiodÅ‚o siÄ™" -<<<<<<< HEAD -#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:163 -msgid "" -"Copying of the temporary G-code to the output G-code failed. Maybe the SD card is write locked?\n" -"Error message: %1%" -msgstr "" -"Niepowodzenie kopiowania tymczasowego G-code do pliku wyjÅ›ciowego G-code. Karta SD zabezpieczona przed zapisem? \n" -======= #: src/slic3r/GUI/BackgroundSlicingProcess.cpp:695 #, boost-format msgid "" @@ -2879,7 +2659,6 @@ msgid "" msgstr "" "Niepowodzenie kopiowania tymczasowego G-code do pliku wyjÅ›ciowego G-code. " "Karta SD zabezpieczona przed zapisem? \n" ->>>>>>> master "Kod bÅ‚Ä™du: %1%" #: src/slic3r/GUI/BackgroundSlicingProcess.cpp:698 @@ -2951,12 +2730,6 @@ msgstr "Nie można poÅ‚Ä…czyć siÄ™ z OctoPrint" msgid "Could not connect to Prusa SLA" msgstr "Nie można poÅ‚Ä…czyć siÄ™ z Prusa SLA" -<<<<<<< HEAD -#: src/slic3r/Utils/OctoPrint.cpp:235 -msgid "Could not connect to PrusaLink" -msgstr "Nie można poÅ‚Ä…czyć siÄ™ z PrusaLink" - -======= #: src/slic3r/Utils/OctoPrint.cpp:342 msgid "Could not connect to PrusaLink" msgstr "Nie można poÅ‚Ä…czyć siÄ™ z PrusaLink" @@ -2965,7 +2738,6 @@ msgstr "Nie można poÅ‚Ä…czyć siÄ™ z PrusaLink" msgid "Could not connect to Repetier" msgstr "Nie można poÅ‚Ä…czyć siÄ™ z Repetier" ->>>>>>> master #: src/slic3r/Utils/Http.cpp:73 msgid "" "Could not detect system SSL certificate store. PrusaSlicer will be unable to " @@ -3725,22 +3497,9 @@ msgstr "" "Kliknij TAK, jeÅ›li chcesz zmienić wartość na %s %%,\n" "lub NIE, jeÅ›li masz pewność, że %s %s jest prawidÅ‚owÄ… wartoÅ›ciÄ…." -<<<<<<< HEAD -#: src/slic3r/GUI/Field.cpp:288 -#, possible-c-format -msgid "" -"Do you mean %s%% instead of %s %s?\n" -"Select YES if you want to change this value to %s%%, \n" -"or NO if you are sure that %s %s is a correct value." -msgstr "" -"Czy masz na myÅ›li %s %% zamiast %s %s ?\n" -"Kliknij TAK, jeÅ›li chcesz zmienić wartość na %s %%,\n" -"lub NIE, jeÅ›li masz pewność, że %s %s jest prawidÅ‚owÄ… wartoÅ›ciÄ…." -======= #: src/slic3r/GUI/ConfigWizard.cpp:2625 msgid "Do you want to continue changing the configuration?" msgstr "Czy chcesz kontynuować zmianÄ™ konfiguracji?" ->>>>>>> master #: src/slic3r/GUI/DoubleSlider.cpp:2535 msgid "Do you want to delete all saved tool changes?" @@ -3779,13 +3538,6 @@ msgstr "nie zawiera prawidÅ‚owego g-code." msgid "Don't arrange" msgstr "Nie ukÅ‚adaj" -<<<<<<< HEAD -# Don't install -msgid "Don't install" -msgstr "Nie instaluj" - -#: src/slic3r/GUI/UpdateDialogs.cpp:71 -======= #: src/slic3r/GUI/GUI_App.cpp:974 msgid "Don't import" msgstr "Nie importuj" @@ -3795,7 +3547,6 @@ msgid "Don't install" msgstr "Nie instaluj" #: src/slic3r/GUI/UpdateDialogs.cpp:72 ->>>>>>> master msgid "Don't notify about new releases any more" msgstr "Nie powiadamiaj o nowych wersjach" @@ -4722,13 +4473,6 @@ msgstr "Warstwy przejÅ›ciowe" msgid "failed finding central directory" msgstr "nie odnaleziono katalogu centralnego" -<<<<<<< HEAD -#: src/slic3r/GUI/Plater.cpp:2399 -msgid "Failed loading file \"%1%\" due to an invalid configuration." -msgstr "Niepowodzenie wczytywania pliku \"%1%\" przez nieprawidÅ‚owÄ… konfiguracjÄ™." - -#: src/slic3r/Utils/FixModelByWin10.cpp:235 -======= #: src/slic3r/GUI/Plater.cpp:2516 #, boost-format msgid "Failed loading file \"%1%\" due to an invalid configuration." @@ -4736,7 +4480,6 @@ msgstr "" "Niepowodzenie wczytywania pliku \"%1%\" przez nieprawidÅ‚owÄ… konfiguracjÄ™." #: src/slic3r/Utils/FixModelByWin10.cpp:237 ->>>>>>> master msgid "Failed loading the input model." msgstr "Niepowodzenie Å‚adowania modelu wejÅ›ciowego." @@ -5164,13 +4907,6 @@ msgstr "PrzepÅ‚yw" msgid "flow rate is maximized" msgstr "przepÅ‚yw osiÄ…ga wartoÅ›ci szczytowe" -<<<<<<< HEAD -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:555 -msgid "Following printer preset(s) is duplicated:%1%The above preset for printer \"%2%\" will be used just once." -msgstr "" -"NastÄ™pujÄ…cy zestaw ustawieÅ„ drukarki jest zduplikowany: %1% \n" -"Powyższy zestaw ustawieÅ„ dla drukarki \"%2%\" zostanie użyty tylko raz." -======= #: src/slic3r/GUI/PhysicalPrinterDialog.cpp:670 #, boost-format msgid "" @@ -5225,7 +4961,6 @@ msgid "" msgstr "" "Dla obiektu wieloczęściowego ta wartość jest niedokÅ‚adna.\n" "Nie bierze pod uwagÄ™ nakÅ‚adajÄ…cych siÄ™ elementów i odejmowania objÄ™toÅ›ci." ->>>>>>> master #: src/slic3r/GUI/UpdateDialogs.cpp:282 msgid "For more information please visit our wiki page:" @@ -5249,25 +4984,11 @@ msgid "For support enforcers only" msgstr "Tylko dla wymuszania podpór" #. TRN Description for "WHITE BULLET" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3702 -======= #: src/slic3r/GUI/Tab.cpp:4266 ->>>>>>> master msgid "" "for the left button: indicates a non-system (or non-default) preset,\n" "for the right button: indicates that the settings hasn't been modified." msgstr "" -<<<<<<< HEAD -"dla lewego przycisku: wskazuje na niesystemowy (lub inny niż domyÅ›lny) zestaw ustawieÅ„,\n" -"dla prawego przycisku: wskazuje, że ustawienia nie zostaÅ‚y zmodyfikowane." - -#: src/slic3r/GUI/ConfigManipulation.cpp:135 -msgid "" -"For the Wipe Tower to work with the soluble supports, the support layers\n" -"need to be synchronized with the object layers." -msgstr "Do dziaÅ‚ania wieży czyszczÄ…cej z podporami rozpuszczalnymi konieczna jest synchronizacja wysokoÅ›ci warstw modelu i podpór." -======= "dla lewego przycisku: wskazuje na niesystemowy (lub inny niż domyÅ›lny) " "zestaw ustawieÅ„,\n" "dla prawego przycisku: wskazuje, że ustawienia nie zostaÅ‚y zmodyfikowane." @@ -5279,7 +5000,6 @@ msgid "" msgstr "" "Do dziaÅ‚ania wieży czyszczÄ…cej z podporami rozpuszczalnymi konieczna jest " "synchronizacja wysokoÅ›ci warstw modelu i podpór." ->>>>>>> master #: src/libslic3r/Print.cpp:594 msgid "" @@ -5405,21 +5125,13 @@ msgstr "g" msgid "G-code" msgstr "G-code" -<<<<<<< HEAD -#: src/slic3r/GUI/DoubleSlider.cpp:1146 -======= #: src/slic3r/GUI/DoubleSlider.cpp:1482 ->>>>>>> master msgid "" "G-code associated to this tick mark is in a conflict with print mode.\n" "Editing it will cause changes of Slider data." msgstr "" -<<<<<<< HEAD -"G-code powiÄ…zany z tym zaznaczeniem powoduje konflikt z obecnym trybem drukowania.\n" -======= "G-code powiÄ…zany z tym zaznaczeniem powoduje konflikt z obecnym trybem " "drukowania.\n" ->>>>>>> master "Edytowanie go spowoduje zmianÄ™ danych suwaka." #: src/slic3r/GUI/BackgroundSlicingProcess.cpp:715 @@ -5883,11 +5595,7 @@ msgstr "Nazwa hosta" msgid "Hostname, IP or URL" msgstr "Nazwa hosta, IP lub URL" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:210 -======= #: src/slic3r/GUI/Tab.cpp:223 ->>>>>>> master msgid "" "Hover the cursor over buttons to find more information \n" "or click this button." @@ -5999,15 +5707,6 @@ msgid "If enabled, a repetition of the next random color will be allowed." msgstr "" "JeÅ›li wÅ‚Ä…czone, dozwolone bÄ™dzie powtórzenie nastÄ™pnego losowego koloru." -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigWizard.cpp:1164 -msgid "" -"If enabled, allows the Reload from disk command to automatically find and load the files when invoked.\n" -"If not enabled, the Reload from disk command will ask to select each file using an open file dialog." -msgstr "" -"JeÅ›li wÅ‚Ä…czone, pozwala poleceniu \"Wczytaj ponownie z dysku\" automatycznie odnaleźć i wczytać pliki.\n" -"JeÅ›li wyÅ‚Ä…czone, to polecenie bÄ™dzie otwierać okno dialogowe, w którym wskażesz plik źródÅ‚owy." -======= #: src/libslic3r/PrintConfig.cpp:2466 msgid "" "If enabled, all printing extruders will be primed at the front edge of the " @@ -6015,7 +5714,6 @@ msgid "" msgstr "" "JeÅ›li ta opcja bÄ™dzie aktywna, to wszystkie ekstrudery bÄ™dÄ… czyszczone na " "przedniej krawÄ™dzi stoÅ‚u na poczÄ…tku wydruku." ->>>>>>> master #: src/slic3r/GUI/ConfigWizard.cpp:1250 msgid "" @@ -6029,13 +5727,6 @@ msgstr "" "JeÅ›li wyÅ‚Ä…czone, to polecenie bÄ™dzie otwierać okno dialogowe, w którym " "wskażesz plik źródÅ‚owy." -<<<<<<< HEAD -#: src/slic3r/GUI/Preferences.cpp:238 -msgid "If enabled, changes made using the sequential slider, in preview, apply only to gcode top layer. If disabled, changes made using the sequential slider, in preview, apply to the whole gcode." -msgstr "" -"JeÅ›li wÅ‚Ä…czone, zmiany stosowane suwakiem sekwencyjnym w podglÄ…dzie zostanÄ… zastosowane do górnej warstwy G-code.\n" -"JeÅ›li wyÅ‚Ä…czone, zmiany stosowane suwakiem sekwencyjnym w podglÄ…dzie zostanÄ… zastosowane do caÅ‚ego G-code." -======= #: src/slic3r/GUI/Preferences.cpp:150 msgid "" "If enabled, allows the Reload from disk command to automatically find and " @@ -6043,7 +5734,6 @@ msgid "" msgstr "" "JeÅ›li wÅ‚Ä…czone, pozwala poleceniu Wczytaj ponownie z dysku automatycznie " "odnaleźć i wczytać pliki." ->>>>>>> master #: src/slic3r/GUI/Preferences.cpp:509 msgid "" @@ -6513,19 +6203,9 @@ msgstr "Niepowodzenie importu naprawionego pliku 3MF" msgid "Import profile only" msgstr "Import tylko profilu" -<<<<<<< HEAD -#: src/slic3r/GUI/MainFrame.cpp:1000 -msgid "Import SL1 / SL1S archive" -msgstr "Import archiwum SL1 / SL1S" - -#: src/slic3r/GUI/MainFrame.cpp:1050 -msgid "Import SL1 archive" -msgstr "Import archiwum SL1" -======= #: src/slic3r/GUI/MainFrame.cpp:1209 msgid "Import SL1 / SL1S Archive" msgstr "Import archiwum SL1 / SL1S" ->>>>>>> master #: src/slic3r/GUI/Plater.cpp:1684 msgid "Import SLA archive" @@ -6598,15 +6278,6 @@ msgid "Increase/decrease edit area" msgstr "Zmniejsz/zwiÄ™ksz obszar edycji" #. TRN Description for "UNLOCKED LOCK" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3695 -msgid "" -"indicates that some settings were changed and are not equal to the system (or default) values for the current option group.\n" -"Click the UNLOCKED LOCK icon to reset all settings for current option group to the system (or default) values." -msgstr "" -"oznacza, że niektóre ustawienia zostaÅ‚y zmodyfikowane i nie odpowiadajÄ… wartoÅ›ciom systemowym (lub domyÅ›lnym) w obecnej grupie opcji.\n" -"Kliknij ikonÄ™ OTWARTEJ KÅÓDKI, aby zresetować wszystkie ustawienia obecnej grupy ustawieÅ„ do wartoÅ›ci systemowych (lub domyÅ›lnych)." -======= #: src/slic3r/GUI/Tab.cpp:4259 msgid "" "indicates that some settings were changed and are not equal to the system " @@ -6618,7 +6289,6 @@ msgstr "" "wartoÅ›ciom systemowym (lub domyÅ›lnym) w obecnej grupie opcji.\n" "Kliknij ikonÄ™ OTWARTEJ KÅÓDKI, aby zresetować wszystkie ustawienia obecnej " "grupy ustawieÅ„ do wartoÅ›ci systemowych (lub domyÅ›lnych)." ->>>>>>> master #. TRN Description for "LOCKED LOCK" #: src/slic3r/GUI/Tab.cpp:4255 @@ -6630,27 +6300,6 @@ msgstr "" "wartoÅ›ci dla danej grupy opcji" #. TRN Description for "BACK ARROW" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3707 -msgid "" -"indicates that the settings were changed and are not equal to the last saved preset for the current option group.\n" -"Click the BACK ARROW icon to reset all settings for the current option group to the last saved preset." -msgstr "" -"oznacza, że ustawienia zostaÅ‚y zmodyfikowane i nie odpowiadajÄ… tym z ostatnio zapisanego zestawu ustawieÅ„ dla obecnej grupy opcji.\n" -"Kliknij ikonÄ™ STRZAÅKI W TYÅ, aby zresetować wszystkie ustawienia w obecnej grupie opcji do tych z ostatnio zapisanego zestawu ustawieÅ„." - -#: src/slic3r/GUI/ConfigManipulation.cpp:210 -#: src/slic3r/GUI/GUI_ObjectList.cpp:35 src/slic3r/GUI/GUI_ObjectList.cpp:93 -#: src/slic3r/GUI/GUI_ObjectList.cpp:652 src/slic3r/GUI/Plater.cpp:393 -#: src/slic3r/GUI/Tab.cpp:1413 src/slic3r/GUI/Tab.cpp:1414 -#: src/libslic3r/PrintConfig.cpp:237 src/libslic3r/PrintConfig.cpp:450 -#: src/libslic3r/PrintConfig.cpp:472 src/libslic3r/PrintConfig.cpp:812 -#: src/libslic3r/PrintConfig.cpp:826 src/libslic3r/PrintConfig.cpp:863 -#: src/libslic3r/PrintConfig.cpp:1025 src/libslic3r/PrintConfig.cpp:1035 -#: src/libslic3r/PrintConfig.cpp:1053 src/libslic3r/PrintConfig.cpp:1072 -#: src/libslic3r/PrintConfig.cpp:1091 src/libslic3r/PrintConfig.cpp:1843 -#: src/libslic3r/PrintConfig.cpp:1860 -======= #: src/slic3r/GUI/Tab.cpp:4271 msgid "" "indicates that the settings were changed and are not equal to the last saved " @@ -6673,7 +6322,6 @@ msgstr "" #: src/libslic3r/PrintConfig.cpp:1385 src/libslic3r/PrintConfig.cpp:1454 #: src/libslic3r/PrintConfig.cpp:1474 src/libslic3r/PrintConfig.cpp:1493 #: src/libslic3r/PrintConfig.cpp:2314 src/libslic3r/PrintConfig.cpp:2331 ->>>>>>> master msgid "Infill" msgstr "WypeÅ‚nienie" @@ -6722,17 +6370,12 @@ msgstr "PoczÄ…tkowy czas naÅ›wietlania" msgid "Initial layer height" msgstr "Wysokość pierwszej warstwy" -<<<<<<< HEAD -#: src/slic3r/GUI/Field.cpp:269 -#, possible-c-format -======= #: src/libslic3r/PrintConfig.cpp:514 msgid "Inner brim only" msgstr "Tylko wewnÄ™trzny brim" #: src/slic3r/GUI/Field.cpp:266 #, c-format, boost-format ->>>>>>> master msgid "" "Input value is out of range\n" "Are you sure that %s is a correct value and that you want to continue?" @@ -6783,19 +6426,9 @@ msgstr "Sprawdzenie / aktywacja zrzutów konfiguracji" msgid "Install" msgstr "Instaluj" -<<<<<<< HEAD -#: src/slic3r/GUI/UpdateDialogs.cpp:136 -msgid "Install" -msgstr "Instaluj" - -#: src/slic3r/GUI/ObjectDataViewModel.cpp:62 -#: src/slic3r/GUI/ObjectDataViewModel.cpp:218 -#, possible-c-format -======= #: src/slic3r/GUI/ObjectDataViewModel.cpp:98 #: src/slic3r/GUI/ObjectDataViewModel.cpp:266 #, c-format, boost-format ->>>>>>> master msgid "Instance %d" msgstr "Instancja %d" @@ -6986,13 +6619,8 @@ msgstr "Jitter" msgid "Jump to height" msgstr "Przejdź do wysokoÅ›ci" -<<<<<<< HEAD -#: src/slic3r/GUI/DoubleSlider.cpp:1223 -#, possible-c-format -======= #: src/slic3r/GUI/DoubleSlider.cpp:1391 #, c-format, boost-format ->>>>>>> master msgid "" "Jump to height %s\n" "or Set ruler mode" @@ -7000,13 +6628,8 @@ msgstr "" "Przejdź na wysokość %s \n" "lub ustaw tryb linijki" -<<<<<<< HEAD -#: src/slic3r/GUI/DoubleSlider.cpp:1220 -#, possible-c-format -======= #: src/slic3r/GUI/DoubleSlider.cpp:1388 #, c-format, boost-format ->>>>>>> master msgid "" "Jump to height %s\n" "Set ruler mode\n" @@ -7252,19 +6875,9 @@ msgstr "Wczytaj model" msgid "Load an model saved with imperial units" msgstr "Wczytaj model zapisany w jednostkach imperialnych" -<<<<<<< HEAD -#: src/slic3r/GUI/MainFrame.cpp:1000 -msgid "Load an SL1 / Sl1S archive" -msgstr "Wczytaj archiwum SL1 / SL1S" - -#: src/slic3r/GUI/MainFrame.cpp:1058 -msgid "Load an SL1 archive" -msgstr "Wczytaj archiwum SL1" -======= #: src/slic3r/GUI/MainFrame.cpp:1209 msgid "Load an SL1 / Sl1S archive" msgstr "Wczytaj archiwum SL1 / SL1S" ->>>>>>> master #: src/libslic3r/PrintConfig.cpp:4454 msgid "" @@ -8181,13 +7794,6 @@ msgstr "Monotoniczny" msgid "More" msgstr "WiÄ™cej" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI.cpp:339 -msgid "Most likely the configuration was produced by a newer version of PrusaSlicer or by some PrusaSlicer fork." -msgstr "Najprawdopodobniej konfiguracja zostaÅ‚a wygenerowana przez nowszÄ… wersjÄ™ PrusaSlicer lub przez jakiÅ› fork PrusaSlicer." - -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1219 -======= #: src/slic3r/GUI/GUI.cpp:326 msgid "" "Most likely the configuration was produced by a newer version of PrusaSlicer " @@ -8197,7 +7803,6 @@ msgstr "" "PrusaSlicer lub przez jakiÅ› fork PrusaSlicer." #: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1224 ->>>>>>> master msgid "Mouse wheel" msgstr "Kółko myszy" @@ -8303,11 +7908,7 @@ msgstr "" msgid "Multiple Extruders" msgstr "Kilka ekstruderów" -<<<<<<< HEAD -#: src/slic3r/GUI/Plater.cpp:2372 -======= #: src/slic3r/GUI/Plater.cpp:2648 ->>>>>>> master msgid "" "Multiple objects were loaded for a multi-material printer.\n" "Instead of considering them as multiple objects, should I consider\n" @@ -8404,20 +8005,10 @@ msgstr "Nowy Projekt" msgid "New project, clear plater" msgstr "Nowy projekt, wyczyść stół" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI.cpp:304 -msgid "new unknown value %1% was changed to default value %2%" -msgstr "nowa nieznana wartość %1% zostaÅ‚a zamieniona na domyÅ›lnÄ… %2%" - -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:609 -msgid "New Value" -msgstr "Nowa wartość" -======= #: src/slic3r/GUI/GUI_App.cpp:1203 #, boost-format msgid "New release version %1% is available." msgstr "DostÄ™pna jest nowa wersja stabilna %1%." ->>>>>>> master #: src/slic3r/GUI/UnsavedChangesDialog.cpp:832 msgid "New Value" @@ -8522,29 +8113,6 @@ msgstr "Nie znaleziono:" msgid "Note" msgstr "Uwaga" -<<<<<<< HEAD -#: src/slic3r/GUI/MsgDialog.cpp:114 -msgid "Note that" -msgstr "Weź pod uwagÄ™, że " - -#: src/slic3r/GUI/Tab.cpp:3408 -msgid "Note, that selected preset will be deleted from this/those printer(s) too." -msgstr "Zwróć uwagÄ™, że wybrany zestaw ustawieÅ„ zostanie również usuniÄ™ty z tej drukarki (lub tych drukarek)." - -#: src/slic3r/GUI/Tab.cpp:3416 -msgid "Note, that this/those printer(s) will be deleted after deleting of the selected preset." -msgstr "Zwróć uwagÄ™, że usuniÄ™cie wybranego zestawu ustawieÅ„ spowoduje również usuniÄ™cie tej drukarki (lub drukarek)." - -#: src/slic3r/GUI/Tab.cpp:2039 -msgid "" -"Note: All parameters from this group are moved to the Physical Printer settings (see changelog).\n" -"\n" -"A new Physical Printer profile is created by clicking on the \"cog\" icon right of the Printer profiles combo box, by selecting the \"Add physical printer\" item in the Printer combo box. The Physical Printer profile editor opens also when clicking on the \"cog\" icon in the Printer settings tab. The Physical Printer profiles are being stored into PrusaSlicer/physical_printer directory." -msgstr "" -"Uwaga: wszystkie parametry z tej grupy zostaÅ‚y przeniesione do ustawieÅ„ fizycznej drukarki (szczegóły na liÅ›cie zmian).\n" -"\n" -"Nowy profil fizycznej drukarki tworzysz klikajÄ…c ikonkÄ™ \"koÅ‚a zÄ™batego\" na liÅ›cie rozwijanej z profilami drukarek lub wybierajÄ…c \"Dodaj fizycznÄ… drukarkÄ™\" na tej samej liÅ›cie. Edytor profilu fizycznej drukarki pojawi siÄ™ również po klikniÄ™ciu na ikonkÄ™ \"koÅ‚a zÄ™batego\" w zakÅ‚adce \"Ustawienia drukarki\". Profile fizycznych drukarek sÄ… przechowywane w katalogu PrusaSlicer/physical_printer." -======= #: src/slic3r/GUI/Tab.cpp:3716 msgid "Note, that the selected preset will be deleted from this printer too." msgid_plural "" @@ -8605,7 +8173,6 @@ msgstr "" "również po klikniÄ™ciu na ikonkÄ™ \"koÅ‚a zÄ™batego\" w zakÅ‚adce \"Ustawienia " "drukarki\". Profile fizycznych drukarek sÄ… przechowywane w katalogu " "PrusaSlicer/physical_printer." ->>>>>>> master #: src/slic3r/Utils/AstroBox.cpp:92 msgid "Note: AstroBox version at least 1.1.0 is required." @@ -9086,13 +8653,6 @@ msgstr "Otwórz stronÄ™ Prusa3D ze sterownikami w przeglÄ…darce" msgid "Open the software releases page in your browser" msgstr "Otwórz stronÄ™ z wersjami oprogramowania w przeglÄ…darce" -<<<<<<< HEAD -#: src/slic3r/GUI/UpdateDialogs.cpp:89 -msgid "Opening Configuration Wizard" -msgstr "Otwieranie Asystenta Konfiguracji" - -#: src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp:220 src/slic3r/GUI/Plater.cpp:3961 -======= #: src/slic3r/GUI/UpdateDialogs.cpp:94 msgid "Opening Configuration Wizard" msgstr "Otwieranie Asystenta Konfiguracji" @@ -9131,7 +8691,6 @@ msgstr "" "styku z platformÄ…, jeÅ›li nie ustawiono podniesienia modelu. " #: src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp:505 ->>>>>>> master msgid "Optimize orientation" msgstr "Optymalizuj orientacjÄ™" @@ -9605,15 +9164,6 @@ msgstr "Drukarki fizyczne" msgid "Pick another vendor supported by %s" msgstr "Wybierz innego producenta obsÅ‚ugiwanego przez %s" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:67 -msgid "Picture sizes to be stored into a .gcode and .sl1 / .sl1s files, in the following format: \"XxY, XxY, ...\"" -msgstr "Rozmiary grafik przechowywanych w plikach .gcode i .sl1 / .sl1s, w formacie: \"XxY, XxY, ...\"" - -#: src/libslic3r/PrintConfig.cpp:67 -msgid "Picture sizes to be stored into a .gcode and .sl1 files, in the following format: \"XxY, XxY, ...\"" -msgstr "Rozmiary grafik przechowywanych w plikach .gcode i .sl1, w formacie: \"XxY, XxY, ...\"" -======= #: src/libslic3r/PrintConfig.cpp:257 msgid "" "Picture sizes to be stored into a .gcode and .sl1 / .sl1s files, in the " @@ -9621,7 +9171,6 @@ msgid "" msgstr "" "Rozmiary grafik przechowywanych w plikach .gcode i .sl1 / .sl1s, w formacie: " "\"XxY, XxY, ...\"" ->>>>>>> master #: src/libslic3r/PrintConfig.cpp:3483 msgid "Pillar connection mode" @@ -9679,13 +9228,6 @@ msgstr "Zawartość StoÅ‚u" msgid "Please check your object list before preset changing." msgstr "Sprawdź listÄ™ modeli przed zmianÄ… zestawu ustawieÅ„." -<<<<<<< HEAD -#: src/slic3r/GUI/GUI.cpp:341 -msgid "Please review the substitutions and adjust them if needed." -msgstr "Przejrzyj zmiany i dostosuj, jeÅ›li to konieczne." - -#: src/slic3r/GUI/Plater.cpp:3089 -======= #: src/slic3r/GUI/BackgroundSlicingProcess.cpp:85 msgid "" "Please save your project and restart PrusaSlicer. We would be glad if you " @@ -9695,7 +9237,6 @@ msgstr "" "zgÅ‚osisz ten problem." #: src/slic3r/GUI/Plater.cpp:3620 ->>>>>>> master msgid "Please select the file to reload" msgstr "Wybierz plik do przeÅ‚adowania" @@ -9857,11 +9398,7 @@ msgstr "NaciÅ›nij, aby aktywować prostokÄ…t odznaczajÄ…cy" msgid "Press to activate selection rectangle" msgstr "NaciÅ›nij, aby aktywować prostokÄ…t zaznaczajÄ…cy" -<<<<<<< HEAD -#: src/slic3r/GUI/KBShortcutsDialog.cpp:155 -======= #: src/slic3r/GUI/KBShortcutsDialog.cpp:136 ->>>>>>> master msgid "" "Press to select multiple objects\n" "or move multiple objects with mouse" @@ -9869,17 +9406,10 @@ msgstr "" "Kliknij, aby wybrać wiele modeli\n" "lub przesunąć je przy pomocy myszy" -<<<<<<< HEAD -#: src/slic3r/GUI/KBShortcutsDialog.cpp:221 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:222 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:231 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:232 -======= #: src/slic3r/GUI/KBShortcutsDialog.cpp:239 #: src/slic3r/GUI/KBShortcutsDialog.cpp:240 #: src/slic3r/GUI/KBShortcutsDialog.cpp:250 #: src/slic3r/GUI/KBShortcutsDialog.cpp:251 ->>>>>>> master msgid "" "Press to speed up 5 times while moving thumb\n" "with arrow keys or mouse wheel" @@ -10182,17 +9712,6 @@ msgstr "BÅ‚Ä…d PrusaSlicer" msgid "PrusaSlicer GUI initialization failed" msgstr "Niepowodzenie inicjalizacji PrusaSlicer GUI" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_App.cpp:586 -msgid "" -"PrusaSlicer has encountered a localization error. Please report to PrusaSlicer team, what language was active and in which scenario this issue happened. Thank you.\n" -"\n" -"The application will now terminate." -msgstr "" -"PrusaSlicer napotkaÅ‚ bÅ‚Ä…d zwiÄ…zany z tÅ‚umaczeniem tekstów. Skontaktuj siÄ™ z zespoÅ‚em odpowiedzialnym za rozwój PrusaSlicer i podaj jÄ™zyk, który byÅ‚ wÅ‚Ä…czony, gdy wystÄ…piÅ‚ bÅ‚Ä…d. DziÄ™kujemy.\n" -"\n" -"Aplikacja zostanie zamkniÄ™ta." -======= #: src/slic3r/GUI/BackgroundSlicingProcess.cpp:84 #, boost-format msgid "PrusaSlicer has encountered a fatal error: \"%1%\"" @@ -10224,7 +9743,6 @@ msgid "" msgstr "" "PrusaSlicer bazuje na projekcie Slic3r autorstwa Alessandro Ranellucciego i " "spoÅ‚ecznoÅ›ci RepRap." ->>>>>>> master #: src/slic3r/GUI/MainFrame.cpp:232 msgid "PrusaSlicer is closing" @@ -10250,28 +9768,9 @@ msgstr "" "prawidÅ‚owo.\n" "wykryto OpenGL w wersji %s, render %s, producent %s ." -<<<<<<< HEAD -#: src/slic3r/GUI/UpdateDialogs.cpp:90 -msgid "" -"PrusaSlicer is not using the newest configuration available.\n" -"Configuration Wizard may not offer the latest printers, filaments and SLA materials to be installed. " -msgstr "" -"PrusaSlicer nie używa najnowszej dostÄ™pnej konfiguracji.\n" -"Asystent Konfiguracji może nie zawierać wszystkich najnowszych profili drukarek, filamentów oraz materiałów SLA." - -#: src/slic3r/GUI/OpenGLManager.cpp:259 -#, possible-c-format -msgid "" -"PrusaSlicer requires OpenGL 2.0 capable graphics driver to run correctly, \n" -"while OpenGL version %s, render %s, vendor %s was detected." -msgstr "" -"PrusaSlicer wymaga karty graficznej kompatybilnej z OpenGL 2.0, aby dziaÅ‚ać prawidÅ‚owo.\n" -"wykryto OpenGL w wersji %s, render %s, producent %s ." -======= #: src/slic3r/GUI/GUI_App.cpp:1329 msgid "PrusaSlicer started after a crash" msgstr "PrusaSlicer zostaÅ‚ uruchomiony po awarii" ->>>>>>> master #: src/slic3r/GUI/ConfigSnapshotDialog.cpp:60 msgid "PrusaSlicer version" @@ -10281,21 +9780,9 @@ msgstr "wersja PrusaSlicer" msgid "PrusaSlicer will remember your action." msgstr "PrusaSlicer zapamiÄ™ta tÄ… czynność." -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigWizard.cpp:1174 -msgid "" -"PrusaSlicer's user interfaces comes in three variants:\n" -"Simple, Advanced, and Expert.\n" -"The Simple mode shows only the most frequently used settings relevant for regular 3D printing. The other two offer progressively more sophisticated fine-tuning, they are suitable for advanced and expert users, respectively." -msgstr "" -"Interfejs PrusaSlicer ma trzy warianty do wyboru:\n" -"Prosty, Zaawansowany i Ekspercki.\n" -"Tryb Prosty wyÅ›wietla tylko najczęściej używane ustawienia potrzebne w codziennym druku 3D. PozostaÅ‚e dwa oferujÄ… coraz wiÄ™ksze możliwoÅ›ci konfiguracji i sÄ… przeznaczone odpowiednio dla użytkowników zaawansowanych i ekspertów." -======= #: src/slic3r/GUI/GUI_App.cpp:3074 src/slic3r/GUI/Plater.cpp:1734 msgid "PrusaSlicer will remember your choice." msgstr "PrusaSlicer zapamiÄ™ta Twój wybór." ->>>>>>> master #: src/slic3r/GUI/ConfigWizard.cpp:1274 msgid "" @@ -10411,19 +9898,6 @@ msgstr "Warstwy tratwy" msgid "Ramming customization" msgstr "Dostosowywanie wyciskania" -<<<<<<< HEAD -#: src/slic3r/GUI/WipeTowerDialog.cpp:41 -msgid "" -"Ramming denotes the rapid extrusion just before a tool change in a single-extruder MM printer. Its purpose is to properly shape the end of the unloaded filament so it does not prevent insertion of the new filament and can itself be reinserted later. This phase is important and different materials can require different extrusion speeds to get the good shape. For this reason, the extrusion rates during ramming are adjustable.\n" -"\n" -"This is an expert-level setting, incorrect adjustment will likely lead to jams, extruder wheel grinding into filament etc." -msgstr "" -"Wyciskanie oznacza szybkÄ… ekstruzjÄ™ bezpoÅ›rednio przed zmianÄ… narzÄ™dzia w drukarce typu MultiMaterial z jednym ekstruderem (narzÄ™dzie w tym przypadku oznacza filament). Jego zadaniem jest odpowiednie uksztaÅ‚towanie koÅ„cówki rozÅ‚adowywanego filamentu, aby jego ponowne zaÅ‚adowanie mogÅ‚o odbyć siÄ™ bez przeszkód. Ta faza procesu zmiany filamentu jest bardzo ważna, a różne filamenty mogÄ… potrzebować różnej prÄ™dkoÅ›ci wyciskania aby uzyskać odpowiedni ksztaÅ‚t koÅ„cówki. Z tego powodu można edytować jego parametry.\n" -"\n" -"To jest ustawienie dla zaawansowanych użytkowników. NieprawidÅ‚owe wartoÅ›ci mogÄ… powodować blokady, Å›cieranie filamentu przez radeÅ‚ko itp." - -#: src/slic3r/GUI/WipeTowerDialog.cpp:91 -======= #: src/slic3r/GUI/WipeTowerDialog.cpp:54 msgid "" "Ramming denotes the rapid extrusion just before a tool change in a single-" @@ -10448,7 +9922,6 @@ msgstr "" "mogÄ… powodować blokady, Å›cieranie filamentu przez radeÅ‚ko itp." #: src/slic3r/GUI/WipeTowerDialog.cpp:122 ->>>>>>> master msgid "Ramming line spacing" msgstr "Rozstaw linii wyciskania" @@ -11207,19 +10680,9 @@ msgstr "Zapisz Projekt (3mf)" msgid "Save project as (3mf)" msgstr "Zapisz Projekt jako (3mf)" -<<<<<<< HEAD -#: src/slic3r/GUI/Plater.cpp:5337 -msgid "Save SL1 / SL1S file as:" -msgstr "Zapisz plik SL1 / SL1S jako:" - -#: src/slic3r/GUI/Plater.cpp:4975 -msgid "Save SL1 file as:" -msgstr "Zapisz plik SL1 jako:" -======= #: src/slic3r/GUI/Plater.cpp:5707 msgid "Save SL1 / SL1S file as:" msgstr "Zapisz plik SL1 / SL1S jako:" ->>>>>>> master #: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:898 msgid "Save support points?" @@ -11463,11 +10926,7 @@ msgstr "Wybierz rodzaj wymaganej podkÅ‚adki" msgid "Select what kind of support do you need" msgstr "Wybierz rodzaj potrzebnych podpór" -<<<<<<< HEAD -#: src/slic3r/GUI/DoubleSlider.cpp:2135 -======= #: src/slic3r/GUI/DoubleSlider.cpp:2532 ->>>>>>> master msgid "" "Select YES if you want to delete all saved tool changes, \n" "NO if you want all tool changes switch to color changes, \n" @@ -11870,18 +11329,6 @@ msgstr "Ignoruj drukowanie instancji" msgid "Set upper thumb as active" msgstr "Ustaw górny punkt jako aktywny" -<<<<<<< HEAD -#: src/slic3r/GUI/KBShortcutsDialog.cpp:217 -msgid "Set upper thumb to current slider thumb" -msgstr "PrzysuÅ„ górny punkt suwaka do obecnego" - -#: src/libslic3r/PrintConfig.cpp:3714 -msgid "" -"Sets logging sensitivity. 0:fatal, 1:error, 2:warning, 3:info, 4:debug, 5:trace\n" -"For example. loglevel=2 logs fatal, error and warning level messages." -msgstr "" -"Ustawia czuÅ‚ość logowania. 0:krytyczne, 1:bÅ‚Ä™dy, 2:ostrzeżenia, 3:info, 4:debug, 5:trace\n" -======= #: src/libslic3r/PrintConfig.cpp:4458 msgid "" "Sets logging sensitivity. 0:fatal, 1:error, 2:warning, 3:info, 4:debug, 5:" @@ -11890,7 +11337,6 @@ msgid "" msgstr "" "Ustawia czuÅ‚ość logowania. 0:krytyczne, 1:bÅ‚Ä™dy, 2:ostrzeżenia, 3:info, 4:" "debug, 5:trace\n" ->>>>>>> master "Np: loglevel=2 loguje krytyczne, bÅ‚Ä™dy i ostrzeżenia." #: src/slic3r/GUI/BedShapeDialog.cpp:249 src/slic3r/GUI/GCodeViewer.cpp:3705 @@ -12204,17 +11650,6 @@ msgstr "Ustawienia MM dla jednego ekstrudera" msgid "Single Extruder Multi Material" msgstr "Multi Material z jednym ekstruderem" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:2101 -msgid "" -"Single Extruder Multi Material is selected, \n" -"and all extruders must have the same diameter.\n" -"Do you want to change the diameter for all extruders to first extruder nozzle diameter value?" -msgstr "" -"Wybrano Multi Material z jednym ekstruderem,\n" -"wiÄ™c wszystkie ekstrudery muszÄ… mieć takÄ… samÄ… Å›rednicÄ™ dyszy.\n" -"Czy chcesz zmienić Å›rednicÄ™ dyszy dla wszystkich ekstruderów na wartość z pierwszego?" -======= #: src/slic3r/GUI/Tab.cpp:2326 msgid "" "Single Extruder Multi Material is selected, \n" @@ -12226,7 +11661,6 @@ msgstr "" "wiÄ™c wszystkie ekstrudery muszÄ… mieć takÄ… samÄ… Å›rednicÄ™ dyszy.\n" "Czy chcesz zmienić Å›rednicÄ™ dyszy dla wszystkich ekstruderów na wartość z " "pierwszego?" ->>>>>>> master #: src/slic3r/GUI/Tab.cpp:2734 msgid "Single extruder multimaterial parameters" @@ -12565,16 +11999,6 @@ msgstr "" msgid "Some filaments were uninstalled." msgstr "Niektóre filamenty zostaÅ‚y odinstalowane." -<<<<<<< HEAD -#: src/slic3r/GUI/Plater.cpp:2309 -#, possible-c-format -msgid "" -"Some object(s) in file %s looks like saved in inches.\n" -"Should I consider them as a saved in inches and convert them?" -msgstr "" -"Niektóre modele w pliku %s wyglÄ…dajÄ…, jak zapisane w calach.\n" -"Czy traktować je jako zapisane w calach i przekonwertować?" -======= #: src/libslic3r/PrintConfig.cpp:1321 msgid "" "Some G/M-code commands, including temperature control and others, are not " @@ -12586,7 +12010,6 @@ msgstr "" "uniwersalne. Ustaw tÄ… opcjÄ™ w firmware Twojej drukarki, aby uzyskać " "kompatybilny plik wyjÅ›ciowy. Wariant \"no extrusion\" wyÅ‚Ä…czy generowanie " "jakichkolwiek wartoÅ›ci ekstruzji." ->>>>>>> master #: src/slic3r/GUI/GLCanvas3D.cpp:6370 msgid "Some objects are not visible during editing." @@ -12899,35 +12322,6 @@ msgstr "Uruchom nowy proces ciÄ™cia" msgid "Start the application" msgstr "Uruchom aplikacjÄ™" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_App.cpp:386 -msgid "" -"Starting with %1% 2.3, configuration directory on Linux has changed (according to XDG Base Directory Specification) to \n" -"%2%.\n" -"\n" -"This directory did not exist yet (maybe you run the new version for the first time).\n" -"However, an old %1% configuration directory was detected in \n" -"%3%.\n" -"\n" -"Consider moving the contents of the old directory to the new location in order to access your profiles, etc.\n" -"Note that if you decide to downgrade %1% in future, it will use the old location again.\n" -"\n" -"What do you want to do now?" -msgstr "" -"ZaczynajÄ…c od %1% 2.3, konfiguracje na Linuxie zostaÅ‚y przeniesione (zgodnie ze specyfikacjÄ… XDG Base Directory) do\n" -"%2%.\n" -"\n" -"Ten katalog jeszcze nie istnieje (powodem może być pierwsze uruchomienie nowej wersji).\n" -"Jednak poprzedni katalog konfiguracji %1% zostaÅ‚ wykryty w\n" -"%3%.\n" -"\n" -"Rozważ przeniesienie zawartoÅ›ci poprzedniego katalogu do nowej lokalizacji, aby mieć dostÄ™p do swoich profili itd.\n" -"Weź pod uwagÄ™, że jeÅ›li zdecyduje siÄ™ w przyszÅ‚oÅ›ci zainstalować starszÄ… wersjÄ™ %1%, z powrotem zostanie użyty poprzedni katalog.\n" -"\n" -"Czy chcesz to teraz zrobić?" - -#: src/slic3r/GUI/PrintHostDialogs.cpp:149 -======= #: src/slic3r/GUI/GUI_App.cpp:411 #, boost-format msgid "" @@ -12964,7 +12358,6 @@ msgstr "" "Czy chcesz to teraz zrobić?" #: src/slic3r/GUI/PrintHostDialogs.cpp:249 ->>>>>>> master msgid "Status" msgstr "Stan" @@ -13155,11 +12548,7 @@ msgstr "ObsÅ‚uga pozostaÅ‚ego czasu druku" msgid "Supports stealth mode" msgstr "Wspiera tryb Stealth" -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigManipulation.cpp:158 -======= #: src/slic3r/GUI/ConfigManipulation.cpp:164 ->>>>>>> master msgid "" "Supports work better, if the following feature is enabled:\n" "- Detect bridging perimeters" @@ -13229,26 +12618,13 @@ msgstr "PrzeÅ‚Ä…cz na tryb %s" msgid "Switching Presets: Unsaved Changes" msgstr "PrzeÅ‚Ä…czanie zestawu ustawieÅ„: niezapisane zmiany" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_App.cpp:1608 -======= #: src/slic3r/GUI/GUI_App.cpp:2368 ->>>>>>> master msgid "" "Switching the language will trigger application restart.\n" "You will lose content of the plater." msgstr "" "Zmiana jÄ™zyka spowoduje zrestartowanie aplikacji.\n" "Zawartość stoÅ‚u zostanie wyczyszczona." -<<<<<<< HEAD - -#: src/slic3r/GUI/WipeTowerDialog.cpp:365 -msgid "" -"Switching to simple settings will discard changes done in the advanced mode!\n" -"\n" -"Do you want to proceed?" -msgstr "WÅ‚Ä…czenie trybu prostego spowoduje odrzucenie zmian wprowadzonych w trybie zaawansowanym! Czy chcesz kontynować?" -======= #: src/slic3r/GUI/Plater.cpp:4861 #, boost-format @@ -13270,7 +12646,6 @@ msgid "" msgstr "" "WÅ‚Ä…czenie trybu prostego spowoduje odrzucenie zmian wprowadzonych w trybie " "zaawansowanym! Czy chcesz kontynować?" ->>>>>>> master #: src/slic3r/GUI/Tab.cpp:1413 msgid "symbolic profile name" @@ -13373,16 +12748,6 @@ msgstr "Wzór wypeÅ‚nienia %1% nie dziaÅ‚a z gÄ™stoÅ›ciÄ… ustawionÄ… na 100%%." msgid "The %s device could not have been found" msgstr "Nie znaleziono urzÄ…dzenia %s" -<<<<<<< HEAD -#: src/slic3r/GUI/FirmwareDialog.cpp:436 -#, possible-c-format -msgid "" -"The %s device was not found.\n" -"If the device is connected, please press the Reset button next to the USB connector ..." -msgstr "" -"Nie znaleziono urzÄ…dzenia %s .\n" -"JeÅ›li urzÄ…dzenie jest podÅ‚Ä…czone, to naciÅ›nij przycisk Reset obok zÅ‚Ä…cza USB ..." -======= #: src/slic3r/GUI/FirmwareDialog.cpp:437 #, c-format, boost-format msgid "" @@ -13393,7 +12758,6 @@ msgstr "" "Nie znaleziono urzÄ…dzenia %s .\n" "JeÅ›li urzÄ…dzenie jest podÅ‚Ä…czone, to naciÅ›nij przycisk Reset obok zÅ‚Ä…cza " "USB ..." ->>>>>>> master #: src/slic3r/GUI/GUI_App.cpp:957 #, boost-format @@ -13421,16 +12785,6 @@ msgstr "" "Obecny niestandardowy zestaw ustawieÅ„ zostanie odÅ‚Ä…czony od dziedziczÄ…cego " "zestawu systemowego." -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:925 -msgid "" -"The currently manipulated object is tilted (rotation angles are not multiples of 90°).\n" -"Non-uniform scaling of tilted objects is only possible in the World coordinate system,\n" -"once the rotation is embedded into the object coordinates." -msgstr "" -"Obecnie przeksztaÅ‚cany model jest przechylony (kÄ…ty obrotu nie sÄ… wielokrotnoÅ›ciÄ… 90°).\n" -"Nierównomierne skalowanie przechylonych modeli jest możliwe tylko w globalnym systemie koordynat, po osadzeniu kÄ…tów obrotu w koordynatach modelu." -======= #: src/slic3r/GUI/GUI_ObjectManipulation.cpp:980 msgid "" "The currently manipulated object is tilted (rotation angles are not " @@ -13444,7 +12798,6 @@ msgstr "" "Nierównomierne skalowanie przechylonych modeli jest możliwe tylko w " "globalnym systemie koordynat, po osadzeniu kÄ…tów obrotu w koordynatach " "modelu." ->>>>>>> master #: src/libslic3r/PrintConfig.cpp:3551 msgid "The default angle for connecting support sticks and junctions." @@ -13664,19 +13017,9 @@ msgstr "NastÄ™pujÄ…ce modele drukarek SLA nie majÄ… przypisanych materiałów:" msgid "the following suffix is not allowed:" msgstr "nastÄ™pujÄ…cy sufiks nie jest dozwolony:" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI.cpp:340 -msgid "The following values were substituted:" -msgstr "NastÄ™pujÄ…ce wartoÅ›ci zostaÅ‚y zamienione:" - -#: src/libslic3r/PrintConfig.cpp:3035 -msgid "The gap between the object bottom and the generated pad in zero elevation mode." -msgstr "OdstÄ™p miÄ™dzy najniższÄ… częściÄ… modelu a wygenerowanÄ… podkÅ‚adkÄ… w trybie zerowego podniesienia." -======= #: src/slic3r/GUI/GUI.cpp:327 msgid "The following values were substituted:" msgstr "NastÄ™pujÄ…ce wartoÅ›ci zostaÅ‚y zamienione:" ->>>>>>> master #: src/libslic3r/PrintConfig.cpp:3696 msgid "" @@ -13825,17 +13168,6 @@ msgid "" msgstr "" "Model zostanie podniesiony o zadanÄ… ilość warstw i umieszczony na podporach." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2567 -msgid "" -"The percentage of the bed area. \n" -"If the print area exceeds the specified value, \n" -"then a slow tilt will be used, otherwise - a fast tilt" -msgstr "" -"Procentowa powierzchnia stoÅ‚u.\n" -"JeÅ›li gabaryty wydruku przekraczajÄ… zadanÄ… wartość,\n" -"to zostanie użyte wolne przechylanie, w innym przypadku - szybkie" -======= #: src/libslic3r/PrintConfig.cpp:3464 msgid "" "The percentage of smaller pillars compared to the normal pillar diameter " @@ -13843,7 +13175,6 @@ msgid "" msgstr "" "UdziaÅ‚ procentowy mniejszych sÅ‚upków w stosunku do normalnych w " "problematycznych obszarach, gdzie normalne sÅ‚upki nie mieszczÄ… siÄ™." ->>>>>>> master #: src/libslic3r/PrintConfig.cpp:3176 msgid "" @@ -14028,25 +13359,6 @@ msgstr "" "Wybrany obiekt nie jest już dostÄ™pny.\n" "Czy chcesz usunąć go z listy niedawno używanych projektów?" -<<<<<<< HEAD -#: src/slic3r/GUI/MainFrame.cpp:1003 -msgid "" -"The selected project is no longer available.\n" -"Do you want to remove it from the recent projects list?" -msgstr "" -"Wybrany obiekt nie jest już dostÄ™pny.\n" -"Czy chcesz usunąć go z listy niedawno używanych projektów?" - -#: src/slic3r/GUI/DoubleSlider.cpp:1121 -msgid "" -"The sequential print is on.\n" -"It's impossible to apply any custom G-code for objects printing sequentually.\n" -"This code won't be processed during G-code generation." -msgstr "" -"Druk sekwencyjny jest wÅ‚Ä…czony.\n" -"Niemożliwe jest dodawanie wÅ‚asnego G-code do modeli drukowanych sekwencyjnie.\n" -"Ten kod nie bÄ™dzie przetwarzany podczas generowania pliku G-code." -======= #: src/slic3r/GUI/DoubleSlider.cpp:1440 msgid "" "The sequential print is on.\n" @@ -14066,7 +13378,6 @@ msgid "" msgstr "" "Druk sekwencyjny jest wÅ‚Ä…czony.\n" "Dodawanie wÅ‚asnego G-code jest niemożliwe podczas drukowania sekwencyjnego." ->>>>>>> master #: src/slic3r/GUI/ConfigWizard.cpp:1287 msgid "The size of the object can be specified in inches" @@ -14105,12 +13416,7 @@ msgstr "" msgid "The speed for retractions (it only applies to the extruder motor)." msgstr "PrÄ™dkość retrakcji (stosowana tylko dla silnika ekstrudera)." -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigManipulation.cpp:80 -#, possible-c-format -======= #: src/slic3r/GUI/ConfigManipulation.cpp:82 ->>>>>>> master msgid "" "The Spiral Vase mode requires:\n" "- one perimeter\n" @@ -14128,15 +13434,10 @@ msgstr "" "- wyÅ‚Ä…czone ustawienie \"Zagwarantuj grubość Å›cianki\"\n" "- wyÅ‚Ä…czone wykrywanie cienkich Å›cian" -<<<<<<< HEAD -#: src/libslic3r/Print.cpp:1270 -msgid "The Spiral Vase option can only be used when printing single material objects." -======= #: src/libslic3r/Print.cpp:469 msgid "" "The Spiral Vase option can only be used when printing single material " "objects." ->>>>>>> master msgstr "Tryb Wazy może być używany jedynie podczas druku z jednego materiaÅ‚u." #: src/slic3r/GUI/PhysicalPrinterDialog.cpp:630 @@ -14192,22 +13493,14 @@ msgstr "" "support_material_contact_distance bÄ™dzie używany zarówno dla górnej i dolnej " "odlegÅ‚oÅ›ci w osi Z." -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:2731 -======= #: src/slic3r/GUI/Tab.cpp:3005 ->>>>>>> master msgid "" "The Wipe option is not available when using the Firmware Retraction mode.\n" "\n" "Shall I disable it in order to enable Firmware Retraction?" msgstr "" -<<<<<<< HEAD -"Opcja czyszczenia dyszy nie jest dostÄ™pna z funkcjÄ… retrakcji w firmware (Firmware Retraction).\n" -======= "Opcja czyszczenia dyszy nie jest dostÄ™pna z funkcjÄ… retrakcji w firmware " "(Firmware Retraction).\n" ->>>>>>> master "\n" "WyÅ‚Ä…czyć jÄ…, aby wÅ‚Ä…czyć Firmware Retraction?" @@ -14218,14 +13511,6 @@ msgstr "" "Wieża czyszczÄ…ca obecnie nie obsÅ‚uguje wolumetrycznego parametru E " "(use_volumetric_e=0)." -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigManipulation.cpp:114 -msgid "" -"The Wipe Tower currently supports the non-soluble supports only\n" -"if they are printed with the current extruder without triggering a tool change.\n" -"(both support_material_extruder and support_material_interface_extruder need to be set to 0)." -msgstr "Wieża czyszczÄ…ca obsÅ‚uguje podpory nierozpuszczalne jedynie, gdy sÄ… drukowane tym samym ekstruderem - bez wywoÅ‚ywania zmiany narzÄ™dzia (zarówno support_material_extruder i support_material_interface_extruder muszÄ… być ustawione na 0)." -======= #: src/slic3r/GUI/ConfigManipulation.cpp:121 msgid "" "The Wipe Tower currently supports the non-soluble supports only\n" @@ -14238,7 +13523,6 @@ msgstr "" "drukowane tym samym ekstruderem - bez wywoÅ‚ywania zmiany narzÄ™dzia (zarówno " "support_material_extruder i support_material_interface_extruder muszÄ… być " "ustawione na 0)." ->>>>>>> master #: src/libslic3r/Print.cpp:598 msgid "" @@ -14344,31 +13628,6 @@ msgstr "" "WystÄ™puje zmiana koloru dla ekstrudera, który nie byÅ‚ jeszcze używany.\n" "Sprawdź ustawienia, aby uniknąć niepotrzebnych zmian koloru." -<<<<<<< HEAD -#: src/slic3r/GUI/DoubleSlider.cpp:1155 -msgid "" -"There is a color change for extruder that has not been used before.\n" -"Check your settings to avoid redundant color changes." -msgstr "" -"WystÄ™puje zmiana koloru dla ekstrudera, który nie byÅ‚ jeszcze używany.\n" -"Sprawdź ustawienia, aby uniknąć niepotrzebnych zmian koloru." - -#: src/slic3r/GUI/DoubleSlider.cpp:1149 -msgid "" -"There is a color change for extruder that won't be used till the end of print job.\n" -"This code won't be processed during G-code generation." -msgstr "" -"WystÄ™puje zmiana koloru dla ekstrudera, który nie bÄ™dzie używany do koÅ„ca tego wydruku.\n" -"Ten kod nie bÄ™dzie przetwarzany podczas generowania G-code." - -#: src/slic3r/GUI/DoubleSlider.cpp:1152 -msgid "" -"There is an extruder change set to the same extruder.\n" -"This code won't be processed during G-code generation." -msgstr "" -"WystÄ™puje zmiana koloru na używany przez ten sam ekstruder.\n" -"Ten kod nie bÄ™dzie przetwarzany podczas generowania G-code." -======= #: src/slic3r/GUI/DoubleSlider.cpp:1485 msgid "" "There is a color change for extruder that won't be used till the end of " @@ -14390,7 +13649,6 @@ msgstr "" #: src/libslic3r/GCode.cpp:539 msgid "There is an object with no extrusions in the first layer." msgstr "Na pierwszej warstwie istnieje obiekt bez ekstruzji." ->>>>>>> master #: src/libslic3r/PrintConfig.cpp:2799 msgid "Thick bridges" @@ -14401,23 +13659,6 @@ msgstr "Grube mosty" msgid "This %s version: %s" msgstr "%s wersja: %s" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:1244 -msgid "" -"This action is not revertable.\n" -"Do you want to proceed?" -msgstr "" -"Tej czynnoÅ›ci nie można odwrócić.\n" -"Czy chcesz kontynuować?" - -#: src/libslic3r/PrintConfig.cpp:199 -msgid "This code is inserted between objects when using sequential printing. By default extruder and bed temperature are reset using non-wait command; however if M104, M109, M140 or M190 are detected in this custom code, Slic3r will not add temperature commands. Note that you can use placeholder variables for all Slic3r settings, so you can put a \"M109 S[first_layer_temperature]\" command wherever you want." -msgstr "Ten kod jest wykonywany pomiÄ™dzy drukiem poszczególnych modeli w trybie druku sekwencyjnego. DomyÅ›lnie przy komendzie non-wait temperatury dyszy i stoÅ‚u sÄ… resetowane; jednakże jeÅ›li przy tej opcji zostanÄ… użyte komendy M104, M109, M140 lub M190 to Slic3r nie doda wÅ‚asnych komend do kontroli temperatury. PamiÄ™taj, że możesz używać zmiennych typu placeholder, wiÄ™c np. komendÄ™ \"M109 S[first_layer_temperature]\" (temperatura pierwszej warstwy) możesz umieÅ›cić gdzie chcesz." - -#: src/libslic3r/PrintConfig.cpp:1174 -msgid "This custom code is inserted at every layer change, right after the Z move and before the extruder moves to the first layer point. Note that you can use placeholder variables for all Slic3r settings as well as [layer_num] and [layer_z]." -msgstr "Ten kod jest wykonywany przy każdej zmianie warstwy - zaraz po podniesieniu gÅ‚owicy na wysokość kolejnej warstwy ale zanim ekstruder przejdzie do pierwszego punktu nowej warstwy. PamiÄ™taj, że możesz użyć zmiennych typu placeholder dla wszystkich ustawieÅ„ Slic3r, jak np. [layer_num] (numer warstwy) i [layer_z] (poÅ‚ożenie warstwy w osi Z)." -======= #: src/slic3r/GUI/DoubleSlider.cpp:2087 src/slic3r/GUI/Tab.cpp:1322 msgid "" "This action is not revertible.\n" @@ -14425,7 +13666,6 @@ msgid "" msgstr "" "Tej akcji nie można cofnąć.\n" "Czy chcesz kontynuować?" ->>>>>>> master #: src/slic3r/GUI/DoubleSlider.cpp:2086 msgid "This action will cause deletion of all ticks on vertical slider." @@ -14622,34 +13862,6 @@ msgstr "" "dowolnÄ… ilość dolnych warstw jak i obrysów skirt/brim. Nie zadziaÅ‚a przy " "druku wiÄ™cej niż jednego modelu." -<<<<<<< HEAD -#: src/slic3r/GUI/Plater.cpp:2319 -msgid "" -"This file contains several objects positioned at multiple heights.\n" -"Instead of considering them as multiple objects, should I consider\n" -"this file as a single object having multiple parts?" -msgstr "" -"Ten plik zawiera kilka modeli umieszczonych na różnych wysokoÅ›ciach. \n" -"Potraktować go jako\n" -"jeden model skÅ‚adajÄ…cy siÄ™ z kilku części?" - -#: src/slic3r/GUI/FirmwareDialog.cpp:332 -#, possible-c-format -msgid "" -"This firmware hex file does not match the printer model.\n" -"The hex file is intended for: %s\n" -"Printer reported: %s\n" -"\n" -"Do you want to continue and flash this hex file anyway?\n" -"Please only continue if you are sure this is the right thing to do." -msgstr "" -"Ten plik .hex z firmware nie jest przeznaczony dla tej drukarki.\n" -"Plik .hex jest przeznaczony dla: %s\n" -"Wykryta drukarka: %s\n" -"\n" -"Czy chcesz kontynuować i mimo wszystko wgrać ten plik .hex?\n" -"Kontynuuj tylko, jeÅ›li wiesz, że tak powinno być." -======= #: src/slic3r/GUI/Plater.cpp:2604 msgid "" "This file cannot be loaded in a simple mode. Do you want to switch to an " @@ -14667,7 +13879,6 @@ msgstr "" "Ten plik zawiera kilka obiektów umieszczonych na różnych wysokoÅ›ciach.\n" "Czy chcesz potraktować go jako jeden model zawierajÄ…cy kilka części, \n" "zamiast wielu modeli?" ->>>>>>> master #: src/slic3r/GUI/FirmwareDialog.cpp:333 #, c-format, boost-format @@ -14867,11 +14078,7 @@ msgstr "" "Może to powodować problemy w wizualizacji G-code oraz szacowaniu czasu " "wydruku" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:928 -======= #: src/slic3r/GUI/GUI_ObjectManipulation.cpp:983 ->>>>>>> master msgid "" "This operation is irreversible.\n" "Do you want to proceed?" @@ -15050,19 +14257,6 @@ msgstr "" "wartoÅ›ci czyszczenia poniżej." #: src/slic3r/GUI/UpdateDialogs.cpp:216 -<<<<<<< HEAD -#, possible-c-format -msgid "" -"This version of %s is not compatible with currently installed configuration bundles.\n" -"This probably happened as a result of running an older %s after using a newer one.\n" -"\n" -"You may either exit %s and try again with a newer version, or you may re-run the initial configuration. Doing so will create a backup snapshot of the existing configuration before installing files compatible with this %s." -msgstr "" -"Ta wersja %s nie jest kompatybilna z aktualnie zainstalowanym zestawem konfiguracji.\n" -"Prawdopodobnie staÅ‚o siÄ™ tak, ponieważ uruchomiono starszy %s po użyciu nowszego.\n" -"\n" -"Możesz zamknąć %s i spróbować ponownie z nowszÄ… wersjÄ…, lub możesz też uruchomić ponownie konfiguracjÄ™ poczÄ…tkowÄ…. Spowoduje to stworzenie kopii istniejÄ…cej konfiguracji przed zainstalowaniem plików kompatybilnych z %s ." -======= #, c-format, boost-format msgid "" "This version of %s is not compatible with currently installed configuration " @@ -15095,7 +14289,6 @@ msgstr "" "rozszerzyć listÄ™ obsÅ‚ugiwanych rodzajów firmware. Możesz zdecydować siÄ™ na " "rezygnacjÄ™ lub zastÄ…pienie nieznanej wartoÅ›ci wartoÅ›ciÄ… domyÅ›lnÄ… po cichu " "lub z powiadomieniem." ->>>>>>> master #: src/libslic3r/PrintConfig.cpp:3234 msgid "" @@ -15386,17 +14579,12 @@ msgstr "Rodzaj drukarki." msgid "Type:" msgstr "Typ:" -<<<<<<< HEAD -#: src/slic3r/GUI/OpenGLManager.cpp:275 -#, possible-c-format -======= #: src/libslic3r/SLAPrintSteps.cpp:441 msgid "Unable to drill the current configuration of holes into the model." msgstr "Nie ma możliwoÅ›ci wywiercenia otworów w modelu w obecnej konfiguracji." #: src/slic3r/GUI/OpenGLManager.cpp:273 #, c-format, boost-format ->>>>>>> master msgid "" "Unable to load the following shaders:\n" "%s" @@ -15422,9 +14610,6 @@ msgstr "Nie można zamienić na wiÄ™cej niż jeden ksztaÅ‚t" msgid "Undef" msgstr "Undef" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI.cpp:305 -======= #: src/slic3r/GUI/UnsavedChangesDialog.cpp:1681 msgid "Undef category" msgstr "Niezdefiniowana kategoria" @@ -15434,7 +14619,6 @@ msgid "Undef group" msgstr "Niezdefiniowana grupa" #: src/slic3r/GUI/GUI.cpp:292 ->>>>>>> master msgid "Undefined" msgstr "Nie zdefiniowano" @@ -15524,22 +14708,6 @@ msgstr "PoczÄ…tkowa prÄ™dkość rozÅ‚adowania" msgid "UNLOCKED LOCK" msgstr "OTWARTA KÅÓDKA" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3719 -msgid "" -"UNLOCKED LOCK icon indicates that some settings were changed and are not equal to the system (or default) values for the current option group.\n" -"Click to reset all settings for current option group to the system (or default) values." -msgstr "" -"OTWARTA KÅÓDKA oznacza, że niektóre ustawienia zostaÅ‚y zmodyfikowane i nie odpowiadajÄ… wartoÅ›ciom systemowym (lub domyÅ›lnym) w obecnej grupie opcji.\n" -"Kliknij, aby zresetować wszystkie ustawienia obecnej grupy ustawieÅ„ do wartoÅ›ci systemowych (lub domyÅ›lnych)." - -#: src/slic3r/GUI/Tab.cpp:3734 -msgid "" -"UNLOCKED LOCK icon indicates that the value was changed and is not equal to the system (or default) value.\n" -"Click to reset current value to the system (or default) value." -msgstr "" -"OTWARTA KÅÓDKA oznacza, że niektóre wartoÅ›ci zostaÅ‚y zmodyfikowane i nie odpowiadajÄ… systemowym (lub domyÅ›lnym).\n" -======= #: src/slic3r/GUI/Tab.cpp:4283 msgid "" "UNLOCKED LOCK icon indicates that some settings were changed and are not " @@ -15560,7 +14728,6 @@ msgid "" msgstr "" "OTWARTA KÅÓDKA oznacza, że niektóre wartoÅ›ci zostaÅ‚y zmodyfikowane i nie " "odpowiadajÄ… systemowym (lub domyÅ›lnym).\n" ->>>>>>> master "Kliknij ikonÄ™, aby zresetować do wartoÅ›ci systemowej (lub domyÅ›lnej)." #: src/slic3r/GUI/UnsavedChangesDialog.cpp:771 @@ -15914,20 +15081,14 @@ msgstr "Widok" msgid "View mode" msgstr "Widok" -<<<<<<< HEAD -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:666 -======= #: src/slic3r/GUI/UnsavedChangesDialog.cpp:903 #, boost-format ->>>>>>> master msgid "" "Visit \"Preferences\" and check \"%1%\"\n" "to be asked about unsaved changes again." msgstr "" "Otwórz Preferencje i sprawdź \"%1%\",\n" "aby wÅ‚Ä…czyć potwierdzanie niezapisanych zmian." -<<<<<<< HEAD -======= #: src/slic3r/GUI/GUI_App.cpp:3076 src/slic3r/GUI/Plater.cpp:1738 #, boost-format @@ -15937,7 +15098,6 @@ msgid "" msgstr "" "Wejdź w \"Preferencje\" i zaznacz \"%1%\",\n" "aby zmienić wybór." ->>>>>>> master #: src/libslic3r/PrintConfig.cpp:4278 msgid "Visualize an already sliced and saved G-code" @@ -16305,40 +15465,22 @@ msgstr "OsÅ‚ona wokół podpór" msgid "World coordinates" msgstr "Globalny ukÅ‚ad współrzÄ™dnych" -<<<<<<< HEAD -#: src/slic3r/GUI/UpdateDialogs.cpp:92 -msgid "" -"Would you like to install it?\n" -"\n" -"Note that a full configuration snapshot will be created first. It can then be restored at any time should there be a problem with the new version.\n" -======= #: src/slic3r/GUI/UpdateDialogs.cpp:100 msgid "" "Would you like to install it?\n" "\n" "Note that a full configuration snapshot will be created first. It can then " "be restored at any time should there be a problem with the new version.\n" ->>>>>>> master "\n" "Updated configuration bundles:" msgstr "" "Czy chcesz kontynuować instalacjÄ™?\n" "\n" -<<<<<<< HEAD -"Weź pod uwagÄ™, że najpierw zostanie stworzony zrzut konfiguracji. Może być przywrócony w każdej chwili, gdyby okazaÅ‚o siÄ™, że nowa wersja powoduje problemy.\n" -"\n" -"Zaktualizowane paczki konfiguracyjne:" - -#: src/slic3r/GUI/GUI_App.cpp:1802 -msgid "Would you like to stop uploads and close the program?" -msgstr "Czy chcesz zatrzymać przesyÅ‚anie i zamknąć program?" -======= "Weź pod uwagÄ™, że najpierw zostanie stworzony zrzut konfiguracji. Może być " "przywrócony w każdej chwili, gdyby okazaÅ‚o siÄ™, że nowa wersja powoduje " "problemy.\n" "\n" "Zaktualizowane paczki konfiguracyjne:" ->>>>>>> master #: src/libslic3r/miniz_extension.cpp:151 msgid "write calledback failed" @@ -16491,17 +15633,6 @@ msgid "" "You cannot use non-uniform scaling mode for multiple objects/parts selection" msgstr "Nie możesz używać skalowania nierównomiernego dla kliku modeli/części" -<<<<<<< HEAD -#: src/slic3r/GUI/NotificationManager.hpp:459 -msgid "" -"You have just added a G-code for color change, but its value is empty.\n" -"To export the G-code correctly, check the \"Color Change G-code\" in \"Printer Settings > Custom G-code\"" -msgstr "" -"Dodany zostaÅ‚ G-code dla zmiany koloru, ale nie zawiera parametrów.\n" -"Aby poprawnie wyeksportować G-code, wybierz \"G-code dla zmiany koloru\" w sekcji \"Ustawienia drukarki -> WÅ‚asny G-code\"" - -#: src/slic3r/GUI/SavePresetDialog.cpp:277 -======= #: src/slic3r/GUI/NotificationManager.hpp:761 msgid "" "You have just added a G-code for color change, but its value is empty.\n" @@ -16514,7 +15645,6 @@ msgstr "" #: src/slic3r/GUI/SavePresetDialog.cpp:283 #, boost-format ->>>>>>> master msgid "" "You have selected physical printer \"%1%\" \n" "with related printer preset \"%2%\"" @@ -16537,30 +15667,12 @@ msgstr "Może być wymagana aktualizacja sterowników karty graficznej." msgid "You must install a configuration update." msgstr "Do instalacji jest wymagana aktualizacja konfiguracji." -<<<<<<< HEAD -#: src/slic3r/GUI/Preferences.cpp:299 -#, possible-c-format -msgid "You need to restart %s to make the changes effective." -msgstr "Wymagany jest restart %s, aby wprowadzić zmiany." - -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:611 -msgid "You should change the name of your printer device." -msgstr "Należy zmienić nazwÄ™ drukarki." - -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:468 -msgid "You should to change a name of your printer device. It can't be saved." -msgstr "Należy zmienić nazwÄ™ drukarki. Nie można jej zapisać." - -#: src/slic3r/GUI/GUI_ObjectList.cpp:3884 -#, possible-c-format -======= #: src/slic3r/GUI/PhysicalPrinterDialog.cpp:634 msgid "You should change the name of your printer device." msgstr "Należy zmienić nazwÄ™ drukarki." #: src/slic3r/GUI/GUI_ObjectList.cpp:3644 #, c-format, boost-format ->>>>>>> master msgid "You started your selection with %s Item." msgstr "Wybór rozpoczÄ™ty przez %s." @@ -16659,31 +15771,9 @@ msgstr "" msgid "Z offset" msgstr "Z offset" -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigManipulation.cpp:59 -msgid "" -"Zero first layer height is not valid.\n" -"\n" -"The first layer height will be reset to 0.01." -msgstr "" -"Zerowa wysokość pierwszej warstwy jest nieprawidÅ‚owa.\n" -"\n" -"Wysokość pierwszej warstwy zostanie ustawiona na 0,01." - -#: src/slic3r/GUI/ConfigManipulation.cpp:47 -msgid "" -"Zero layer height is not valid.\n" -"\n" -"The layer height will be reset to 0.01." -msgstr "" -"Zerowa wysokość warstwy jest nieprawidÅ‚owa.\n" -"\n" -"Wysokość warstwy zostanie ustawiona na 0,01." -======= #: src/libslic3r/PrintConfig.cpp:2896 msgid "Z travel" msgstr "PrÄ™dkość jaÅ‚owa osi Z" ->>>>>>> master #: src/libslic3r/PrintConfig.cpp:3492 msgid "Zig-Zag" @@ -16720,11 +15810,7 @@ msgstr "Oddalenie" msgid "Zoom to Bed" msgstr "Zbliżenie na Stół" -<<<<<<< HEAD -#: src/slic3r/GUI/KBShortcutsDialog.cpp:176 -======= #: src/slic3r/GUI/KBShortcutsDialog.cpp:160 ->>>>>>> master msgid "" "Zoom to selected object\n" "or all objects in scene, if none selected" @@ -16732,19 +15818,11 @@ msgstr "" "Ustaw zbliżenie na wybrany model\n" "lub wszystkie na stole, jeÅ›li żaden nie zostaÅ‚ wybrany" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:241 src/libslic3r/PrintConfig.cpp:816 -#: src/libslic3r/PrintConfig.cpp:1748 src/libslic3r/PrintConfig.cpp:1758 -#: src/libslic3r/PrintConfig.cpp:2036 src/libslic3r/PrintConfig.cpp:2191 -#: src/libslic3r/PrintConfig.cpp:2390 src/libslic3r/PrintConfig.cpp:2891 -#: src/libslic3r/PrintConfig.cpp:3012 -======= #: src/libslic3r/PrintConfig.cpp:456 src/libslic3r/PrintConfig.cpp:1075 #: src/libslic3r/PrintConfig.cpp:2232 src/libslic3r/PrintConfig.cpp:2242 #: src/libslic3r/PrintConfig.cpp:2533 src/libslic3r/PrintConfig.cpp:2774 #: src/libslic3r/PrintConfig.cpp:2991 src/libslic3r/PrintConfig.cpp:3552 #: src/libslic3r/PrintConfig.cpp:3673 ->>>>>>> master msgid "°" msgstr "°" diff --git a/resources/localization/pt_br/PrusaSlicer.mo b/resources/localization/pt_br/PrusaSlicer.mo Binary files differdeleted file mode 100644 index 649d4de13..000000000 --- a/resources/localization/pt_br/PrusaSlicer.mo +++ /dev/null diff --git a/resources/localization/ru/PrusaSlicer.mo b/resources/localization/ru/PrusaSlicer.mo Binary files differindex cf1d86dd1..f8deb07b7 100644 --- a/resources/localization/ru/PrusaSlicer.mo +++ b/resources/localization/ru/PrusaSlicer.mo diff --git a/resources/localization/ru/PrusaSlicer_ru.po b/resources/localization/ru/PrusaSlicer_ru.po index e06e4e68f..79a0c384a 100644 --- a/resources/localization/ru/PrusaSlicer_ru.po +++ b/resources/localization/ru/PrusaSlicer_ru.po @@ -7,25 +7,6 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -"POT-Creation-Date: 2021-01-09 15:30+0700\n" -"PO-Revision-Date: 2021-02-03 14:06+0100\n" -"Language-Team: Andylg <andylg@yandex.ru>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n" -"%100>=20) ? 1 : 2);\n" -"X-Generator: Poedit 2.4.2\n" -"Last-Translator: Oleksandra Iushchenko <yusanka@gmail.com>\n" -"Language: ru_RU\n" - -#: src/slic3r/GUI/AboutDialog.cpp:45 src/slic3r/GUI/AboutDialog.cpp:299 -msgid "Portions copyright" -msgstr "С иÑпользованием разработок" - -#: src/slic3r/GUI/AboutDialog.cpp:135 src/slic3r/GUI/AboutDialog.cpp:263 -======= "POT-Creation-Date: 2022-01-25 17:28+0100\n" "PO-Revision-Date: 2021-12-15 15:35+0700\n" "Last-Translator: Andylg andylg@yandex.ru\n" @@ -43,32 +24,18 @@ msgid "Portions copyright" msgstr "С иÑпользованием разработок" #: src/slic3r/GUI/AboutDialog.cpp:139 src/slic3r/GUI/AboutDialog.cpp:267 ->>>>>>> master msgid "Copyright" msgstr "Copyright" #. TRN "Slic3r _is licensed under the_ License" -<<<<<<< HEAD -#: src/slic3r/GUI/AboutDialog.cpp:137 -======= #: src/slic3r/GUI/AboutDialog.cpp:141 ->>>>>>> master msgid "" -"License agreements of all following programs (libraries) are part of application " -"license agreement" +"License agreements of all following programs (libraries) are part of " +"application license agreement" msgstr "" "Лицензионные ÑÐ¾Ð³Ð»Ð°ÑˆÐµÐ½Ð¸Ñ Ð²Ñех Ñледующих программ (библиотек) ÑвлÑÑŽÑ‚ÑÑ Ñ‡Ð°Ñтью " "лицензионного ÑоглашениÑ" -<<<<<<< HEAD -#: src/slic3r/GUI/AboutDialog.cpp:206 -#, c-format -msgid "About %s" -msgstr "О %s" - -#: src/slic3r/GUI/AboutDialog.cpp:238 src/slic3r/GUI/AboutDialog.cpp:361 -#: src/slic3r/GUI/GUI_App.cpp:235 src/slic3r/GUI/MainFrame.cpp:151 -======= #: src/slic3r/GUI/AboutDialog.cpp:210 #, c-format, boost-format msgid "About %s" @@ -76,22 +43,10 @@ msgstr "О %s" #: src/slic3r/GUI/AboutDialog.cpp:242 src/slic3r/GUI/AboutDialog.cpp:367 #: src/slic3r/GUI/GUI_App.cpp:262 ->>>>>>> master msgid "Version" msgstr "ВерÑиÑ" #. TRN "Slic3r _is licensed under the_ License" -<<<<<<< HEAD -#: src/slic3r/GUI/AboutDialog.cpp:265 src/slic3r/GUI/GUI_App.cpp:240 -msgid "is licensed under the" -msgstr "лицензирован в ÑоответÑтвии Ñ" - -#: src/slic3r/GUI/AboutDialog.cpp:266 src/slic3r/GUI/GUI_App.cpp:240 -msgid "GNU Affero General Public License, version 3" -msgstr "GNU Affero General Public License, version 3" - -#: src/slic3r/GUI/AboutDialog.cpp:267 -======= #: src/slic3r/GUI/AboutDialog.cpp:269 src/slic3r/GUI/GUI_App.cpp:268 msgid "is licensed under the" msgstr "лицензирован в ÑоответÑтвии Ñ" @@ -101,36 +56,19 @@ msgid "GNU Affero General Public License, version 3" msgstr "GNU Affero General Public License, version 3" #: src/slic3r/GUI/AboutDialog.cpp:271 ->>>>>>> master msgid "" -"PrusaSlicer is based on Slic3r by Alessandro Ranellucci and the RepRap community." +"PrusaSlicer is based on Slic3r by Alessandro Ranellucci and the RepRap " +"community." msgstr "" -<<<<<<< HEAD -"PrusaSlicer is based on Slic3r by Alessandro Ranellucci and the RepRap community." - -#: src/slic3r/GUI/AboutDialog.cpp:268 -======= "PrusaSlicer is based on Slic3r by Alessandro Ranellucci and the RepRap " "community." #: src/slic3r/GUI/AboutDialog.cpp:272 ->>>>>>> master msgid "" -"Contributions by Henrik Brix Andersen, Nicolas Dandrimont, Mark Hindess, Petr " -"Ledvina, Joseph Lenox, Y. Sapir, Mike Sheldrake, Vojtech Bubnik and numerous others." +"Contributions by Henrik Brix Andersen, Nicolas Dandrimont, Mark Hindess, " +"Petr Ledvina, Joseph Lenox, Y. Sapir, Mike Sheldrake, Vojtech Bubnik and " +"numerous others." msgstr "" -<<<<<<< HEAD -"Contributions by Henrik Brix Andersen, Nicolas Dandrimont, Mark Hindess, Petr " -"Ledvina, Joseph Lenox, Y. Sapir, Mike Sheldrake, Vojtech Bubnik and numerous " -"others. ЕÑли вы нашли ошибки в руÑÑком переводе пишите на andylg@yandex.ru." - -#: src/slic3r/GUI/AboutDialog.cpp:304 -msgid "Copy Version Info" -msgstr "Скопировать информацию о верÑии" - -#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:78 -#, c-format -======= "Contributions by Henrik Brix Andersen, Nicolas Dandrimont, Mark Hindess, " "Petr Ledvina, Joseph Lenox, Y. Sapir, Mike Sheldrake, Vojtech Bubnik and " "numerous others. ЕÑли вы нашли ошибки в руÑÑком переводе пишите на " @@ -142,24 +80,11 @@ msgstr "Скопировать информацию о верÑии" #: src/slic3r/GUI/BackgroundSlicingProcess.cpp:79 #, c-format, boost-format ->>>>>>> master msgid "" -"%s has encountered an error. It was likely caused by running out of memory. If you " -"are sure you have enough RAM on your system, this may also be a bug and we would be " -"glad if you reported it." +"%s has encountered an error. It was likely caused by running out of memory. " +"If you are sure you have enough RAM on your system, this may also be a bug " +"and we would be glad if you reported it." msgstr "" -<<<<<<< HEAD -"При работе Ñ %s произошла ошибка. Скорее вÑего, Ñто было вызвано нехваткой памÑти. " -"ЕÑли вы уверены, что в вашей ÑиÑтеме доÑтаточно оперативной памÑти, но тем не менее " -"произошла Ñта ошибка, Ñообщите нам об Ñтом." - -#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:163 -#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:183 -msgid "Unknown error occured during exporting G-code." -msgstr "При ÑкÑпорте G-кода произошла неизвеÑÑ‚Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°." - -#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:168 -======= "При работе Ñ %s произошла ошибка. Скорее вÑего, Ñто было вызвано нехваткой " "памÑти. ЕÑли вы уверены, что в вашей ÑиÑтеме доÑтаточно оперативной памÑти, " "но тем не менее произошла Ñта ошибка, Ñообщите нам об Ñтом." @@ -227,39 +152,22 @@ msgstr "При ÑкÑпорте G-кода произошла неизвеÑтн #: src/slic3r/GUI/BackgroundSlicingProcess.cpp:695 #, boost-format ->>>>>>> master msgid "" -"Copying of the temporary G-code to the output G-code failed. Maybe the SD card is " -"write locked?\n" +"Copying of the temporary G-code to the output G-code failed. Maybe the SD " +"card is write locked?\n" "Error message: %1%" msgstr "" -<<<<<<< HEAD -"Ðе удалоÑÑŒ Ñкопировать временный G-код в меÑтонахождение выходного G-код файла. " -"Может ваша SD карта защищена от запиÑи?\n" -"Сообщение об ошибке: %1%" - -#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:171 -======= "Ðе удалоÑÑŒ Ñкопировать временный G-код в меÑтонахождение выходного G-код " "файла. Может ваша SD карта защищена от запиÑи?\n" "Сообщение об ошибке: %1%" #: src/slic3r/GUI/BackgroundSlicingProcess.cpp:698 #, boost-format ->>>>>>> master msgid "" -"Copying of the temporary G-code to the output G-code failed. There might be problem " -"with target device, please try exporting again or using different device. The " -"corrupted output G-code is at %1%.tmp." +"Copying of the temporary G-code to the output G-code failed. There might be " +"problem with target device, please try exporting again or using different " +"device. The corrupted output G-code is at %1%.tmp." msgstr "" -<<<<<<< HEAD -"Ðе удалоÑÑŒ Ñкопировать временный G-код в меÑтонахождение выходного G-код файла. " -"Возможно, проблема Ñ ÑƒÑтройÑтвом назначениÑ, попробуйте Ñнова выполнить ÑкÑпорт или " -"иÑпользовать другое уÑтройÑтво. Повреждённый выходной G-код файл находитÑÑ Ð² %1%." -"tmp." - -#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:174 -======= "Ðе удалоÑÑŒ Ñкопировать временный G-код в меÑтонахождение выходного G-код " "файла. Возможно, проблема Ñ ÑƒÑтройÑтвом назначениÑ, попробуйте Ñнова " "выполнить ÑкÑпорт или иÑпользовать другое уÑтройÑтво. Повреждённый выходной " @@ -267,71 +175,20 @@ msgstr "" #: src/slic3r/GUI/BackgroundSlicingProcess.cpp:701 #, boost-format ->>>>>>> master msgid "" -"Renaming of the G-code after copying to the selected destination folder has failed. " -"Current path is %1%.tmp. Please try exporting again." +"Renaming of the G-code after copying to the selected destination folder has " +"failed. Current path is %1%.tmp. Please try exporting again." msgstr "" -<<<<<<< HEAD -"Ðе удалоÑÑŒ переименовать G-код поÑле ÐºÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð² выбранную папку назначениÑ. " -"Текущий путь %1%.tmp. ПожалуйÑта, попробуйте ÑкÑпортировать ещё раз." - -#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:177 -======= "Ðе удалоÑÑŒ переименовать G-код поÑле ÐºÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð² выбранную папку " "назначениÑ. Текущий путь %1%.tmp. ПожалуйÑта, попробуйте ÑкÑпортировать ещё " "раз." #: src/slic3r/GUI/BackgroundSlicingProcess.cpp:704 #, boost-format ->>>>>>> master -msgid "" -"Copying of the temporary G-code has finished but the original code at %1% couldn't " -"be opened during copy check. The output G-code is at %2%.tmp." -msgstr "" -<<<<<<< HEAD -"Копирование временного G-кода завершено, но иÑходный код в %1% не удалоÑÑŒ открыть " -"во Ð²Ñ€ÐµÐ¼Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐºÐ¸ копии. Выходной G-код находитÑÑ Ð² %2%.tmp." - -#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:180 msgid "" -"Copying of the temporary G-code has finished but the exported code couldn't be " -"opened during copy check. The output G-code is at %1%.tmp." +"Copying of the temporary G-code has finished but the original code at %1% " +"couldn't be opened during copy check. The output G-code is at %2%.tmp." msgstr "" -"Копирование временного G-кода завершено, но ÑкÑпортированный код не удалоÑÑŒ открыть " -"во Ð²Ñ€ÐµÐ¼Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐºÐ¸ копии. Выходной G-код находитÑÑ Ð² %1%.tmp." - -#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:187 -#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:536 -msgid "Running post-processing scripts" -msgstr "ЗапуÑк Ñкриптов поÑтобработки" - -#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:189 -msgid "G-code file exported to %1%" -msgstr "Файл G-кода ÑкÑпортирован в %1%" - -#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:194 -#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:243 -msgid "Slicing complete" -msgstr "Ðарезка завершена" - -#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:238 -msgid "Masked SLA file exported to %1%" -msgstr "MSLA файл ÑкÑпортирован в %1%" - -#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:539 -msgid "Copying of the temporary G-code to the output G-code failed" -msgstr "" -"Ðе удалоÑÑŒ Ñкопировать временный G-код в меÑтонахождение выходного G-код файла" - -#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:562 -msgid "Scheduling upload to `%1%`. See Window -> Print Host Upload Queue" -msgstr "" -"Планирование загрузки на `%1%`. Смотрите Окна -> Очередь загрузки на хоÑÑ‚ печати" - -#: src/slic3r/GUI/BedShapeDialog.cpp:93 src/slic3r/GUI/GUI_ObjectManipulation.cpp:240 -#: src/slic3r/GUI/Plater.cpp:162 src/slic3r/GUI/Tab.cpp:2536 -======= "Копирование временного G-кода завершено, но иÑходный код в %1% не удалоÑÑŒ " "открыть во Ð²Ñ€ÐµÐ¼Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐºÐ¸ копии. Выходной G-код находитÑÑ Ð² %2%.tmp." @@ -365,7 +222,6 @@ msgstr "" #: src/slic3r/GUI/BedShapeDialog.cpp:31 #: src/slic3r/GUI/GUI_ObjectManipulation.cpp:218 src/slic3r/GUI/Plater.cpp:204 #: src/slic3r/GUI/Tab.cpp:2755 ->>>>>>> master msgid "Size" msgstr "Размер" @@ -373,11 +229,7 @@ msgstr "Размер" msgid "Origin" msgstr "Ðачало координат" -<<<<<<< HEAD -#: src/slic3r/GUI/BedShapeDialog.cpp:95 src/libslic3r/PrintConfig.cpp:771 -======= #: src/slic3r/GUI/BedShapeDialog.cpp:33 src/libslic3r/PrintConfig.cpp:994 ->>>>>>> master msgid "Diameter" msgstr "Диаметр" @@ -387,54 +239,12 @@ msgstr "Размеры прÑмоугольного Ñтола в XY коордР#: src/slic3r/GUI/BedShapeDialog.cpp:58 msgid "" -"Distance of the 0,0 G-code coordinate from the front left corner of the rectangle." +"Distance of the 0,0 G-code coordinate from the front left corner of the " +"rectangle." msgstr "" "РаÑÑтоÑние до точки начало координат. ОтÑчёт от левого переднего угла " "прÑмоугольного Ñтола." -<<<<<<< HEAD -#: src/slic3r/GUI/BedShapeDialog.cpp:129 src/slic3r/GUI/ConfigWizard.cpp:242 -#: src/slic3r/GUI/ConfigWizard.cpp:1368 src/slic3r/GUI/ConfigWizard.cpp:1382 -#: src/slic3r/GUI/ExtruderSequenceDialog.cpp:88 src/slic3r/GUI/GCodeViewer.cpp:2337 -#: src/slic3r/GUI/GCodeViewer.cpp:2343 src/slic3r/GUI/GCodeViewer.cpp:2351 -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:179 src/slic3r/GUI/GUI_ObjectLayers.cpp:145 -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:341 -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:418 -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:486 -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:487 -#: src/slic3r/GUI/ObjectDataViewModel.cpp:96 src/slic3r/GUI/WipeTowerDialog.cpp:85 -#: src/libslic3r/PrintConfig.cpp:77 src/libslic3r/PrintConfig.cpp:84 -#: src/libslic3r/PrintConfig.cpp:95 src/libslic3r/PrintConfig.cpp:135 -#: src/libslic3r/PrintConfig.cpp:244 src/libslic3r/PrintConfig.cpp:302 -#: src/libslic3r/PrintConfig.cpp:377 src/libslic3r/PrintConfig.cpp:385 -#: src/libslic3r/PrintConfig.cpp:435 src/libslic3r/PrintConfig.cpp:565 -#: src/libslic3r/PrintConfig.cpp:576 src/libslic3r/PrintConfig.cpp:594 -#: src/libslic3r/PrintConfig.cpp:774 src/libslic3r/PrintConfig.cpp:1258 -#: src/libslic3r/PrintConfig.cpp:1439 src/libslic3r/PrintConfig.cpp:1500 -#: src/libslic3r/PrintConfig.cpp:1518 src/libslic3r/PrintConfig.cpp:1536 -#: src/libslic3r/PrintConfig.cpp:1594 src/libslic3r/PrintConfig.cpp:1604 -#: src/libslic3r/PrintConfig.cpp:1729 src/libslic3r/PrintConfig.cpp:1737 -#: src/libslic3r/PrintConfig.cpp:1778 src/libslic3r/PrintConfig.cpp:1786 -#: src/libslic3r/PrintConfig.cpp:1796 src/libslic3r/PrintConfig.cpp:1804 -#: src/libslic3r/PrintConfig.cpp:1812 src/libslic3r/PrintConfig.cpp:1875 -#: src/libslic3r/PrintConfig.cpp:2141 src/libslic3r/PrintConfig.cpp:2212 -#: src/libslic3r/PrintConfig.cpp:2246 src/libslic3r/PrintConfig.cpp:2375 -#: src/libslic3r/PrintConfig.cpp:2454 src/libslic3r/PrintConfig.cpp:2461 -#: src/libslic3r/PrintConfig.cpp:2468 src/libslic3r/PrintConfig.cpp:2498 -#: src/libslic3r/PrintConfig.cpp:2508 src/libslic3r/PrintConfig.cpp:2518 -#: src/libslic3r/PrintConfig.cpp:2678 src/libslic3r/PrintConfig.cpp:2712 -#: src/libslic3r/PrintConfig.cpp:2851 src/libslic3r/PrintConfig.cpp:2860 -#: src/libslic3r/PrintConfig.cpp:2869 src/libslic3r/PrintConfig.cpp:2879 -#: src/libslic3r/PrintConfig.cpp:2944 src/libslic3r/PrintConfig.cpp:2954 -#: src/libslic3r/PrintConfig.cpp:2966 src/libslic3r/PrintConfig.cpp:2986 -#: src/libslic3r/PrintConfig.cpp:2996 src/libslic3r/PrintConfig.cpp:3006 -#: src/libslic3r/PrintConfig.cpp:3024 src/libslic3r/PrintConfig.cpp:3039 -#: src/libslic3r/PrintConfig.cpp:3053 src/libslic3r/PrintConfig.cpp:3064 -#: src/libslic3r/PrintConfig.cpp:3077 src/libslic3r/PrintConfig.cpp:3122 -#: src/libslic3r/PrintConfig.cpp:3132 src/libslic3r/PrintConfig.cpp:3141 -#: src/libslic3r/PrintConfig.cpp:3151 src/libslic3r/PrintConfig.cpp:3167 -#: src/libslic3r/PrintConfig.cpp:3191 -======= #: src/slic3r/GUI/BedShapeDialog.cpp:64 src/slic3r/GUI/ConfigWizard.cpp:262 #: src/slic3r/GUI/ConfigWizard.cpp:1476 src/slic3r/GUI/ConfigWizard.cpp:1490 #: src/slic3r/GUI/ExtruderSequenceDialog.cpp:100 @@ -483,21 +293,15 @@ msgstr "" #: src/libslic3r/PrintConfig.cpp:3708 src/libslic3r/PrintConfig.cpp:3717 #: src/libslic3r/PrintConfig.cpp:3727 src/libslic3r/PrintConfig.cpp:3743 #: src/libslic3r/PrintConfig.cpp:3767 ->>>>>>> master msgid "mm" msgstr "мм" #: src/slic3r/GUI/BedShapeDialog.cpp:66 msgid "" -<<<<<<< HEAD -"Diameter of the print bed. It is assumed that origin (0,0) is located in the center." -msgstr "Диаметр Ñтола. ПредполагаетÑÑ, что начало координат (0,0) находитÑÑ Ð² центре." -======= "Diameter of the print bed. It is assumed that origin (0,0) is located in the " "center." msgstr "" "Диаметр Ñтола. ПредполагаетÑÑ, что начало координат (0,0) находитÑÑ Ð² центре." ->>>>>>> master #: src/slic3r/GUI/BedShapeDialog.cpp:79 msgid "Rectangular" @@ -507,19 +311,6 @@ msgstr "ПрÑмоугольнаÑ" msgid "Circular" msgstr "КруглаÑ" -<<<<<<< HEAD -#: src/slic3r/GUI/BedShapeDialog.cpp:143 src/slic3r/GUI/GUI_Preview.cpp:243 -#: src/libslic3r/ExtrusionEntity.cpp:323 src/libslic3r/ExtrusionEntity.cpp:358 -msgid "Custom" -msgstr "ПользовательÑкаÑ" - -#: src/slic3r/GUI/BedShapeDialog.cpp:145 -msgid "Invalid" -msgstr "ÐедопуÑтимо" - -#: src/slic3r/GUI/BedShapeDialog.cpp:156 src/slic3r/GUI/BedShapeDialog.cpp:222 -#: src/slic3r/GUI/GUI_ObjectList.cpp:2288 -======= #: src/slic3r/GUI/BedShapeDialog.cpp:81 src/slic3r/GUI/GUI_Preview.cpp:252 #: src/libslic3r/ExtrusionEntity.cpp:331 src/libslic3r/ExtrusionEntity.cpp:366 msgid "Custom" @@ -527,7 +318,6 @@ msgstr "ПользовательÑкаÑ" #: src/slic3r/GUI/BedShapeDialog.cpp:104 src/slic3r/GUI/BedShapeDialog.cpp:179 #: src/slic3r/GUI/GUI_ObjectList.cpp:1701 ->>>>>>> master msgid "Shape" msgstr "Форма" @@ -535,12 +325,8 @@ msgstr "Форма" msgid "Load shape from STL..." msgstr "Загрузка формы Ñтола из STL файла..." -<<<<<<< HEAD -#: src/slic3r/GUI/BedShapeDialog.cpp:292 src/slic3r/GUI/MainFrame.cpp:1826 -======= #: src/slic3r/GUI/BedShapeDialog.cpp:249 src/slic3r/GUI/GCodeViewer.cpp:3710 #: src/slic3r/GUI/MainFrame.cpp:2140 ->>>>>>> master msgid "Settings" msgstr "ÐаÑтройки" @@ -552,13 +338,8 @@ msgstr "ТекÑтура" msgid "Load..." msgstr "Загрузить..." -<<<<<<< HEAD -#: src/slic3r/GUI/BedShapeDialog.cpp:333 src/slic3r/GUI/BedShapeDialog.cpp:413 -#: src/slic3r/GUI/Tab.cpp:3484 -======= #: src/slic3r/GUI/BedShapeDialog.cpp:292 src/slic3r/GUI/BedShapeDialog.cpp:362 #: src/slic3r/GUI/Tab.cpp:3734 ->>>>>>> master msgid "Remove" msgstr "Удалить" @@ -587,14 +368,9 @@ msgstr "Ошибка! ÐедопуÑÑ‚Ð¸Ð¼Ð°Ñ Ð¼Ð¾Ð´ÐµÐ»ÑŒ" msgid "The selected file contains no geometry." msgstr "Выбранный файл не Ñодержит геометрии." -<<<<<<< HEAD -#: src/slic3r/GUI/BedShapeDialog.cpp:593 -msgid "The selected file contains several disjoint areas. This is not supported." -======= #: src/slic3r/GUI/BedShapeDialog.cpp:537 msgid "" "The selected file contains several disjoint areas. This is not supported." ->>>>>>> master msgstr "" "Выбранный файл Ñодержит неÑколько не переÑекающихÑÑ Ð¾Ð±Ð»Ð°Ñтей. Такие файлы не " "поддерживаютÑÑ." @@ -607,11 +383,7 @@ msgstr "Выберите файл Ð´Ð»Ñ Ð¸Ð¼Ð¿Ð¾Ñ€Ñ‚Ð° текÑтуры ÑтоРmsgid "Choose an STL file to import bed model from:" msgstr "Выберите STL файл Ð´Ð»Ñ Ð¸Ð¼Ð¿Ð¾Ñ€Ñ‚Ð° формы Ñтола из:" -<<<<<<< HEAD -#: src/slic3r/GUI/BedShapeDialog.hpp:98 src/slic3r/GUI/ConfigWizard.cpp:1327 -======= #: src/slic3r/GUI/BedShapeDialog.hpp:95 src/slic3r/GUI/ConfigWizard.cpp:1396 ->>>>>>> master msgid "Bed Shape" msgstr "Форма и размеры Ñтола" @@ -653,19 +425,17 @@ msgstr "Значение Ñовпадает Ñ ÑиÑтемным значени #: src/slic3r/GUI/ButtonsDescription.cpp:58 msgid "" -"Value was changed and is not equal to the system value or the last saved preset" +"Value was changed and is not equal to the system value or the last saved " +"preset" msgstr "" -"Значение изменено и не равно ÑиÑтемному значению или поÑледнему Ñохранённому профилю" +"Значение изменено и не равно ÑиÑтемному значению или поÑледнему Ñохранённому " +"профилю" -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigManipulation.cpp:48 -======= #: src/slic3r/GUI/ButtonsDescription.cpp:62 msgid "Buttons And Text Colors Description" msgstr "ОпиÑание кнопок и цвет текÑта" #: src/slic3r/GUI/ConfigManipulation.cpp:49 ->>>>>>> master msgid "" "Layer height is not valid.\n" "\n" @@ -673,16 +443,6 @@ msgid "" msgstr "" "ÐÑƒÐ»ÐµÐ²Ð°Ñ Ð²Ñ‹Ñота ÑÐ»Ð¾Ñ Ð½ÐµÐ´Ð¾Ð¿ÑƒÑтима.\n" "\n" -<<<<<<< HEAD -"Ð’Ñ‹Ñота ÑÐ»Ð¾Ñ Ð±ÑƒÐ´ÐµÑ‚ Ñброшена на 0.01." - -#: src/slic3r/GUI/ConfigManipulation.cpp:49 src/slic3r/GUI/GUI_ObjectLayers.cpp:29 -#: src/slic3r/GUI/Tab.cpp:1387 src/libslic3r/PrintConfig.cpp:73 -msgid "Layer height" -msgstr "Ð’Ñ‹Ñота ÑлоÑ" - -#: src/slic3r/GUI/ConfigManipulation.cpp:60 -======= "Ð’Ñ‹Ñота первого ÑÐ»Ð¾Ñ Ð±ÑƒÐ´ÐµÑ‚ Ñброшена на 0.01." #: src/slic3r/GUI/ConfigManipulation.cpp:50 @@ -692,7 +452,6 @@ msgid "Layer height" msgstr "Ð’Ñ‹Ñота ÑлоÑ" #: src/slic3r/GUI/ConfigManipulation.cpp:61 ->>>>>>> master msgid "" "First layer height is not valid.\n" "\n" @@ -702,19 +461,11 @@ msgstr "" "\n" "Ð’Ñ‹Ñота первого ÑÐ»Ð¾Ñ Ð±ÑƒÐ´ÐµÑ‚ Ñброшена на 0.01." -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigManipulation.cpp:61 src/libslic3r/PrintConfig.cpp:969 -msgid "First layer height" -msgstr "Ð’Ñ‹Ñота первого ÑлоÑ" - -#: src/slic3r/GUI/ConfigManipulation.cpp:81 -======= #: src/slic3r/GUI/ConfigManipulation.cpp:62 src/libslic3r/PrintConfig.cpp:1208 msgid "First layer height" msgstr "Ð’Ñ‹Ñота первого ÑлоÑ" #: src/slic3r/GUI/ConfigManipulation.cpp:82 ->>>>>>> master msgid "" "The Spiral Vase mode requires:\n" "- one perimeter\n" @@ -724,30 +475,12 @@ msgid "" "- Ensure vertical shell thickness enabled\n" "- Detect thin walls disabled" msgstr "" -<<<<<<< HEAD -"Ð¢Ñ€ÐµÐ±Ð¾Ð²Ð°Ð½Ð¸Ñ Ð´Ð»Ñ Ñ€ÐµÐ¶Ð¸Ð¼Ð° \"Ð¡Ð¿Ð¸Ñ€Ð°Ð»ÑŒÐ½Ð°Ñ Ð²Ð°Ð·Ð°\" - Ñ‚.е. печати внешнего контура по " -======= "Ð¢Ñ€ÐµÐ±Ð¾Ð²Ð°Ð½Ð¸Ñ Ð´Ð»Ñ Ñ€ÐµÐ¶Ð¸Ð¼Ð° Â«Ð¡Ð¿Ð¸Ñ€Ð°Ð»ÑŒÐ½Ð°Ñ Ð²Ð°Ð·Ð°Â» - Ñ‚.е. печати внешнего контура по " ->>>>>>> master "Ñпирали:\n" "- одноÑтеночный периметр\n" "- отÑутÑтвие верхних Ñплошных Ñлоёв\n" "- плотноÑÑ‚ÑŒ Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ 0%\n" "- отÑутÑтвие поддержки\n" -<<<<<<< HEAD -"- включено \"ОбеÑпечивать вертикальную толщину оболочки\"\n" -"- отключено \"Обнаружение тонких Ñтенок\"" - -#: src/slic3r/GUI/ConfigManipulation.cpp:89 -msgid "Shall I adjust those settings in order to enable Spiral Vase?" -msgstr "Изменить Ñти наÑтройки, чтобы включить режим \"Ð¡Ð¿Ð¸Ñ€Ð°Ð»ÑŒÐ½Ð°Ñ Ð²Ð°Ð·Ð°\"?" - -#: src/slic3r/GUI/ConfigManipulation.cpp:90 -msgid "Spiral Vase" -msgstr "Ð¡Ð¿Ð¸Ñ€Ð°Ð»ÑŒÐ½Ð°Ñ Ð²Ð°Ð·Ð°" - -#: src/slic3r/GUI/ConfigManipulation.cpp:115 -======= "- включено «ОбеÑпечивать вертикальную толщину оболочки»\n" "- отключено «Обнаружение тонких Ñтенок»" @@ -760,30 +493,15 @@ msgid "Spiral Vase" msgstr "Ð¡Ð¿Ð¸Ñ€Ð°Ð»ÑŒÐ½Ð°Ñ Ð²Ð°Ð·Ð°" #: src/slic3r/GUI/ConfigManipulation.cpp:121 ->>>>>>> master msgid "" "The Wipe Tower currently supports the non-soluble supports only\n" -"if they are printed with the current extruder without triggering a tool change.\n" -"(both support_material_extruder and support_material_interface_extruder need to be " -"set to 0)." +"if they are printed with the current extruder without triggering a tool " +"change.\n" +"(both support_material_extruder and support_material_interface_extruder need " +"to be set to 0)." msgstr "" "Ð’ наÑтоÑщее Ð²Ñ€ÐµÐ¼Ñ Ñ€ÐµÐ¶Ð¸Ð¼ черновой башни поддерживает нераÑтворимую поддержку\n" "только в том Ñлучае, еÑли она печатаетÑÑ Ñ‚ÐµÐºÑƒÑ‰Ð¸Ð¼ ÑкÑтрудером, без запуÑка\n" -<<<<<<< HEAD -"Ñмены инÑтрумента. (Ð—Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ \"ÐкÑтрудер, печатающий поддержки/подложки/юбки\"\n" -"и \"ÐкÑтрудер, печатающий ÑвÑзующий Ñлой поддержки/подложки\" должны быть\n" -"уÑтановлены в 0)." - -#: src/slic3r/GUI/ConfigManipulation.cpp:119 -msgid "Shall I adjust those settings in order to enable the Wipe Tower?" -msgstr "Изменить Ñти наÑтройки, чтобы включить черновую башню?" - -#: src/slic3r/GUI/ConfigManipulation.cpp:120 src/slic3r/GUI/ConfigManipulation.cpp:140 -msgid "Wipe Tower" -msgstr "Ð§ÐµÑ€Ð½Ð¾Ð²Ð°Ñ Ð±Ð°ÑˆÐ½Ñ" - -#: src/slic3r/GUI/ConfigManipulation.cpp:136 -======= "Ñмены инÑтрумента. (Ð—Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Â«ÐкÑтрудер, печатающий поддержки/подложки/" "юбки»\n" "и «ÐкÑтрудер, печатающий ÑвÑзующий Ñлой поддержки/подложки» должны быть\n" @@ -799,7 +517,6 @@ msgid "Wipe Tower" msgstr "Черновой башни" #: src/slic3r/GUI/ConfigManipulation.cpp:142 ->>>>>>> master msgid "" "For the Wipe Tower to work with the soluble supports, the support layers\n" "need to be synchronized with the object layers." @@ -807,19 +524,11 @@ msgstr "" "Ð”Ð»Ñ Ñ‚Ð¾Ð³Ð¾, чтобы режим черновой башни работал Ñ Ñ€Ð°Ñтворимой поддержкой, \n" "Ñлои поддержки должны быть Ñинхронизированы Ñо ÑлоÑми модели." -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigManipulation.cpp:139 -msgid "Shall I synchronize support layers in order to enable the Wipe Tower?" -msgstr "Синхронизировать Ñлои поддержки, чтобы включить черновую башню?" - -#: src/slic3r/GUI/ConfigManipulation.cpp:159 -======= #: src/slic3r/GUI/ConfigManipulation.cpp:145 msgid "Shall I synchronize support layers in order to enable the Wipe Tower?" msgstr "Синхронизировать Ñлои поддержки, чтобы включить черновую башню?" #: src/slic3r/GUI/ConfigManipulation.cpp:164 ->>>>>>> master msgid "" "Supports work better, if the following feature is enabled:\n" "- Detect bridging perimeters" @@ -827,50 +536,6 @@ msgstr "" "Поддержки работают лучше, еÑли включена ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ñ„ÑƒÐ½ÐºÑ†Ð¸Ñ:\n" "- ОпределÑÑ‚ÑŒ навиÑающие периметры" -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigManipulation.cpp:162 -msgid "Shall I adjust those settings for supports?" -msgstr "Включить данный параметр Ð´Ð»Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ¸?" - -#: src/slic3r/GUI/ConfigManipulation.cpp:163 -msgid "Support Generator" -msgstr "Генератор поддержки" - -#: src/slic3r/GUI/ConfigManipulation.cpp:198 -msgid "The %1% infill pattern is not supposed to work at 100%% density." -msgstr "Шаблон Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ %1% не поддерживает 100%% заполнение." - -#: src/slic3r/GUI/ConfigManipulation.cpp:201 -msgid "Shall I switch to rectilinear fill pattern?" -msgstr "Заменить его на прÑмолинейный (Rectilinear)?" - -#: src/slic3r/GUI/ConfigManipulation.cpp:202 src/slic3r/GUI/GUI_ObjectList.cpp:35 -#: src/slic3r/GUI/GUI_ObjectList.cpp:93 src/slic3r/GUI/GUI_ObjectList.cpp:668 -#: src/slic3r/GUI/Plater.cpp:389 src/slic3r/GUI/Tab.cpp:1432 -#: src/slic3r/GUI/Tab.cpp:1434 src/libslic3r/PrintConfig.cpp:259 -#: src/libslic3r/PrintConfig.cpp:472 src/libslic3r/PrintConfig.cpp:496 -#: src/libslic3r/PrintConfig.cpp:848 src/libslic3r/PrintConfig.cpp:862 -#: src/libslic3r/PrintConfig.cpp:899 src/libslic3r/PrintConfig.cpp:1076 -#: src/libslic3r/PrintConfig.cpp:1086 src/libslic3r/PrintConfig.cpp:1153 -#: src/libslic3r/PrintConfig.cpp:1172 src/libslic3r/PrintConfig.cpp:1191 -#: src/libslic3r/PrintConfig.cpp:1928 src/libslic3r/PrintConfig.cpp:1945 -msgid "Infill" -msgstr "Заполнение" - -#: src/slic3r/GUI/ConfigManipulation.cpp:320 -msgid "Head penetration should not be greater than the head width." -msgstr "Глубина Ð¿Ñ€Ð¾Ð½Ð¸ÐºÐ½Ð¾Ð²ÐµÐ½Ð¸Ñ Ð½Ð¾Ñика поддержки не должна превышать его длину." - -#: src/slic3r/GUI/ConfigManipulation.cpp:322 -msgid "Invalid Head penetration" -msgstr "ÐедопуÑÑ‚Ð¸Ð¼Ð°Ñ Ð³Ð»ÑƒÐ±Ð¸Ð½Ð° Ð¿Ñ€Ð¾Ð½Ð¸ÐºÐ½Ð¾Ð²ÐµÐ½Ð¸Ñ Ð½Ð¾Ñика поддержки" - -#: src/slic3r/GUI/ConfigManipulation.cpp:333 -msgid "Pinhead diameter should be smaller than the pillar diameter." -msgstr "Диаметр ноÑика поддержки должен быть меньше диаметра тела поддержки." - -#: src/slic3r/GUI/ConfigManipulation.cpp:335 -======= #: src/slic3r/GUI/ConfigManipulation.cpp:167 msgid "Shall I adjust those settings for supports?" msgstr "Включить данный параметр Ð´Ð»Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ¸?" @@ -914,7 +579,6 @@ msgid "Pinhead diameter should be smaller than the pillar diameter." msgstr "Диаметр ноÑика поддержки должен быть меньше диаметра тела поддержки." #: src/slic3r/GUI/ConfigManipulation.cpp:342 ->>>>>>> master msgid "Invalid pinhead diameter" msgstr "ÐедопуÑтимый диаметр ноÑика поддержки" @@ -930,21 +594,12 @@ msgstr "Понизить верÑию" msgid "Before roll back" msgstr "Перед откатом к прежнему" -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:25 src/libslic3r/PrintConfig.cpp:143 -msgid "User" -msgstr "Пользователь" - -#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:28 src/slic3r/GUI/GUI_Preview.cpp:229 -#: src/libslic3r/ExtrusionEntity.cpp:309 -======= #: src/slic3r/GUI/ConfigSnapshotDialog.cpp:25 src/libslic3r/PrintConfig.cpp:317 msgid "User" msgstr "Пользователь" #: src/slic3r/GUI/ConfigSnapshotDialog.cpp:28 #: src/slic3r/GUI/GUI_Preview.cpp:238 src/libslic3r/ExtrusionEntity.cpp:317 ->>>>>>> master msgid "Unknown" msgstr "ÐеизвеÑтно" @@ -956,11 +611,7 @@ msgstr "Ðктивный" msgid "PrusaSlicer version" msgstr "ВерÑÐ¸Ñ PrusaSlicer" -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:55 src/libslic3r/Preset.cpp:1298 -======= #: src/slic3r/GUI/ConfigSnapshotDialog.cpp:64 src/libslic3r/Preset.cpp:1338 ->>>>>>> master msgid "print" msgstr "печать" @@ -968,22 +619,6 @@ msgstr "печать" msgid "filaments" msgstr "пруток" -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:59 src/libslic3r/Preset.cpp:1300 -msgid "SLA print" -msgstr "Профиль SLA печати" - -#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:60 src/slic3r/GUI/Plater.cpp:696 -#: src/libslic3r/Preset.cpp:1301 -msgid "SLA material" -msgstr "Профиль SLA материала" - -#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:62 src/libslic3r/Preset.cpp:1302 -msgid "printer" -msgstr "принтер" - -#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:66 src/slic3r/GUI/Tab.cpp:1304 -======= #: src/slic3r/GUI/ConfigSnapshotDialog.cpp:68 src/libslic3r/Preset.cpp:1340 msgid "SLA print" msgstr "Профиль SLA печати" @@ -999,7 +634,6 @@ msgid "printer" msgstr "принтер" #: src/slic3r/GUI/ConfigSnapshotDialog.cpp:75 src/slic3r/GUI/Tab.cpp:1370 ->>>>>>> master msgid "vendor" msgstr "производитель" @@ -1036,51 +670,6 @@ msgstr "Ðктивировать" msgid "Configuration Snapshots" msgstr "Резервные копии конфигурации (Ñнапшот)" -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigWizard.cpp:242 -msgid "nozzle" -msgstr "Ñопло" - -#: src/slic3r/GUI/ConfigWizard.cpp:246 -msgid "Alternate nozzles:" -msgstr "Ðльтернативные Ñопла:" - -#: src/slic3r/GUI/ConfigWizard.cpp:310 -msgid "All standard" -msgstr "Ð’Ñе Ñтандартные" - -#: src/slic3r/GUI/ConfigWizard.cpp:310 -msgid "Standard" -msgstr "Стандартные" - -#: src/slic3r/GUI/ConfigWizard.cpp:311 src/slic3r/GUI/ConfigWizard.cpp:605 -#: src/slic3r/GUI/Tab.cpp:3565 src/slic3r/GUI/UnsavedChangesDialog.cpp:933 -msgid "All" -msgstr "Ð’Ñе" - -#: src/slic3r/GUI/ConfigWizard.cpp:312 src/slic3r/GUI/ConfigWizard.cpp:606 -#: src/slic3r/GUI/DoubleSlider.cpp:1859 src/slic3r/GUI/Plater.cpp:361 -#: src/slic3r/GUI/Plater.cpp:504 -msgid "None" -msgstr "Ðет" - -#: src/slic3r/GUI/ConfigWizard.cpp:452 -#, c-format -msgid "Welcome to the %s Configuration Assistant" -msgstr "ПриветÑтвуем Ð²Ð°Ñ Ð² маÑтере наÑтройки %s" - -#: src/slic3r/GUI/ConfigWizard.cpp:454 -#, c-format -msgid "Welcome to the %s Configuration Wizard" -msgstr "ПриветÑтвуем Ð²Ð°Ñ Ð² маÑтере наÑтройки %s" - -#: src/slic3r/GUI/ConfigWizard.cpp:456 -msgid "Welcome" -msgstr "Ðачало" - -#: src/slic3r/GUI/ConfigWizard.cpp:458 -#, c-format -======= #: src/slic3r/GUI/ConfigWizard.cpp:262 msgid "nozzle" msgstr "Ñопло" @@ -1126,43 +715,10 @@ msgstr "Ðачало" #: src/slic3r/GUI/ConfigWizard.cpp:490 #, c-format, boost-format ->>>>>>> master msgid "" -"Hello, welcome to %s! This %s helps you with the initial configuration; just a few " -"settings and you will be ready to print." +"Hello, welcome to %s! This %s helps you with the initial configuration; just " +"a few settings and you will be ready to print." msgstr "" -<<<<<<< HEAD -"ПриветÑтвуем Ð²Ð°Ñ Ð² %s! Ðтот маÑтер наÑтройки %s поможет вам Ñ Ð½Ð°Ñ‡Ð°Ð»ÑŒÐ½Ð¾Ð¹ наÑтройкой " -"программы." - -#: src/slic3r/GUI/ConfigWizard.cpp:463 -msgid "Remove user profiles (a snapshot will be taken beforehand)" -msgstr "Удалить профили Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ (Ñнапшот будет Ñделан заранее)" - -#: src/slic3r/GUI/ConfigWizard.cpp:506 -#, c-format -msgid "%s Family" -msgstr "СемейÑтво принтеров %s" - -#: src/slic3r/GUI/ConfigWizard.cpp:594 -msgid "Printer:" -msgstr "Принтер:" - -#: src/slic3r/GUI/ConfigWizard.cpp:596 -msgid "Vendor:" -msgstr "Производитель:" - -#: src/slic3r/GUI/ConfigWizard.cpp:597 -msgid "Profile:" -msgstr "Профиль:" - -#: src/slic3r/GUI/ConfigWizard.cpp:669 src/slic3r/GUI/ConfigWizard.cpp:819 -#: src/slic3r/GUI/ConfigWizard.cpp:880 src/slic3r/GUI/ConfigWizard.cpp:1017 -msgid "(All)" -msgstr "(Ð’Ñе)" - -#: src/slic3r/GUI/ConfigWizard.cpp:698 -======= "ПриветÑтвуем Ð²Ð°Ñ Ð² %s! Ðтот %s поможет вам Ñ Ð½Ð°Ñ‡Ð°Ð»ÑŒÐ½Ð¾Ð¹ наÑтройкой программы." #: src/slic3r/GUI/ConfigWizard.cpp:495 @@ -1201,56 +757,10 @@ msgstr "(Ð’Ñе)" #: src/slic3r/GUI/ConfigWizard.cpp:752 #, boost-format ->>>>>>> master msgid "" "%1% marked with <b>*</b> are <b>not</b> compatible with some installed " "printers." msgstr "" -<<<<<<< HEAD -"Прутки помеченные знаком <b>*</b>, <b>не</b> неÑовмеÑтимы Ñ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¼Ð¸ " -"уÑтановленными принтерами." - -#: src/slic3r/GUI/ConfigWizard.cpp:701 -msgid "All installed printers are compatible with the selected filament." -msgstr "Ð’Ñе уÑтановленные принтеры ÑовмеÑтимы Ñ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ñ‹Ð¼ прутком." - -#: src/slic3r/GUI/ConfigWizard.cpp:721 -msgid "" -"Only the following installed printers are compatible with the selected filament:" -msgstr "" -"Только Ñледующие уÑтановленные принтеры ÑовмеÑтимы Ñ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ñ‹Ð¼ прутком:" - -#: src/slic3r/GUI/ConfigWizard.cpp:1107 -msgid "Custom Printer Setup" -msgstr "ÐаÑтройка пользовательÑкого принтера" - -#: src/slic3r/GUI/ConfigWizard.cpp:1107 -msgid "Custom Printer" -msgstr "ПользовательÑкий принтер" - -#: src/slic3r/GUI/ConfigWizard.cpp:1109 -msgid "Define a custom printer profile" -msgstr "Задать Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒÑкого профилÑ" - -#: src/slic3r/GUI/ConfigWizard.cpp:1111 -msgid "Custom profile name:" -msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒÑкого профилÑ:" - -#: src/slic3r/GUI/ConfigWizard.cpp:1136 -msgid "Automatic updates" -msgstr "ÐвтоматичеÑкое обновление" - -#: src/slic3r/GUI/ConfigWizard.cpp:1136 -msgid "Updates" -msgstr "ОбновлениÑ" - -#: src/slic3r/GUI/ConfigWizard.cpp:1144 src/slic3r/GUI/Preferences.cpp:94 -msgid "Check for application updates" -msgstr "Проверка обновлений" - -#: src/slic3r/GUI/ConfigWizard.cpp:1148 -#, c-format -======= "%1% помеченные знаком <b>*</b>, <b>не</b> неÑовмеÑтимы Ñ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¼Ð¸ " "уÑтановленными принтерами." @@ -1318,25 +828,12 @@ msgstr "Проверка обновлений" #: src/slic3r/GUI/ConfigWizard.cpp:1218 #, c-format, boost-format ->>>>>>> master msgid "" -"If enabled, %s checks for new application versions online. When a new version " -"becomes available, a notification is displayed at the next application startup " -"(never during program usage). This is only a notification mechanisms, no automatic " -"installation is done." +"If enabled, %s checks for new application versions online. When a new " +"version becomes available, a notification is displayed at the next " +"application startup (never during program usage). This is only a " +"notification mechanisms, no automatic installation is done." msgstr "" -<<<<<<< HEAD -"ЕÑли включено, %s проверÑет наличие новых верÑий программы в Ñети. ЕÑли доÑтупна " -"Ð½Ð¾Ð²Ð°Ñ Ð²ÐµÑ€ÑиÑ, при Ñледующем запуÑке отображаетÑÑ ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ðµ (не во Ð²Ñ€ÐµÐ¼Ñ Ñ€Ð°Ð±Ð¾Ñ‚Ñ‹ " -"программы). ÐвтоматичеÑÐºÐ°Ñ ÑƒÑтановка не производитÑÑ. Ð’Ñ‹ увидите только уведомление." - -#: src/slic3r/GUI/ConfigWizard.cpp:1154 src/slic3r/GUI/Preferences.cpp:129 -msgid "Update built-in Presets automatically" -msgstr "ОбновлÑÑ‚ÑŒ вÑтроенные профили автоматичеÑки" - -#: src/slic3r/GUI/ConfigWizard.cpp:1158 -#, c-format -======= "ЕÑли включено, %s проверÑет наличие новых верÑий программы в Ñети. ЕÑли " "доÑтупна Ð½Ð¾Ð²Ð°Ñ Ð²ÐµÑ€ÑиÑ, при Ñледующем запуÑке отображаетÑÑ ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ðµ (не во " "Ð²Ñ€ÐµÐ¼Ñ Ñ€Ð°Ð±Ð¾Ñ‚Ñ‹ программы). ÐвтоматичеÑÐºÐ°Ñ ÑƒÑтановка не производитÑÑ. Ð’Ñ‹ " @@ -1348,25 +845,18 @@ msgstr "ОбновлÑÑ‚ÑŒ вÑтроенные профили Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ #: src/slic3r/GUI/ConfigWizard.cpp:1228 #, c-format, boost-format ->>>>>>> master msgid "" -"If enabled, %s downloads updates of built-in system presets in the background.These " -"updates are downloaded into a separate temporary location.When a new preset version " -"becomes available it is offered at application startup." +"If enabled, %s downloads updates of built-in system presets in the " +"background.These updates are downloaded into a separate temporary location." +"When a new preset version becomes available it is offered at application " +"startup." msgstr "" "ЕÑли включено, %s будет загружать Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð²Ñтроенных ÑиÑтемных профилей в " -<<<<<<< HEAD -"фоновом режиме. Ðти Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð·Ð°Ð³Ñ€ÑƒÐ¶Ð°ÑŽÑ‚ÑÑ Ð² отдельную временную папку. Когда новые " -"профили ÑтановÑÑ‚ÑÑ Ð´Ð¾Ñтупны, они предлагаютÑÑ Ð¿Ñ€Ð¸ запуÑке приложениÑ." - -#: src/slic3r/GUI/ConfigWizard.cpp:1161 -======= "фоновом режиме. Ðти Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð·Ð°Ð³Ñ€ÑƒÐ¶Ð°ÑŽÑ‚ÑÑ Ð² отдельную временную папку. " "Когда новые профили ÑтановÑÑ‚ÑÑ Ð´Ð¾Ñтупны, они предлагаютÑÑ Ð¿Ñ€Ð¸ запуÑке " "приложениÑ." #: src/slic3r/GUI/ConfigWizard.cpp:1231 ->>>>>>> master msgid "" "Updates are never applied without user's consent and never overwrite user's " "customized settings." @@ -1374,30 +864,11 @@ msgstr "" "ÐžÐ±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð½Ð¸ÐºÐ¾Ð³Ð´Ð° не применÑÑŽÑ‚ÑÑ Ð±ÐµÐ· ÑоглаÑÐ¸Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸ никогда не " "перезапиÑывают пользовательÑкие наÑтройки." -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigWizard.cpp:1166 -======= #: src/slic3r/GUI/ConfigWizard.cpp:1236 ->>>>>>> master msgid "" -"Additionally a backup snapshot of the whole configuration is created before an " -"update is applied." +"Additionally a backup snapshot of the whole configuration is created before " +"an update is applied." msgstr "" -<<<<<<< HEAD -"Кроме того, перед обновлением ÑоздаётÑÑ Ñ€ÐµÐ·ÐµÑ€Ð²Ð½Ð°Ñ ÐºÐ¾Ð¿Ð¸Ñ Ð²Ñей конфигурации (Ñнапшот)." - -#: src/slic3r/GUI/ConfigWizard.cpp:1173 src/slic3r/GUI/GUI_ObjectList.cpp:1825 -#: src/slic3r/GUI/GUI_ObjectList.cpp:4567 src/slic3r/GUI/Plater.cpp:3116 -#: src/slic3r/GUI/Plater.cpp:4001 src/slic3r/GUI/Plater.cpp:4032 -msgid "Reload from disk" -msgstr "Перезагрузить Ñ Ð´Ð¸Ñка" - -#: src/slic3r/GUI/ConfigWizard.cpp:1176 -msgid "Export full pathnames of models and parts sources into 3mf and amf files" -msgstr "При ÑкÑпорте в 3mf и amf, ÑохранÑÑ‚ÑŒ полные пути к иÑходным файлам" - -#: src/slic3r/GUI/ConfigWizard.cpp:1180 -======= "Кроме того, перед обновлением ÑоздаётÑÑ Ñ€ÐµÐ·ÐµÑ€Ð²Ð½Ð°Ñ ÐºÐ¾Ð¿Ð¸Ñ Ð²Ñей конфигурации " "(Ñнапшот)." @@ -1412,120 +883,12 @@ msgid "" msgstr "При ÑкÑпорте в 3mf и amf, ÑохранÑÑ‚ÑŒ полные пути к иÑходным файлам" #: src/slic3r/GUI/ConfigWizard.cpp:1250 ->>>>>>> master msgid "" -"If enabled, allows the Reload from disk command to automatically find and load the " -"files when invoked.\n" -"If not enabled, the Reload from disk command will ask to select each file using an " -"open file dialog." +"If enabled, allows the Reload from disk command to automatically find and " +"load the files when invoked.\n" +"If not enabled, the Reload from disk command will ask to select each file " +"using an open file dialog." msgstr "" -<<<<<<< HEAD -"ЕÑли включено, при выполнении команды \"Перезагрузить Ñ Ð´Ð¸Ñка\" программа будут " -"автоматичеÑки находить и загружать файлы проекта. \n" -"Ð’ противном Ñлучае, будет предложено выбрать каждый файл Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ диалогового окна " -"Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð°." - -#: src/slic3r/GUI/ConfigWizard.cpp:1190 -msgid "Files association" -msgstr "ÐÑÑÐ¾Ñ†Ð¸Ð°Ñ†Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð²" - -#: src/slic3r/GUI/ConfigWizard.cpp:1192 src/slic3r/GUI/Preferences.cpp:112 -msgid "Associate .3mf files to PrusaSlicer" -msgstr "ÐÑÑоциировать файлы .3mf Ñ PrusaSlicer" - -#: src/slic3r/GUI/ConfigWizard.cpp:1193 src/slic3r/GUI/Preferences.cpp:119 -msgid "Associate .stl files to PrusaSlicer" -msgstr "ÐÑÑоциировать файлы .stl Ñ PrusaSlicer" - -#: src/slic3r/GUI/ConfigWizard.cpp:1204 -msgid "View mode" -msgstr "Режим проÑмотра" - -#: src/slic3r/GUI/ConfigWizard.cpp:1206 -msgid "" -"PrusaSlicer's user interfaces comes in three variants:\n" -"Simple, Advanced, and Expert.\n" -"The Simple mode shows only the most frequently used settings relevant for regular " -"3D printing. The other two offer progressively more sophisticated fine-tuning, they " -"are suitable for advanced and expert users, respectively." -msgstr "" -"ПользовательÑкий Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ PrusaSlicer предÑтавлен Ñ‚Ñ€ÐµÐ¼Ñ Ð²Ð°Ñ€Ð¸Ð°Ð½Ñ‚Ð°Ð¼Ð¸:\n" -"ПроÑтой, РаÑширенный, Продвинутый.\n" -"Ð’ проÑтом режиме отображаютÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ наиболее чаÑто иÑпользуемые параметры 3D-" -"печати. Два других предлагают более тонкую раÑширенную наÑтройку. Они подходÑÑ‚ Ð´Ð»Ñ " -"продвинутых и опытных пользователей." - -#: src/slic3r/GUI/ConfigWizard.cpp:1211 -msgid "Simple mode" -msgstr "ПроÑтой" - -#: src/slic3r/GUI/ConfigWizard.cpp:1212 -msgid "Advanced mode" -msgstr "РаÑширенный" - -#: src/slic3r/GUI/ConfigWizard.cpp:1213 -msgid "Expert mode" -msgstr "Продвинутый" - -#: src/slic3r/GUI/ConfigWizard.cpp:1219 -msgid "The size of the object can be specified in inches" -msgstr "Размер модели может быть указан в дюймах" - -#: src/slic3r/GUI/ConfigWizard.cpp:1220 -msgid "Use inches" -msgstr "ИÑпользовать дюймы" - -#: src/slic3r/GUI/ConfigWizard.cpp:1254 -msgid "Other Vendors" -msgstr "Другие производители" - -#: src/slic3r/GUI/ConfigWizard.cpp:1258 -#, c-format -msgid "Pick another vendor supported by %s" -msgstr "Выберите другого производителÑ, поддерживающего %s" - -#: src/slic3r/GUI/ConfigWizard.cpp:1289 -msgid "Firmware Type" -msgstr "Тип прошивки" - -#: src/slic3r/GUI/ConfigWizard.cpp:1289 src/slic3r/GUI/Tab.cpp:2172 -msgid "Firmware" -msgstr "Прошивка" - -#: src/slic3r/GUI/ConfigWizard.cpp:1293 -msgid "Choose the type of firmware used by your printer." -msgstr "Выберите тип прошивки вашего принтера." - -#: src/slic3r/GUI/ConfigWizard.cpp:1327 -msgid "Bed Shape and Size" -msgstr "Форма и размеры Ñтола" - -#: src/slic3r/GUI/ConfigWizard.cpp:1330 -msgid "Set the shape of your printer's bed." -msgstr "Задайте форму и размеры вашего Ñтола." - -#: src/slic3r/GUI/ConfigWizard.cpp:1350 -msgid "Filament and Nozzle Diameters" -msgstr "Диаметр прутка и Ñопла" - -#: src/slic3r/GUI/ConfigWizard.cpp:1350 -msgid "Print Diameters" -msgstr "Диаметры печати" - -#: src/slic3r/GUI/ConfigWizard.cpp:1364 -msgid "Enter the diameter of your printer's hot end nozzle." -msgstr "Введите диаметр Ñопла." - -#: src/slic3r/GUI/ConfigWizard.cpp:1367 -msgid "Nozzle Diameter:" -msgstr "Диаметр Ñопла:" - -#: src/slic3r/GUI/ConfigWizard.cpp:1377 -msgid "Enter the diameter of your filament." -msgstr "Введите диаметр прутка." - -#: src/slic3r/GUI/ConfigWizard.cpp:1378 -======= "ЕÑли включено, при выполнении команды «Перезагрузить Ñ Ð´Ð¸Ñка» программа " "будут автоматичеÑки находить и загружать файлы проекта. \n" "Ð’ противном Ñлучае, будет предложено выбрать каждый файл Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ " @@ -1637,47 +1000,13 @@ msgid "Enter the diameter of your filament." msgstr "Введите диаметр прутка." #: src/slic3r/GUI/ConfigWizard.cpp:1486 ->>>>>>> master msgid "" -"Good precision is required, so use a caliper and do multiple measurements along the " -"filament, then compute the average." +"Good precision is required, so use a caliper and do multiple measurements " +"along the filament, then compute the average." msgstr "" "Ðеобходима Ñ…Ð¾Ñ€Ð¾ÑˆÐ°Ñ Ñ‚Ð¾Ñ‡Ð½Ð¾ÑÑ‚ÑŒ, поÑтому иÑпользуйте штангенциркуль и выполните " "неÑколько измерений вдоль прутка, а затем вычиÑлите Ñреднее значение." -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigWizard.cpp:1381 -msgid "Filament Diameter:" -msgstr "Диаметр прутка:" - -#: src/slic3r/GUI/ConfigWizard.cpp:1415 -msgid "Nozzle and Bed Temperatures" -msgstr "Температуры Ñопла и Ñтола" - -#: src/slic3r/GUI/ConfigWizard.cpp:1415 -msgid "Temperatures" -msgstr "Температура" - -#: src/slic3r/GUI/ConfigWizard.cpp:1431 -msgid "Enter the temperature needed for extruding your filament." -msgstr "Введите температуру, требуемую Ð´Ð»Ñ ÑкÑтрузии прутка." - -#: src/slic3r/GUI/ConfigWizard.cpp:1432 -msgid "A rule of thumb is 160 to 230 °C for PLA, and 215 to 250 °C for ABS." -msgstr "Как правило Ð´Ð»Ñ PLA Ñто 160-230 °C, а Ð´Ð»Ñ ABS 215-250 °C." - -#: src/slic3r/GUI/ConfigWizard.cpp:1435 -msgid "Extrusion Temperature:" -msgstr "Температура ÑкÑтрузии:" - -#: src/slic3r/GUI/ConfigWizard.cpp:1436 src/slic3r/GUI/ConfigWizard.cpp:1450 -#: src/libslic3r/PrintConfig.cpp:202 src/libslic3r/PrintConfig.cpp:950 -#: src/libslic3r/PrintConfig.cpp:994 src/libslic3r/PrintConfig.cpp:2294 -msgid "°C" -msgstr "°C" - -#: src/slic3r/GUI/ConfigWizard.cpp:1445 -======= #: src/slic3r/GUI/ConfigWizard.cpp:1489 msgid "Filament Diameter:" msgstr "Диаметр прутка:" @@ -1709,148 +1038,18 @@ msgid "°C" msgstr "°C" #: src/slic3r/GUI/ConfigWizard.cpp:1577 ->>>>>>> master msgid "" -"Enter the bed temperature needed for getting your filament to stick to your heated " -"bed." +"Enter the bed temperature needed for getting your filament to stick to your " +"heated bed." msgstr "" -<<<<<<< HEAD -"Введите температуру Ñтола, необходимую Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, чтобы пруток прилипал к нему." - -#: src/slic3r/GUI/ConfigWizard.cpp:1446 -======= "Введите температуру Ñтола, необходимую Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, чтобы пруток прилипал к " "нему." #: src/slic3r/GUI/ConfigWizard.cpp:1578 ->>>>>>> master msgid "" -"A rule of thumb is 60 °C for PLA and 110 °C for ABS. Leave zero if you have no " -"heated bed." +"A rule of thumb is 60 °C for PLA and 110 °C for ABS. Leave zero if you have " +"no heated bed." msgstr "" -<<<<<<< HEAD -"Как правило Ð´Ð»Ñ PLA Ñто 60 °C, а Ð´Ð»Ñ ABS 110 °С. ЕÑли у Ð²Ð°Ñ Ð½Ðµ подогреваемый Ñтол, " -"уÑтановите 0." - -#: src/slic3r/GUI/ConfigWizard.cpp:1449 -msgid "Bed Temperature:" -msgstr "Температура Ñтола:" - -#: src/slic3r/GUI/ConfigWizard.cpp:1909 src/slic3r/GUI/ConfigWizard.cpp:2582 -msgid "Filaments" -msgstr "ПлаÑтиковые нити (прутки)" - -#: src/slic3r/GUI/ConfigWizard.cpp:1909 src/slic3r/GUI/ConfigWizard.cpp:2584 -msgid "SLA Materials" -msgstr "SLA материалы (Ñ„Ð¾Ñ‚Ð¾Ð¿Ð¾Ð»Ð¸Ð¼ÐµÑ€Ð½Ð°Ñ Ñмола)" - -#: src/slic3r/GUI/ConfigWizard.cpp:1963 -msgid "FFF Technology Printers" -msgstr "Принтеры, печатающие по технологии методом Ð½Ð°Ð¿Ð»Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð½Ð¸Ñ‚ÐµÐ¹ (FFF)" - -#: src/slic3r/GUI/ConfigWizard.cpp:1968 -msgid "SLA Technology Printers" -msgstr "Принтеры, печатающие по технологии маÑочной ЖК-Ñтереолитографии (SLA)" - -#: src/slic3r/GUI/ConfigWizard.cpp:2274 src/slic3r/GUI/DoubleSlider.cpp:2245 -#: src/slic3r/GUI/DoubleSlider.cpp:2265 src/slic3r/GUI/GUI.cpp:244 -msgid "Notice" -msgstr "Примечание" - -#: src/slic3r/GUI/ConfigWizard.cpp:2295 -msgid "The following FFF printer models have no filament selected:" -msgstr "Ð’ Ñледующих моделÑÑ… FFF принтеров не выбран пруток:" - -#: src/slic3r/GUI/ConfigWizard.cpp:2299 -msgid "Do you want to select default filaments for these FFF printer models?" -msgstr "Выбрать пруки по умолчанию Ð´Ð»Ñ Ñтих моделей FFF принтеров?" - -#: src/slic3r/GUI/ConfigWizard.cpp:2313 -msgid "The following SLA printer models have no materials selected:" -msgstr "Ð’ Ñледующих моделÑÑ… SLA принтеров не выбрана Ñ„Ð¾Ñ‚Ð¾Ð¿Ð¾Ð»Ð¸Ð¼ÐµÑ€Ð½Ð°Ñ Ñмола:" - -#: src/slic3r/GUI/ConfigWizard.cpp:2317 -msgid "Do you want to select default SLA materials for these printer models?" -msgstr "Выбрать фотополимерный Ñмолы по умолчанию Ð´Ð»Ñ Ñтих моделей SLA принтеров?" - -#: src/slic3r/GUI/ConfigWizard.cpp:2545 -msgid "Select all standard printers" -msgstr "Выбрать вÑе Ñтандартные принтеры" - -#: src/slic3r/GUI/ConfigWizard.cpp:2548 -msgid "< &Back" -msgstr "< &Ðазад" - -#: src/slic3r/GUI/ConfigWizard.cpp:2549 -msgid "&Next >" -msgstr "&Далее >" - -#: src/slic3r/GUI/ConfigWizard.cpp:2550 -msgid "&Finish" -msgstr "&Завершить" - -#: src/slic3r/GUI/ConfigWizard.cpp:2551 src/slic3r/GUI/FirmwareDialog.cpp:151 -#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:248 -#: src/slic3r/GUI/ProgressStatusBar.cpp:26 src/slic3r/GUI/UnsavedChangesDialog.cpp:656 -msgid "Cancel" -msgstr "Отмена" - -#: src/slic3r/GUI/ConfigWizard.cpp:2564 -msgid "Prusa FFF Technology Printers" -msgstr "Принтеры Prusa, печатающие по технологии методом Ð½Ð°Ð¿Ð»Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð½Ð¸Ñ‚ÐµÐ¹ (FFF)" - -#: src/slic3r/GUI/ConfigWizard.cpp:2567 -msgid "Prusa MSLA Technology Printers" -msgstr "Принтеры Prusa, печатающие по технологии маÑочной ЖК-Ñтереолитографии (MSLA)" - -#: src/slic3r/GUI/ConfigWizard.cpp:2582 -msgid "Filament Profiles Selection" -msgstr "Выбор профилей прутка" - -#: src/slic3r/GUI/ConfigWizard.cpp:2582 src/slic3r/GUI/ConfigWizard.cpp:2584 -#: src/slic3r/GUI/GUI_ObjectList.cpp:4144 -msgid "Type:" -msgstr "Тип:" - -#: src/slic3r/GUI/ConfigWizard.cpp:2584 -msgid "SLA Material Profiles Selection" -msgstr "Выбор профилей фотополимерной Ñмолы (SLA)" - -#: src/slic3r/GUI/ConfigWizard.cpp:2701 -msgid "Configuration Assistant" -msgstr "Помощник по наÑтройке" - -#: src/slic3r/GUI/ConfigWizard.cpp:2702 -msgid "Configuration &Assistant" -msgstr "Помощник по &наÑтройке" - -#: src/slic3r/GUI/ConfigWizard.cpp:2704 -msgid "Configuration Wizard" -msgstr "МаÑтер наÑтройки" - -#: src/slic3r/GUI/ConfigWizard.cpp:2705 -msgid "Configuration &Wizard" -msgstr "&МаÑтер наÑтройки" - -#: src/slic3r/GUI/DoubleSlider.cpp:97 -msgid "Place bearings in slots and resume printing" -msgstr "ПомеÑтите в поÑадочное меÑто необходимую деталь и возобновите печать" - -#: src/slic3r/GUI/DoubleSlider.cpp:1224 -msgid "One layer mode" -msgstr "Режим одного ÑлоÑ" - -#: src/slic3r/GUI/DoubleSlider.cpp:1226 -msgid "Discard all custom changes" -msgstr "Отменить вÑе пользовательÑкие изменениÑ" - -#: src/slic3r/GUI/DoubleSlider.cpp:1230 src/slic3r/GUI/DoubleSlider.cpp:1995 -msgid "Jump to move" -msgstr "Перейти к заданному перемещению" - -#: src/slic3r/GUI/DoubleSlider.cpp:1233 -#, c-format -======= "Как правило Ð´Ð»Ñ PLA Ñто 60 °C, а Ð´Ð»Ñ ABS 110 °С. ЕÑли у Ð²Ð°Ñ Ð½Ðµ подогреваемый " "Ñтол, уÑтановите 0." @@ -2102,7 +1301,6 @@ msgstr "Перейти к заданному перемещению" #: src/slic3r/GUI/DoubleSlider.cpp:1388 #, c-format, boost-format ->>>>>>> master msgid "" "Jump to height %s\n" "Set ruler mode\n" @@ -2112,13 +1310,8 @@ msgstr "" "Задать режимы линейки\n" "или задать поÑледовательноÑÑ‚ÑŒ ÑкÑтрудеров Ð´Ð»Ñ Ð²Ñей печати" -<<<<<<< HEAD -#: src/slic3r/GUI/DoubleSlider.cpp:1236 -#, c-format -======= #: src/slic3r/GUI/DoubleSlider.cpp:1391 #, c-format, boost-format ->>>>>>> master msgid "" "Jump to height %s\n" "or Set ruler mode" @@ -2126,21 +1319,6 @@ msgstr "" "Перейти к заданной выÑоте %s\n" "или задать режимы линейки" -<<<<<<< HEAD -#: src/slic3r/GUI/DoubleSlider.cpp:1241 -msgid "Edit current color - Right click the colored slider segment" -msgstr "Изменить текущий цвет - ÐŸÑ€Ð°Ð²Ð°Ñ ÐºÐ½Ð¾Ð¿ÐºÐ° мыши по цветному Ñегменту ползунка" - -#: src/slic3r/GUI/DoubleSlider.cpp:1251 -msgid "Print mode" -msgstr "Режим печати" - -#: src/slic3r/GUI/DoubleSlider.cpp:1265 -msgid "Add extruder change - Left click" -msgstr "Добавить маркер Ñмены ÑкÑтрудера - Ð›ÐµÐ²Ð°Ñ ÐºÐ½Ð¾Ð¿ÐºÐ° мыши" - -#: src/slic3r/GUI/DoubleSlider.cpp:1267 -======= #: src/slic3r/GUI/DoubleSlider.cpp:1396 msgid "Edit current color - Right click the colored slider segment" msgstr "" @@ -2168,33 +1346,10 @@ msgid "Add extruder change - Left click" msgstr "Добавить маркер Ñмены ÑкÑтрудера - Ð›ÐµÐ²Ð°Ñ ÐºÐ½Ð¾Ð¿ÐºÐ° мыши" #: src/slic3r/GUI/DoubleSlider.cpp:1428 ->>>>>>> master msgid "" -"Add color change - Left click for predefined color or Shift + Left click for custom " -"color selection" +"Add color change - Left click for predefined color or Shift + Left click for " +"custom color selection" msgstr "" -<<<<<<< HEAD -"Добавить маркер Ñмены цвета - Ð›ÐµÐ²Ð°Ñ ÐºÐ½Ð¾Ð¿ÐºÐ° мыши Ð´Ð»Ñ Ñ†Ð²ÐµÑ‚Ð° из ÑпиÑка цветов по " -"умолчанию или Shift + Ð›ÐµÐ²Ð°Ñ ÐºÐ½Ð¾Ð¿ÐºÐ° мыши Ð´Ð»Ñ Ð²Ñ‹Ð±Ð¾Ñ€Ð° Ñвоего цвета" - -#: src/slic3r/GUI/DoubleSlider.cpp:1269 -msgid "Add color change - Left click" -msgstr "Добавить маркер Ñмены цвета - Ð›ÐµÐ²Ð°Ñ ÐºÐ½Ð¾Ð¿ÐºÐ° мыши" - -#: src/slic3r/GUI/DoubleSlider.cpp:1270 -msgid "or press \"+\" key" -msgstr "или клавиша \"+\"" - -#: src/slic3r/GUI/DoubleSlider.cpp:1272 -msgid "Add another code - Ctrl + Left click" -msgstr "Ð”Ð»Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð´Ñ€ÑƒÐ³Ð¾Ð³Ð¾ кода - Ctrl + Ð»ÐµÐ²Ð°Ñ ÐºÐ½Ð¾Ð¿ÐºÐ° мыши" - -#: src/slic3r/GUI/DoubleSlider.cpp:1273 -msgid "Add another code - Right click" -msgstr "Ð”Ð»Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð´Ñ€ÑƒÐ³Ð¾Ð³Ð¾ кода - ÐŸÑ€Ð°Ð²Ð°Ñ ÐºÐ½Ð¾Ð¿ÐºÐ° мыши" - -#: src/slic3r/GUI/DoubleSlider.cpp:1279 -======= "Добавить маркер Ñмены цвета - Ð›ÐµÐ²Ð°Ñ ÐºÐ½Ð¾Ð¿ÐºÐ° мыши Ð´Ð»Ñ Ñ†Ð²ÐµÑ‚Ð° из ÑпиÑка цветов " "по умолчанию или Shift + Ð›ÐµÐ²Ð°Ñ ÐºÐ½Ð¾Ð¿ÐºÐ° мыши Ð´Ð»Ñ Ð²Ñ‹Ð±Ð¾Ñ€Ð° Ñвоего цвета" @@ -2215,44 +1370,13 @@ msgid "Add another code - Right click" msgstr "Ð”Ð»Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð´Ñ€ÑƒÐ³Ð¾Ð³Ð¾ кода - ÐŸÑ€Ð°Ð²Ð°Ñ ÐºÐ½Ð¾Ð¿ÐºÐ° мыши" #: src/slic3r/GUI/DoubleSlider.cpp:1440 ->>>>>>> master msgid "" "The sequential print is on.\n" -"It's impossible to apply any custom G-code for objects printing sequentually.\n" +"It's impossible to apply any custom G-code for objects printing " +"sequentually.\n" "This code won't be processed during G-code generation." msgstr "" "Включена поÑÐ»ÐµÐ´Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð¿ÐµÑ‡Ð°Ñ‚ÑŒ.\n" -<<<<<<< HEAD -"При поÑледовательной печати, невозможно применение какого-либо пользовательÑкого G-" -"кода.\n" -"Ðтот код не будет обрабатыватьÑÑ Ð²Ð¾ Ð²Ñ€ÐµÐ¼Ñ Ð³ÐµÐ½ÐµÑ€Ð°Ñ†Ð¸Ð¸ G-кода." - -#: src/slic3r/GUI/DoubleSlider.cpp:1288 -msgid "Color change (\"%1%\")" -msgstr "Маркер Ñмены цвета (\"%1%\")" - -#: src/slic3r/GUI/DoubleSlider.cpp:1289 -msgid "Color change (\"%1%\") for Extruder %2%" -msgstr "Смена цвета (\"%1%\") Ð´Ð»Ñ ÑкÑтрудера %2%" - -#: src/slic3r/GUI/DoubleSlider.cpp:1291 -msgid "Pause print (\"%1%\")" -msgstr "Пауза печати (\"%1%\")" - -#: src/slic3r/GUI/DoubleSlider.cpp:1293 -msgid "Custom template (\"%1%\")" -msgstr "ПользовательÑкий шаблон \"%1%\")" - -#: src/slic3r/GUI/DoubleSlider.cpp:1295 -msgid "Extruder (tool) is changed to Extruder \"%1%\"" -msgstr "ÐкÑтрудер (инÑтрумент) заменён на ÑкÑтрудер \"%1%\"" - -#: src/slic3r/GUI/DoubleSlider.cpp:1302 -msgid "Note" -msgstr "Примечание" - -#: src/slic3r/GUI/DoubleSlider.cpp:1304 -======= "При поÑледовательной печати, невозможно применение какого-либо " "пользовательÑкого G-кода.\n" "Ðтот код не будет обрабатыватьÑÑ Ð²Ð¾ Ð²Ñ€ÐµÐ¼Ñ Ð³ÐµÐ½ÐµÑ€Ð°Ñ†Ð¸Ð¸ G-кода." @@ -2291,7 +1415,6 @@ msgid "Note" msgstr "Примечание" #: src/slic3r/GUI/DoubleSlider.cpp:1482 ->>>>>>> master msgid "" "G-code associated to this tick mark is in a conflict with print mode.\n" "Editing it will cause changes of Slider data." @@ -2299,28 +1422,17 @@ msgstr "" "G-код, ÑвÑзанный Ñ Ñтим маркером, конфликтует Ñ Ñ€ÐµÐ¶Ð¸Ð¼Ð¾Ð¼ печати.\n" "Его редактирование приведёт к изменениÑм данных ползунка." -<<<<<<< HEAD -#: src/slic3r/GUI/DoubleSlider.cpp:1307 -======= #: src/slic3r/GUI/DoubleSlider.cpp:1485 ->>>>>>> master msgid "" -"There is a color change for extruder that won't be used till the end of print job.\n" +"There is a color change for extruder that won't be used till the end of " +"print job.\n" "This code won't be processed during G-code generation." msgstr "" -<<<<<<< HEAD -"Произведена Ñмена цвета Ð´Ð»Ñ ÑкÑтрудера, который не будет иÑпользоватьÑÑ Ð´Ð¾ конца " -"печати.\n" -"Ðтот код не будет обрабатыватьÑÑ Ð²Ð¾ Ð²Ñ€ÐµÐ¼Ñ Ð³ÐµÐ½ÐµÑ€Ð°Ñ†Ð¸Ð¸ G-кода." - -#: src/slic3r/GUI/DoubleSlider.cpp:1310 -======= "Произведена Ñмена цвета Ð´Ð»Ñ ÑкÑтрудера, который не будет иÑпользоватьÑÑ Ð´Ð¾ " "конца печати.\n" "Ðтот код не будет обрабатыватьÑÑ Ð²Ð¾ Ð²Ñ€ÐµÐ¼Ñ Ð³ÐµÐ½ÐµÑ€Ð°Ñ†Ð¸Ð¸ G-кода." #: src/slic3r/GUI/DoubleSlider.cpp:1488 ->>>>>>> master msgid "" "There is an extruder change set to the same extruder.\n" "This code won't be processed during G-code generation." @@ -2328,11 +1440,7 @@ msgstr "" "СущеÑтвующий ÑкÑтрудер заменён на тот же ÑкÑтрудер.\n" "Ðтот код не будет обрабатыватьÑÑ Ð²Ð¾ Ð²Ñ€ÐµÐ¼Ñ Ð³ÐµÐ½ÐµÑ€Ð°Ñ†Ð¸Ð¸ G-кода." -<<<<<<< HEAD -#: src/slic3r/GUI/DoubleSlider.cpp:1313 -======= #: src/slic3r/GUI/DoubleSlider.cpp:1491 ->>>>>>> master msgid "" "There is a color change for extruder that has not been used before.\n" "Check your settings to avoid redundant color changes." @@ -2340,189 +1448,12 @@ msgstr "" "Произведена Ñмена цвета Ð´Ð»Ñ ÑкÑтрудера, который ранее не иÑпользовалÑÑ.\n" "Проверьте наÑтройки, чтобы избежать лишней Ñмены цвета." -<<<<<<< HEAD -#: src/slic3r/GUI/DoubleSlider.cpp:1318 -======= #: src/slic3r/GUI/DoubleSlider.cpp:1496 ->>>>>>> master msgid "Delete tick mark - Left click or press \"-\" key" msgstr "" "Удалить маркер - Ð›ÐµÐ²Ð°Ñ ÐºÐ½Ð¾Ð¿ÐºÐ° мыши \n" "или клавиша \"-\"" -<<<<<<< HEAD -#: src/slic3r/GUI/DoubleSlider.cpp:1320 -msgid "Edit tick mark - Ctrl + Left click" -msgstr "Редактировать маркер - Ctrl + Ð»ÐµÐ²Ð°Ñ ÐºÐ½Ð¾Ð¿ÐºÐ° мыши" - -#: src/slic3r/GUI/DoubleSlider.cpp:1321 -msgid "Edit tick mark - Right click" -msgstr "Редактировать маркер - ÐŸÑ€Ð°Ð²Ð°Ñ ÐºÐ½Ð¾Ð¿ÐºÐ° мыши" - -#: src/slic3r/GUI/DoubleSlider.cpp:1417 src/slic3r/GUI/DoubleSlider.cpp:1451 -#: src/slic3r/GUI/GUI_ObjectList.cpp:1864 -#, c-format -msgid "Extruder %d" -msgstr "ÐкÑтрудер %d" - -#: src/slic3r/GUI/DoubleSlider.cpp:1418 src/slic3r/GUI/GUI_ObjectList.cpp:1865 -msgid "active" -msgstr "активный" - -#: src/slic3r/GUI/DoubleSlider.cpp:1427 -msgid "Switch code to Change extruder" -msgstr "Переключить код на Ñмену ÑкÑтрудера" - -#: src/slic3r/GUI/DoubleSlider.cpp:1427 src/slic3r/GUI/GUI_ObjectList.cpp:1832 -msgid "Change extruder" -msgstr "Маркер Ñмены ÑкÑтрудера" - -#: src/slic3r/GUI/DoubleSlider.cpp:1428 -msgid "Change extruder (N/A)" -msgstr "Маркер Ñмены ÑкÑтрудера (Ðет данных)" - -#: src/slic3r/GUI/DoubleSlider.cpp:1430 -msgid "Use another extruder" -msgstr "ИÑпользовать другой ÑкÑтрудер" - -#: src/slic3r/GUI/DoubleSlider.cpp:1452 -msgid "used" -msgstr "иÑпользуетÑÑ" - -#: src/slic3r/GUI/DoubleSlider.cpp:1460 -msgid "Switch code to Color change (%1%) for:" -msgstr "Переключить код на Ñмену цвета (%1%) длÑ:" - -#: src/slic3r/GUI/DoubleSlider.cpp:1461 -msgid "Add color change (%1%) for:" -msgstr "Добавить маркер Ñмены цвета (%1%) длÑ:" - -#: src/slic3r/GUI/DoubleSlider.cpp:1797 -msgid "Add color change" -msgstr "Добавить маркер Ñмены цвета" - -#: src/slic3r/GUI/DoubleSlider.cpp:1808 -msgid "Add pause print" -msgstr "Добавить маркер паузы печати" - -#: src/slic3r/GUI/DoubleSlider.cpp:1812 -msgid "Add custom template" -msgstr "Добавить пользовательÑкий шаблон" - -#: src/slic3r/GUI/DoubleSlider.cpp:1815 -msgid "Add custom G-code" -msgstr "Добавить маркер пользовательÑкого G-кода" - -#: src/slic3r/GUI/DoubleSlider.cpp:1833 -msgid "Edit color" -msgstr "Изменить цвет" - -#: src/slic3r/GUI/DoubleSlider.cpp:1834 -msgid "Edit pause print message" -msgstr "Изменить Ñообщение при приоÑтановке печати" - -#: src/slic3r/GUI/DoubleSlider.cpp:1835 -msgid "Edit custom G-code" -msgstr "Изменить пользовательÑкий G-код" - -#: src/slic3r/GUI/DoubleSlider.cpp:1841 -msgid "Delete color change" -msgstr "Удалить маркер Ñмены цвета" - -#: src/slic3r/GUI/DoubleSlider.cpp:1842 -msgid "Delete tool change" -msgstr "Удалить маркер Ñмены инÑтрумента" - -#: src/slic3r/GUI/DoubleSlider.cpp:1843 -msgid "Delete pause print" -msgstr "Удалить паузу печати" - -#: src/slic3r/GUI/DoubleSlider.cpp:1844 -msgid "Delete custom G-code" -msgstr "Удалить пользовательÑкий G-код" - -#: src/slic3r/GUI/DoubleSlider.cpp:1854 src/slic3r/GUI/DoubleSlider.cpp:1995 -msgid "Jump to height" -msgstr "Перейти на заданную выÑоту" - -#: src/slic3r/GUI/DoubleSlider.cpp:1859 -msgid "Hide ruler" -msgstr "Скрыть линейку" - -#: src/slic3r/GUI/DoubleSlider.cpp:1863 -msgid "Show object height" -msgstr "Показывать выÑоту модели" - -#: src/slic3r/GUI/DoubleSlider.cpp:1863 -msgid "Show object height on the ruler" -msgstr "Показывать выÑоту модели на линейке" - -#: src/slic3r/GUI/DoubleSlider.cpp:1867 -msgid "Show estimated print time" -msgstr "Показывать раÑчётное Ð²Ñ€ÐµÐ¼Ñ Ð¿ÐµÑ‡Ð°Ñ‚Ð¸" - -#: src/slic3r/GUI/DoubleSlider.cpp:1867 -msgid "Show estimated print time on the ruler" -msgstr "Показать раÑчётное Ð²Ñ€ÐµÐ¼Ñ Ð¿ÐµÑ‡Ð°Ñ‚Ð¸ на линейке" - -#: src/slic3r/GUI/DoubleSlider.cpp:1871 -msgid "Ruler mode" -msgstr "Режим линейки" - -#: src/slic3r/GUI/DoubleSlider.cpp:1871 -msgid "Set ruler mode" -msgstr "Задать режим линейки" - -#: src/slic3r/GUI/DoubleSlider.cpp:1876 -msgid "Set extruder sequence for the entire print" -msgstr "Задать поÑледовательноÑÑ‚ÑŒ ÑкÑтрудеров Ð´Ð»Ñ Ð²Ñей печати" - -#: src/slic3r/GUI/DoubleSlider.cpp:1962 -msgid "Enter custom G-code used on current layer" -msgstr "Введите пользовательÑкий G-код Ð´Ð»Ñ Ñ‚ÐµÐºÑƒÑ‰ÐµÐ³Ð¾ ÑлоÑ" - -#: src/slic3r/GUI/DoubleSlider.cpp:1963 -msgid "Custom G-code on current layer (%1% mm)." -msgstr "ПользовательÑкий G-код Ð´Ð»Ñ Ñ‚ÐµÐºÑƒÑ‰ÐµÐ³Ð¾ ÑÐ»Ð¾Ñ (%1% мм)." - -#: src/slic3r/GUI/DoubleSlider.cpp:1978 -msgid "Enter short message shown on Printer display when a print is paused" -msgstr "" -"Введите короткое Ñообщение, которое будет отображатьÑÑ Ð½Ð° Ñкране принтера при паузе " -"печати" - -#: src/slic3r/GUI/DoubleSlider.cpp:1979 -msgid "Message for pause print on current layer (%1% mm)." -msgstr "Сообщение при паузе печати на текущем Ñлое (%1% мм)." - -#: src/slic3r/GUI/DoubleSlider.cpp:1994 -msgid "Enter the move you want to jump to" -msgstr "Введите нужное перемещение, на который хотите перейти" - -#: src/slic3r/GUI/DoubleSlider.cpp:1994 -msgid "Enter the height you want to jump to" -msgstr "Введите значение Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÑ…Ð¾Ð´Ð° на нужную выÑоту" - -#: src/slic3r/GUI/DoubleSlider.cpp:2239 -msgid "The last color change data was saved for a single extruder printing." -msgstr "" -"ПоÑледние данные об изменении цвета были Ñохранены Ð´Ð»Ñ Ð¾Ð´Ð½Ð¾ÑкÑтрудерной печати." - -#: src/slic3r/GUI/DoubleSlider.cpp:2240 src/slic3r/GUI/DoubleSlider.cpp:2255 -msgid "The last color change data was saved for a multi extruder printing." -msgstr "" -"ПоÑледние данные об изменении цвета были Ñохранены Ð´Ð»Ñ Ð¼Ð½Ð¾Ð³Ð¾ÑкÑтрудерной печати." - -#: src/slic3r/GUI/DoubleSlider.cpp:2242 -msgid "Your current changes will delete all saved color changes." -msgstr "Текущие Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¸Ð²ÐµÐ´ÑƒÑ‚ к удалению вÑех Ñохранённых изменений цвета." - -#: src/slic3r/GUI/DoubleSlider.cpp:2243 src/slic3r/GUI/DoubleSlider.cpp:2263 -msgid "Are you sure you want to continue?" -msgstr "Ð’Ñ‹ дейÑтвительно хотите продолжить?" - -#: src/slic3r/GUI/DoubleSlider.cpp:2256 -======= #: src/slic3r/GUI/DoubleSlider.cpp:1498 msgid "Edit tick mark - Ctrl + Left click" msgstr "Редактировать маркер - Ctrl + Ð»ÐµÐ²Ð°Ñ ÐºÐ½Ð¾Ð¿ÐºÐ° мыши" @@ -2724,7 +1655,6 @@ msgid "Are you sure you want to continue?" msgstr "Ð’Ñ‹ дейÑтвительно хотите продолжить?" #: src/slic3r/GUI/DoubleSlider.cpp:2532 ->>>>>>> master msgid "" "Select YES if you want to delete all saved tool changes, \n" "NO if you want all tool changes switch to color changes, \n" @@ -2734,48 +1664,24 @@ msgstr "" "ЕÑли хотите переключить Ñмену инÑтрумента на изменение цвета, нажмите ÐЕТ \n" "или ОТМЕÐÐ, чтобы оÑтавить вÑÑ‘ без изменений." -<<<<<<< HEAD -#: src/slic3r/GUI/DoubleSlider.cpp:2259 -msgid "Do you want to delete all saved tool changes?" -msgstr "Удалить вÑе Ñохранённые данные о Ñмене инÑтрумента?" - -#: src/slic3r/GUI/DoubleSlider.cpp:2261 -======= #: src/slic3r/GUI/DoubleSlider.cpp:2535 msgid "Do you want to delete all saved tool changes?" msgstr "Удалить вÑе Ñохранённые данные о Ñмене инÑтрумента?" #: src/slic3r/GUI/DoubleSlider.cpp:2537 ->>>>>>> master msgid "" "The last color change data was saved for a multi extruder printing with tool " "changes for whole print." msgstr "" -<<<<<<< HEAD -"ПоÑледние данные об изменении цвета были Ñохранены Ð´Ð»Ñ Ð¼Ð½Ð¾Ð³Ð¾ÑкÑтрудерной печати Ñо " -"Ñменой инÑтрумента Ð´Ð»Ñ Ð²Ñей печати." - -#: src/slic3r/GUI/DoubleSlider.cpp:2262 -======= "ПоÑледние данные об изменении цвета были Ñохранены Ð´Ð»Ñ Ð¼Ð½Ð¾Ð³Ð¾ÑкÑтрудерной " "печати Ñо Ñменой инÑтрумента Ð´Ð»Ñ Ð²Ñей печати." #: src/slic3r/GUI/DoubleSlider.cpp:2538 ->>>>>>> master msgid "Your current changes will delete all saved extruder (tool) changes." msgstr "" "Текущие Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¸Ð²ÐµÐ´ÑƒÑ‚ к удалению вÑех Ñохранённых изменений ÑкÑтрудера " "(инÑтрумента)." -<<<<<<< HEAD -#: src/slic3r/GUI/ExtraRenderers.cpp:297 src/slic3r/GUI/GUI_ObjectList.cpp:512 -#: src/slic3r/GUI/GUI_ObjectList.cpp:524 src/slic3r/GUI/GUI_ObjectList.cpp:1033 -#: src/slic3r/GUI/GUI_ObjectList.cpp:4582 src/slic3r/GUI/GUI_ObjectList.cpp:4592 -#: src/slic3r/GUI/GUI_ObjectList.cpp:4627 src/slic3r/GUI/ObjectDataViewModel.cpp:209 -#: src/slic3r/GUI/ObjectDataViewModel.cpp:266 -#: src/slic3r/GUI/ObjectDataViewModel.cpp:291 -#: src/slic3r/GUI/ObjectDataViewModel.cpp:499 src/libslic3r/PrintConfig.cpp:552 -======= #: src/slic3r/GUI/ExtraRenderers.cpp:316 src/slic3r/GUI/GUI_ObjectList.cpp:538 #: src/slic3r/GUI/GUI_ObjectList.cpp:550 src/slic3r/GUI/GUI_ObjectList.cpp:979 #: src/slic3r/GUI/GUI_ObjectList.cpp:1966 @@ -2784,7 +1690,6 @@ msgstr "" #: src/slic3r/GUI/ObjectDataViewModel.cpp:352 #: src/slic3r/GUI/ObjectDataViewModel.cpp:376 #: src/slic3r/GUI/ObjectDataViewModel.cpp:607 src/libslic3r/PrintConfig.cpp:774 ->>>>>>> master msgid "default" msgstr "по умолчанию" @@ -2794,20 +1699,6 @@ msgstr "Задать поÑледовательноÑÑ‚ÑŒ ÑкÑтрудеров #: src/slic3r/GUI/ExtruderSequenceDialog.cpp:46 msgid "Set extruder change for every" -<<<<<<< HEAD -msgstr "Задать Ñмену ÑкÑтрудера на каждом" - -#: src/slic3r/GUI/ExtruderSequenceDialog.cpp:53 src/libslic3r/PrintConfig.cpp:418 -#: src/libslic3r/PrintConfig.cpp:1089 src/libslic3r/PrintConfig.cpp:1718 -#: src/libslic3r/PrintConfig.cpp:1883 src/libslic3r/PrintConfig.cpp:1950 -#: src/libslic3r/PrintConfig.cpp:2157 src/libslic3r/PrintConfig.cpp:2203 -msgid "layers" -msgstr "Ñлой(-Ñ)" - -#: src/slic3r/GUI/ExtruderSequenceDialog.cpp:137 -msgid "Set extruder(tool) sequence" -msgstr "Задать поÑледовательноÑÑ‚ÑŒ ÑкÑтрудеров (инÑтрументов)" -======= msgstr "Смена ÑкÑтрудера на каждом" #: src/slic3r/GUI/ExtruderSequenceDialog.cpp:60 @@ -2835,7 +1726,6 @@ msgstr "Разрешить повтор цвета" #: src/slic3r/GUI/ExtruderSequenceDialog.cpp:174 msgid "If enabled, a repetition of the next random color will be allowed." msgstr "ЕÑли включено, будет разрешено поÑледующее Ñлучайное повторение цвета." ->>>>>>> master #: src/slic3r/GUI/ExtruderSequenceDialog.cpp:177 msgid "Set extruder(tool) sequence" @@ -2849,51 +1739,6 @@ msgstr "Удалить ÑкÑтрудер из поÑледовательноÑÑ msgid "Add extruder to sequence" msgstr "Добавить ÑкÑтрудер в поÑледовательноÑÑ‚ÑŒ" -<<<<<<< HEAD -#: src/slic3r/GUI/Field.cpp:197 -msgid "default value" -msgstr "значение по умолчанию" - -#: src/slic3r/GUI/Field.cpp:200 -msgid "parameter name" -msgstr "Ð¸Ð¼Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð°" - -#: src/slic3r/GUI/Field.cpp:211 src/slic3r/GUI/OptionsGroup.cpp:781 -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:886 -msgid "N/A" -msgstr "Ð/Д" - -#: src/slic3r/GUI/Field.cpp:233 -#, c-format -msgid "%s doesn't support percentage" -msgstr "%s не поддерживает проценты" - -#: src/slic3r/GUI/Field.cpp:253 src/slic3r/GUI/Field.cpp:307 -#: src/slic3r/GUI/Field.cpp:1520 src/slic3r/GUI/GUI_ObjectLayers.cpp:413 -msgid "Invalid numeric input." -msgstr "Ðеправильное чиÑловое значение." - -#: src/slic3r/GUI/Field.cpp:264 -#, c-format -msgid "" -"Input value is out of range\n" -"Are you sure that %s is a correct value and that you want to continue?" -msgstr "" -"Введённое значение вне диапазона\n" -"Ð’Ñ‹ уверены, что %s ÑвлÑетÑÑ Ð¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ñ‹Ð¼ значением и что вы хотите продолжить?" - -#: src/slic3r/GUI/Field.cpp:266 src/slic3r/GUI/Field.cpp:326 -msgid "Parameter validation" -msgstr "Проверка правильноÑти параметра" - -#: src/slic3r/GUI/Field.cpp:279 src/slic3r/GUI/Field.cpp:373 -#: src/slic3r/GUI/Field.cpp:1532 -msgid "Input value is out of range" -msgstr "Введённое значение вне диапазона" - -#: src/slic3r/GUI/Field.cpp:323 -#, c-format -======= #: src/slic3r/GUI/Field.cpp:190 msgid "default value" msgstr "значение по умолчанию" @@ -2933,7 +1778,6 @@ msgstr "Введённое значение вне диапазона" #: src/slic3r/GUI/Field.cpp:340 #, c-format, boost-format ->>>>>>> master msgid "" "Do you mean %s%% instead of %s %s?\n" "Select YES if you want to change this value to %s%%, \n" @@ -2943,13 +1787,6 @@ msgstr "" "Выберите Да, еÑли вы хотите изменить Ñто значение на %s%%, \n" "или Ðет, еÑли уверены, что %s %s ÑвлÑетÑÑ Ð¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ñ‹Ð¼ значением." -<<<<<<< HEAD -#: src/slic3r/GUI/Field.cpp:381 -msgid "" -"Invalid input format. Expected vector of dimensions in the following format: \"%1%\"" -msgstr "" -"Ðеверный входной формат. Ожидаемый вектор размеров в Ñледующем формате: \"%1%\"" -======= #: src/slic3r/GUI/Field.cpp:397 #, boost-format msgid "" @@ -2958,7 +1795,6 @@ msgid "" msgstr "" "Ðеверный входной формат. Ожидаемый вектор размеров в Ñледующем формате: \"%1%" "\"" ->>>>>>> master #: src/slic3r/GUI/FirmwareDialog.cpp:152 msgid "Flash!" @@ -3001,14 +1837,6 @@ msgstr "" "Ð’Ñ‹ вÑе равно хотите прошить Ñтот файл?\n" "ПожалуйÑта, продолжайте лишь в том Ñлучае, еÑли вы уверены в Ñвоих дейÑтвиÑÑ…." -<<<<<<< HEAD -#: src/slic3r/GUI/FirmwareDialog.cpp:419 src/slic3r/GUI/FirmwareDialog.cpp:454 -#, c-format -msgid "Multiple %s devices found. Please only connect one at a time for flashing." -msgstr "" -"Ðайдено неÑколько уÑтройÑтв %s. Ð”Ð»Ñ Ð¿Ñ€Ð¾ÑˆÐ¸Ð²ÐºÐ¸ оÑтавьте только одно подключённое " -"уÑтройÑтво." -======= #: src/slic3r/GUI/FirmwareDialog.cpp:420 src/slic3r/GUI/FirmwareDialog.cpp:455 #, c-format, boost-format msgid "" @@ -3016,7 +1844,6 @@ msgid "" msgstr "" "Ðайдено неÑколько уÑтройÑтв %s. Ð”Ð»Ñ Ð¿Ñ€Ð¾ÑˆÐ¸Ð²ÐºÐ¸ оÑтавьте только одно " "подключённое уÑтройÑтво." ->>>>>>> master #: src/slic3r/GUI/FirmwareDialog.cpp:437 #, c-format, boost-format @@ -3051,10 +1878,6 @@ msgstr "Прошивальшик" msgid "Firmware image:" msgstr "Файл прошивки (*.hex):" -<<<<<<< HEAD -#: src/slic3r/GUI/FirmwareDialog.cpp:805 src/slic3r/GUI/PhysicalPrinterDialog.cpp:289 -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:364 -======= #: src/slic3r/GUI/FirmwareDialog.cpp:813 msgid "Select a file" msgstr "" @@ -3062,7 +1885,6 @@ msgstr "" #: src/slic3r/GUI/FirmwareDialog.cpp:815 #: src/slic3r/GUI/PhysicalPrinterDialog.cpp:297 #: src/slic3r/GUI/PhysicalPrinterDialog.cpp:372 ->>>>>>> master msgid "Browse" msgstr "Обзор" @@ -3094,16 +1916,11 @@ msgstr "Готово" msgid "Advanced: Output log" msgstr "Дополнительно: журнал вывода" -<<<<<<< HEAD -#: src/slic3r/GUI/FirmwareDialog.cpp:852 src/slic3r/GUI/Mouse3DController.cpp:551 -#: src/slic3r/GUI/PrintHostDialogs.cpp:189 -======= #: src/slic3r/GUI/FirmwareDialog.cpp:862 #: src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:310 #: src/slic3r/GUI/Mouse3DController.cpp:543 #: src/slic3r/GUI/PrintHostDialogs.cpp:261 #: src/slic3r/GUI/SendSystemInfoDialog.cpp:122 ->>>>>>> master msgid "Close" msgstr "Закрыть" @@ -3123,135 +1940,6 @@ msgstr "Подтверждение" msgid "Cancelling..." msgstr "Отмена..." -<<<<<<< HEAD -#: src/slic3r/GUI/GCodeViewer.cpp:239 -msgid "Tool position" -msgstr "Положение инÑтрумента" - -#: src/slic3r/GUI/GCodeViewer.cpp:1016 -msgid "Generating toolpaths" -msgstr "Создание траекторий инÑтрумента" - -#: src/slic3r/GUI/GCodeViewer.cpp:1405 -msgid "Generating vertex buffer" -msgstr "Ð“ÐµÐ½ÐµÑ€Ð°Ñ†Ð¸Ñ Ð±ÑƒÑ„ÐµÑ€Ð° вершин" - -#: src/slic3r/GUI/GCodeViewer.cpp:1496 -msgid "Generating index buffers" -msgstr "Ð“ÐµÐ½ÐµÑ€Ð°Ñ†Ð¸Ñ Ð±ÑƒÑ„ÐµÑ€Ð¾Ð² индекÑа" - -#: src/slic3r/GUI/GCodeViewer.cpp:2225 -msgid "Click to hide" -msgstr "Ðажмите, чтобы Ñкрыть" - -#: src/slic3r/GUI/GCodeViewer.cpp:2225 -msgid "Click to show" -msgstr "Ðажмите, чтобы отобразить" - -#: src/slic3r/GUI/GCodeViewer.cpp:2337 -msgid "up to" -msgstr "до" - -#: src/slic3r/GUI/GCodeViewer.cpp:2343 -msgid "above" -msgstr "поÑле" - -#: src/slic3r/GUI/GCodeViewer.cpp:2351 -msgid "from" -msgstr "из" - -#: src/slic3r/GUI/GCodeViewer.cpp:2351 -msgid "to" -msgstr "в" - -#: src/slic3r/GUI/GCodeViewer.cpp:2379 src/slic3r/GUI/GCodeViewer.cpp:2387 -#: src/slic3r/GUI/GUI_Preview.cpp:214 src/slic3r/GUI/GUI_Preview.cpp:533 -#: src/slic3r/GUI/GUI_Preview.cpp:942 -msgid "Feature type" -msgstr "Типы линий" - -#: src/slic3r/GUI/GCodeViewer.cpp:2379 src/slic3r/GUI/GCodeViewer.cpp:2387 -#: src/slic3r/GUI/RammingChart.cpp:76 -msgid "Time" -msgstr "ВремÑ" - -#: src/slic3r/GUI/GCodeViewer.cpp:2387 -msgid "Percentage" -msgstr "Процент" - -#: src/slic3r/GUI/GCodeViewer.cpp:2390 -msgid "Height (mm)" -msgstr "Ð’Ñ‹Ñота (мм)" - -#: src/slic3r/GUI/GCodeViewer.cpp:2391 -msgid "Width (mm)" -msgstr "Ширина (мм)" - -#: src/slic3r/GUI/GCodeViewer.cpp:2392 -msgid "Speed (mm/s)" -msgstr "СкороÑÑ‚ÑŒ (мм/Ñ)" - -#: src/slic3r/GUI/GCodeViewer.cpp:2393 -msgid "Fan Speed (%)" -msgstr "СкороÑÑ‚ÑŒ вентилÑтора (%)" - -#: src/slic3r/GUI/GCodeViewer.cpp:2394 -msgid "Volumetric flow rate (mm³/s)" -msgstr "Объёмный раÑход (мм³/Ñ)" - -#: src/slic3r/GUI/GCodeViewer.cpp:2395 src/slic3r/GUI/GUI_Preview.cpp:220 -#: src/slic3r/GUI/GUI_Preview.cpp:326 src/slic3r/GUI/GUI_Preview.cpp:471 -#: src/slic3r/GUI/GUI_Preview.cpp:532 src/slic3r/GUI/GUI_Preview.cpp:878 -#: src/slic3r/GUI/GUI_Preview.cpp:942 -msgid "Tool" -msgstr "ИнÑтрумент" - -#: src/slic3r/GUI/GCodeViewer.cpp:2396 src/slic3r/GUI/GUI_Preview.cpp:221 -#: src/slic3r/GUI/GUI_Preview.cpp:530 src/slic3r/GUI/GUI_Preview.cpp:941 -msgid "Color Print" -msgstr "Цвет печати" - -#: src/slic3r/GUI/GCodeViewer.cpp:2432 src/slic3r/GUI/GCodeViewer.cpp:2467 -#: src/slic3r/GUI/GCodeViewer.cpp:2472 src/slic3r/GUI/GUI_ObjectList.cpp:312 -#: src/slic3r/GUI/wxExtensions.cpp:519 src/libslic3r/PrintConfig.cpp:547 -msgid "Extruder" -msgstr "ÐкÑтрудер" - -#: src/slic3r/GUI/GCodeViewer.cpp:2443 -msgid "Default color" -msgstr "Цвет по умолчанию" - -#: src/slic3r/GUI/GCodeViewer.cpp:2467 -msgid "default color" -msgstr "цвет по умолчанию" - -#: src/slic3r/GUI/GCodeViewer.cpp:2562 src/slic3r/GUI/GCodeViewer.cpp:2608 -msgid "Color change" -msgstr "Смена цвета" - -#: src/slic3r/GUI/GCodeViewer.cpp:2581 src/slic3r/GUI/GCodeViewer.cpp:2606 -msgid "Print" -msgstr "Печать" - -#: src/slic3r/GUI/GCodeViewer.cpp:2607 src/slic3r/GUI/GCodeViewer.cpp:2624 -msgid "Pause" -msgstr "Пауза" - -#: src/slic3r/GUI/GCodeViewer.cpp:2612 src/slic3r/GUI/GCodeViewer.cpp:2615 -msgid "Event" -msgstr "Событие" - -#: src/slic3r/GUI/GCodeViewer.cpp:2612 src/slic3r/GUI/GCodeViewer.cpp:2615 -msgid "Remaining time" -msgstr "Точное Ð²Ñ€ÐµÐ¼Ñ Ð¿ÐµÑ‡Ð°Ñ‚Ð¸" - -#: src/slic3r/GUI/GCodeViewer.cpp:2615 -msgid "Duration" -msgstr "ПродолжительноÑÑ‚ÑŒ" - -#: src/slic3r/GUI/GCodeViewer.cpp:2650 src/slic3r/GUI/GUI_Preview.cpp:1023 -#: src/libslic3r/PrintConfig.cpp:2380 -======= #: src/slic3r/GUI/GalleryDialog.cpp:69 src/slic3r/GUI/MainFrame.cpp:1397 msgid "Shape Gallery" msgstr "Библиотека фигур" @@ -3452,259 +2140,9 @@ msgstr "ПродолжительноÑÑ‚ÑŒ" #: src/slic3r/GUI/GCodeViewer.cpp:3610 src/slic3r/GUI/GUI_Preview.cpp:1049 #: src/libslic3r/PrintConfig.cpp:2887 ->>>>>>> master msgid "Travel" msgstr "СкороÑÑ‚ÑŒ перемещение по XY" -<<<<<<< HEAD -#: src/slic3r/GUI/GCodeViewer.cpp:2653 -msgid "Movement" -msgstr "Перемещение" - -#: src/slic3r/GUI/GCodeViewer.cpp:2654 -msgid "Extrusion" -msgstr "ÐкÑтрузиÑ" - -#: src/slic3r/GUI/GCodeViewer.cpp:2655 src/slic3r/GUI/Tab.cpp:1694 -#: src/slic3r/GUI/Tab.cpp:2582 -msgid "Retraction" -msgstr "Ретракт (втÑгивание)" - -#: src/slic3r/GUI/GCodeViewer.cpp:2672 src/slic3r/GUI/GCodeViewer.cpp:2675 -#: src/slic3r/GUI/GUI_Preview.cpp:1024 -msgid "Wipe" -msgstr "ОчиÑтка" - -#: src/slic3r/GUI/GCodeViewer.cpp:2706 src/slic3r/GUI/GUI_Preview.cpp:248 -#: src/slic3r/GUI/GUI_Preview.cpp:262 -msgid "Options" -msgstr "Опции" - -#: src/slic3r/GUI/GCodeViewer.cpp:2709 src/slic3r/GUI/GUI_Preview.cpp:1025 -msgid "Retractions" -msgstr "Ретракт" - -#: src/slic3r/GUI/GCodeViewer.cpp:2710 src/slic3r/GUI/GUI_Preview.cpp:1026 -msgid "Deretractions" -msgstr "Подача (выдавливание)" - -#: src/slic3r/GUI/GCodeViewer.cpp:2711 src/slic3r/GUI/GUI_Preview.cpp:1027 -msgid "Tool changes" -msgstr "Смена инÑтрумента" - -#: src/slic3r/GUI/GCodeViewer.cpp:2712 src/slic3r/GUI/GUI_Preview.cpp:1028 -msgid "Color changes" -msgstr "Смена цвета" - -#: src/slic3r/GUI/GCodeViewer.cpp:2713 src/slic3r/GUI/GUI_Preview.cpp:1029 -msgid "Print pauses" -msgstr "Паузы печати" - -#: src/slic3r/GUI/GCodeViewer.cpp:2714 src/slic3r/GUI/GUI_Preview.cpp:1030 -msgid "Custom G-codes" -msgstr "ПользовательÑкий G-код" - -#: src/slic3r/GUI/GCodeViewer.cpp:2725 src/slic3r/GUI/GCodeViewer.cpp:2749 -#: src/slic3r/GUI/Plater.cpp:697 src/libslic3r/PrintConfig.cpp:117 -msgid "Printer" -msgstr "Профиль принтера" - -#: src/slic3r/GUI/GCodeViewer.cpp:2727 src/slic3r/GUI/GCodeViewer.cpp:2754 -#: src/slic3r/GUI/Plater.cpp:693 -msgid "Print settings" -msgstr "Профиль печати" - -#: src/slic3r/GUI/GCodeViewer.cpp:2730 src/slic3r/GUI/GCodeViewer.cpp:2760 -#: src/slic3r/GUI/Plater.cpp:694 src/slic3r/GUI/Tab.cpp:1794 -#: src/slic3r/GUI/Tab.cpp:1795 -msgid "Filament" -msgstr "Профиль прутка" - -#: src/slic3r/GUI/GCodeViewer.cpp:2785 src/slic3r/GUI/GCodeViewer.cpp:2790 -#: src/slic3r/GUI/Plater.cpp:242 src/slic3r/GUI/Plater.cpp:1135 -#: src/slic3r/GUI/Plater.cpp:1220 -msgid "Estimated printing time" -msgstr "РаÑчётное Ð²Ñ€ÐµÐ¼Ñ Ð¿ÐµÑ‡Ð°Ñ‚Ð¸" - -#: src/slic3r/GUI/GCodeViewer.cpp:2785 -msgid "Normal mode" -msgstr "Ðормальный режим" - -#: src/slic3r/GUI/GCodeViewer.cpp:2790 -msgid "Stealth mode" -msgstr "Тихий режим" - -#: src/slic3r/GUI/GCodeViewer.cpp:2817 -msgid "Show stealth mode" -msgstr "Показать в тихом режиме" - -#: src/slic3r/GUI/GCodeViewer.cpp:2821 -msgid "Show normal mode" -msgstr "Показать в нормальном режиме" - -#: src/slic3r/GUI/GLCanvas3D.cpp:236 src/slic3r/GUI/GLCanvas3D.cpp:4610 -msgid "Variable layer height" -msgstr "ÐŸÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ Ð²Ñ‹Ñота Ñлоёв" - -#: src/slic3r/GUI/GLCanvas3D.cpp:238 -msgid "Left mouse button:" -msgstr "Ð›ÐµÐ²Ð°Ñ ÐºÐ½Ð¾Ð¿ÐºÐ° мыши:" - -#: src/slic3r/GUI/GLCanvas3D.cpp:240 -msgid "Add detail" -msgstr "Увеличить детализацию" - -#: src/slic3r/GUI/GLCanvas3D.cpp:242 -msgid "Right mouse button:" -msgstr "ÐŸÑ€Ð°Ð²Ð°Ñ ÐºÐ½Ð¾Ð¿ÐºÐ° мыши:" - -#: src/slic3r/GUI/GLCanvas3D.cpp:244 -msgid "Remove detail" -msgstr "Уменьшить детализацию" - -#: src/slic3r/GUI/GLCanvas3D.cpp:246 -msgid "Shift + Left mouse button:" -msgstr "Shift + Ð›ÐµÐ²Ð°Ñ ÐºÐ½Ð¾Ð¿ÐºÐ° мыши:" - -#: src/slic3r/GUI/GLCanvas3D.cpp:248 -msgid "Reset to base" -msgstr "Ð¡Ð±Ñ€Ð¾Ñ Ð´Ð¾ базовой выÑоты ÑлоÑ" - -#: src/slic3r/GUI/GLCanvas3D.cpp:250 -msgid "Shift + Right mouse button:" -msgstr "Shift + ÐŸÑ€Ð°Ð²Ð°Ñ ÐºÐ½Ð¾Ð¿ÐºÐ° мыши:" - -#: src/slic3r/GUI/GLCanvas3D.cpp:252 -msgid "Smoothing" -msgstr "Сглаживание" - -#: src/slic3r/GUI/GLCanvas3D.cpp:254 -msgid "Mouse wheel:" -msgstr "КолеÑо мыши:" - -#: src/slic3r/GUI/GLCanvas3D.cpp:256 -msgid "Increase/decrease edit area" -msgstr "Увелич. /уменьш. облаÑти редактированиÑ" - -#: src/slic3r/GUI/GLCanvas3D.cpp:259 -msgid "Adaptive" -msgstr "ÐдаптивнаÑ" - -#: src/slic3r/GUI/GLCanvas3D.cpp:265 -msgid "Quality / Speed" -msgstr "КачеÑтво / СкороÑÑ‚ÑŒ" - -#: src/slic3r/GUI/GLCanvas3D.cpp:268 -msgid "Higher print quality versus higher print speed." -msgstr "Выбор между выÑоким качеÑтвом печати или выÑокой ÑкороÑтью." - -#: src/slic3r/GUI/GLCanvas3D.cpp:279 -msgid "Smooth" -msgstr "Сгладить" - -#: src/slic3r/GUI/GLCanvas3D.cpp:285 src/libslic3r/PrintConfig.cpp:571 -msgid "Radius" -msgstr "РадиуÑ" - -#: src/slic3r/GUI/GLCanvas3D.cpp:295 -msgid "Keep min" -msgstr "СохранÑÑ‚ÑŒ минимумы" - -#: src/slic3r/GUI/GLCanvas3D.cpp:304 src/slic3r/GUI/GLCanvas3D.cpp:4050 -msgid "Reset" -msgstr "СброÑ" - -#: src/slic3r/GUI/GLCanvas3D.cpp:566 -msgid "Variable layer height - Manual edit" -msgstr "ÐŸÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ Ð²Ñ‹Ñота Ñлоёв - Ручное редактирование" - -#: src/slic3r/GUI/GLCanvas3D.cpp:634 -msgid "An object outside the print area was detected." -msgstr "Обнаружена модель вне облаÑти печати." - -#: src/slic3r/GUI/GLCanvas3D.cpp:635 -msgid "A toolpath outside the print area was detected." -msgstr "Ð¢Ñ€Ð°ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð´Ð²Ð¸Ð¶ÐµÐ½Ð¸Ñ Ð¸Ð½Ñтрумента выходит за пределы облаÑти печати." - -#: src/slic3r/GUI/GLCanvas3D.cpp:636 -msgid "SLA supports outside the print area were detected." -msgstr "Обнаружены SLA поддержки вне облаÑти печати." - -#: src/slic3r/GUI/GLCanvas3D.cpp:637 -msgid "Some objects are not visible." -msgstr "Ðекоторые модели не отображаютÑÑ." - -#: src/slic3r/GUI/GLCanvas3D.cpp:639 -msgid "" -"An object outside the print area was detected.\n" -"Resolve the current problem to continue slicing." -msgstr "" -"Обнаружена модель вне облаÑти печати. \n" -"Решите текущую проблему, чтобы продолжить нарезку." - -#: src/slic3r/GUI/GLCanvas3D.cpp:949 -msgid "Seq." -msgstr "ОчерёдноÑÑ‚ÑŒ печати" - -#: src/slic3r/GUI/GLCanvas3D.cpp:1455 -msgid "Variable layer height - Reset" -msgstr "ÐŸÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ Ð²Ñ‹Ñота Ñлоёв - СброÑ" - -#: src/slic3r/GUI/GLCanvas3D.cpp:1463 -msgid "Variable layer height - Adaptive" -msgstr "ÐŸÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ Ð²Ñ‹Ñота Ñлоёв - ÐдаптивнаÑ" - -#: src/slic3r/GUI/GLCanvas3D.cpp:1471 -msgid "Variable layer height - Smooth all" -msgstr "ÐŸÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ Ð²Ñ‹Ñота Ñлоёв - Сгладить вÑÑ‘" - -#: src/slic3r/GUI/GLCanvas3D.cpp:1876 -msgid "Mirror Object" -msgstr "Отражение модели" - -#: src/slic3r/GUI/GLCanvas3D.cpp:2746 src/slic3r/GUI/Gizmos/GLGizmosManager.cpp:520 -msgid "Gizmo-Move" -msgstr "Гизмо перемещениÑ" - -#: src/slic3r/GUI/GLCanvas3D.cpp:2832 src/slic3r/GUI/Gizmos/GLGizmosManager.cpp:522 -msgid "Gizmo-Rotate" -msgstr "Гизмо поворота" - -#: src/slic3r/GUI/GLCanvas3D.cpp:3388 -msgid "Move Object" -msgstr "Перемещение модели" - -#: src/slic3r/GUI/GLCanvas3D.cpp:3858 src/slic3r/GUI/GLCanvas3D.cpp:4571 -msgid "Switch to Settings" -msgstr "Переключение наÑтроек" - -#: src/slic3r/GUI/GLCanvas3D.cpp:3859 src/slic3r/GUI/GLCanvas3D.cpp:4571 -msgid "Print Settings Tab" -msgstr "Вкладка наÑтройки печати" - -#: src/slic3r/GUI/GLCanvas3D.cpp:3860 src/slic3r/GUI/GLCanvas3D.cpp:4572 -msgid "Filament Settings Tab" -msgstr "Вкладка наÑтройки прутка" - -#: src/slic3r/GUI/GLCanvas3D.cpp:3860 src/slic3r/GUI/GLCanvas3D.cpp:4572 -msgid "Material Settings Tab" -msgstr "Вкладка наÑтройки материала" - -#: src/slic3r/GUI/GLCanvas3D.cpp:3861 src/slic3r/GUI/GLCanvas3D.cpp:4573 -msgid "Printer Settings Tab" -msgstr "Вкладка наÑтройки принтера" - -#: src/slic3r/GUI/GLCanvas3D.cpp:3909 -msgid "Undo History" -msgstr "ИÑÑ‚Ð¾Ñ€Ð¸Ñ Ð¾Ñ‚Ð¼ÐµÐ½" - -#: src/slic3r/GUI/GLCanvas3D.cpp:3909 -msgid "Redo History" -msgstr "ИÑÑ‚Ð¾Ñ€Ð¸Ñ Ð¿Ð¾Ð²Ñ‚Ð¾Ñ€Ð¾Ð²" - -#: src/slic3r/GUI/GLCanvas3D.cpp:3930 -#, c-format -======= #: src/slic3r/GUI/GCodeViewer.cpp:3613 msgid "Movement" msgstr "Перемещение" @@ -3944,163 +2382,20 @@ msgstr "ИÑÑ‚Ð¾Ñ€Ð¸Ñ Ð¿Ð¾Ð²Ñ‚Ð¾Ñ€Ð¾Ð²" #: src/slic3r/GUI/GLCanvas3D.cpp:3936 #, c-format, boost-format ->>>>>>> master msgid "Undo %1$d Action" msgid_plural "Undo %1$d Actions" msgstr[0] "Отмена %1$d дейÑтвиÑ" msgstr[1] "Отмена %1$d дейÑтвий" msgstr[2] "Отмена %1$d дейÑтвий" -<<<<<<< HEAD -#: src/slic3r/GUI/GLCanvas3D.cpp:3930 -#, c-format -======= #: src/slic3r/GUI/GLCanvas3D.cpp:3936 #, c-format, boost-format ->>>>>>> master msgid "Redo %1$d Action" msgid_plural "Redo %1$d Actions" msgstr[0] "Повтор %1$d дейÑтвиÑ" msgstr[1] "Повтор %1$d дейÑтвий" msgstr[2] "Повтор %1$d дейÑтвий" -<<<<<<< HEAD -#: src/slic3r/GUI/GLCanvas3D.cpp:3950 src/slic3r/GUI/GLCanvas3D.cpp:4589 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:98 src/slic3r/GUI/Search.cpp:351 -msgid "Search" -msgstr "ПоиÑк" - -#: src/slic3r/GUI/GLCanvas3D.cpp:3964 src/slic3r/GUI/GLCanvas3D.cpp:3972 -#: src/slic3r/GUI/Search.cpp:358 -msgid "Enter a search term" -msgstr "Ввод поиÑкового запроÑа" - -#: src/slic3r/GUI/GLCanvas3D.cpp:4003 -msgid "Arrange options" -msgstr "Параметры раÑÑтановки" - -#: src/slic3r/GUI/GLCanvas3D.cpp:4033 -msgid "Press %1%left mouse button to enter the exact value" -msgstr "Ðажмите %1% левую кнопку мыши Ð´Ð»Ñ Ð²Ð²Ð¾Ð´Ð° точного значениÑ" - -#: src/slic3r/GUI/GLCanvas3D.cpp:4035 -msgid "Spacing" -msgstr "РаÑÑтоÑние" - -#: src/slic3r/GUI/GLCanvas3D.cpp:4042 -msgid "Enable rotations (slow)" -msgstr "Разрешить вращение (замедление)" - -#: src/slic3r/GUI/GLCanvas3D.cpp:4060 src/slic3r/GUI/GLCanvas3D.cpp:4481 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:120 src/slic3r/GUI/Plater.cpp:1648 -msgid "Arrange" -msgstr "РаÑÑтавить" - -#: src/slic3r/GUI/GLCanvas3D.cpp:4455 -msgid "Add..." -msgstr "Добавить..." - -#: src/slic3r/GUI/GLCanvas3D.cpp:4463 src/slic3r/GUI/GUI_ObjectList.cpp:1878 -#: src/slic3r/GUI/Plater.cpp:3998 src/slic3r/GUI/Plater.cpp:4022 -#: src/slic3r/GUI/Tab.cpp:3484 -msgid "Delete" -msgstr "Удалить" - -#: src/slic3r/GUI/GLCanvas3D.cpp:4472 src/slic3r/GUI/KBShortcutsDialog.cpp:88 -#: src/slic3r/GUI/Plater.cpp:5107 -msgid "Delete all" -msgstr "Удалить вÑÑ‘" - -#: src/slic3r/GUI/GLCanvas3D.cpp:4481 src/slic3r/GUI/KBShortcutsDialog.cpp:121 -msgid "Arrange selection" -msgstr "РаÑÑтавить только выбранные модели" - -#: src/slic3r/GUI/GLCanvas3D.cpp:4481 -msgid "Click right mouse button to show arrangement options" -msgstr "ÐŸÑ€Ð°Ð²Ð°Ñ ÐºÐ½Ð¾Ð¿ÐºÑƒ мыши, чтобы отобразить параметры раÑÑтановки" - -#: src/slic3r/GUI/GLCanvas3D.cpp:4503 -msgid "Copy" -msgstr "Копировать" - -#: src/slic3r/GUI/GLCanvas3D.cpp:4512 -msgid "Paste" -msgstr "Ð’Ñтавить" - -#: src/slic3r/GUI/GLCanvas3D.cpp:4524 src/slic3r/GUI/Plater.cpp:3857 -#: src/slic3r/GUI/Plater.cpp:3869 src/slic3r/GUI/Plater.cpp:4007 -msgid "Add instance" -msgstr "Добавить копию" - -#: src/slic3r/GUI/GLCanvas3D.cpp:4535 src/slic3r/GUI/Plater.cpp:4009 -msgid "Remove instance" -msgstr "Удалить копию" - -#: src/slic3r/GUI/GLCanvas3D.cpp:4548 -msgid "Split to objects" -msgstr "Разделить на модели" - -#: src/slic3r/GUI/GLCanvas3D.cpp:4558 src/slic3r/GUI/GUI_ObjectList.cpp:1650 -msgid "Split to parts" -msgstr "Разделить на чаÑти" - -#: src/slic3r/GUI/GLCanvas3D.cpp:4660 src/slic3r/GUI/KBShortcutsDialog.cpp:89 -#: src/slic3r/GUI/MainFrame.cpp:1125 -msgid "Undo" -msgstr "Отмена дейÑтвиÑ" - -#: src/slic3r/GUI/GLCanvas3D.cpp:4660 src/slic3r/GUI/GLCanvas3D.cpp:4699 -msgid "Click right mouse button to open/close History" -msgstr "ÐŸÑ€Ð°Ð²Ð°Ñ ÐºÐ½Ð¾Ð¿ÐºÑƒ мыши, чтобы показать/Ñкрыть иÑторию дейÑтвий" - -#: src/slic3r/GUI/GLCanvas3D.cpp:4683 -msgid "Next Undo action: %1%" -msgstr "Следующее дейÑтвие отмены: %1%" - -#: src/slic3r/GUI/GLCanvas3D.cpp:4699 src/slic3r/GUI/KBShortcutsDialog.cpp:90 -#: src/slic3r/GUI/MainFrame.cpp:1128 -msgid "Redo" -msgstr "Повтор дейÑтвиÑ" - -#: src/slic3r/GUI/GLCanvas3D.cpp:4721 -msgid "Next Redo action: %1%" -msgstr "Следующее дейÑтвие повтора: %1%" - -#: src/slic3r/GUI/GLCanvas3D.cpp:6345 -msgid "Selection-Add from rectangle" -msgstr "Выбор\\Добавление из прÑмоугольника" - -#: src/slic3r/GUI/GLCanvas3D.cpp:6364 -msgid "Selection-Remove from rectangle" -msgstr "Выбор\\Удаление из прÑмоугольника" - -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:54 src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:151 -#: src/libslic3r/PrintConfig.cpp:3690 -msgid "Cut" -msgstr "Разрезать" - -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:179 -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:341 -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:418 -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:486 -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:487 -msgid "in" -msgstr "дюйм" - -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:185 -msgid "Keep upper part" -msgstr "ОÑтавить верхнюю чаÑÑ‚ÑŒ" - -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:186 -msgid "Keep lower part" -msgstr "ОÑтавить нижнюю чаÑÑ‚ÑŒ" - -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:187 -msgid "Rotate lower part upwards" -msgstr "Развернуть нижнюю чаÑÑ‚ÑŒ" - -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:192 -======= #: src/slic3r/GUI/GLCanvas3D.cpp:3956 src/slic3r/GUI/GLCanvas3D.cpp:4606 #: src/slic3r/GUI/KBShortcutsDialog.cpp:106 src/slic3r/GUI/Search.cpp:435 msgid "Search" @@ -4252,7 +2547,6 @@ msgid "Rotate lower part upwards" msgstr "Развернуть нижнюю чаÑÑ‚ÑŒ" #: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:201 ->>>>>>> master msgid "Perform cut" msgstr "Выполнить разрез" @@ -4262,28 +2556,18 @@ msgid "Paint-on supports" msgstr "РиÑование поддержек" #: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:42 -<<<<<<< HEAD -#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:49 src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:25 -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:57 -======= #: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:39 #: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:112 #: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:31 #: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:49 ->>>>>>> master msgid "Clipping of view" msgstr "ОтÑечение вида" #: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:43 -<<<<<<< HEAD -#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:50 src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:26 -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:58 -======= #: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:40 #: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:111 #: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:32 #: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:50 ->>>>>>> master msgid "Reset direction" msgstr "Ð¡Ð±Ñ€Ð¾Ñ Ð½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ" @@ -4345,56 +2629,6 @@ msgid "Circle" msgstr "Круг" #: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:54 -<<<<<<< HEAD -#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:37 src/slic3r/GUI/GUI_ObjectList.cpp:1595 -msgid "Sphere" -msgstr "Сфера" - -#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:129 -msgid "Autoset by angle" -msgstr "ÐвтоуÑтановка по углу" - -#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:136 -#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:118 -msgid "Reset selection" -msgstr "Ð¡Ð±Ñ€Ð¾Ñ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ð¾Ð³Ð¾" - -#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:160 -#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:141 -msgid "Alt + Mouse wheel" -msgstr "Alt + КолеÑо мыши" - -#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:178 -#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:159 -msgid "Paints all facets inside, regardless of their orientation." -msgstr "Закрашивает вÑе грани внутри, незавиÑимо от их ориентации." - -#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:192 -#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:173 -msgid "Ignores facets facing away from the camera." -msgstr "Игнорирует грани, обращённые в Ñторону от камеры." - -#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:225 -#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:203 -msgid "Ctrl + Mouse wheel" -msgstr "Ctrl + КолеÑо мыши" - -#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:233 -msgid "Autoset custom supports" -msgstr "ÐвтоуÑтановка пользовательÑких поддержек" - -#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:235 -msgid "Threshold:" -msgstr "Порог:" - -#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:242 -msgid "Enforce" -msgstr "ПринудительнаÑ" - -#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:245 -msgid "Block" -msgstr "Блокировка" -======= #: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:123 #: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:43 #: src/slic3r/GUI/GUI_Factories.cpp:461 @@ -4507,7 +2741,6 @@ msgstr "Во Ð²Ñ€ÐµÐ¼Ñ Ð¾ÐºÑ€Ð°ÑˆÐ¸Ð²Ð°Ð½Ð¸Ñ Ð¼Ð¾Ð´ÐµÐ»Ð¸, делит боль #: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:170 msgid "Ctrl + Mouse wheel" msgstr "Ctrl + КолеÑо мыши" ->>>>>>> master #: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:313 #: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:488 @@ -4543,13 +2776,6 @@ msgstr "ПредпроÑмотр полоÑти и отверÑтий в модРmsgid "Offset" msgstr "Смещение" -<<<<<<< HEAD -#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:43 src/slic3r/GUI/Jobs/SLAImportJob.cpp:56 -msgid "Quality" -msgstr "КачеÑтво" - -#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:44 src/libslic3r/PrintConfig.cpp:3183 -======= #: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:33 #: src/slic3r/GUI/Jobs/SLAImportJob.cpp:57 msgid "Quality" @@ -4557,7 +2783,6 @@ msgstr "КачеÑтво" #: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:34 #: src/libslic3r/PrintConfig.cpp:3759 ->>>>>>> master msgid "Closing distance" msgstr "РаÑÑтоÑние ÑÐ¼Ñ‹ÐºÐ°Ð½Ð¸Ñ Ð¿Ð¾Ð»Ð¾Ñти" @@ -4604,8 +2829,6 @@ msgstr "ПуÑÑ‚Ð¾Ñ‚ÐµÐ»Ð°Ñ Ð¼Ð¾Ð´ÐµÐ»ÑŒ и отверÑтиÑ" #: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:810 msgid "Move drainage hole" msgstr "Перемещение отверÑтиÑ" -<<<<<<< HEAD -======= #: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:27 #, boost-format @@ -4643,7 +2866,6 @@ msgstr "ОчиÑтить вÑÑ‘" #: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:129 msgid "Bucket fill" msgstr "Заливка" ->>>>>>> master #: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:404 msgid "Paints neighboring facets that have the same color." @@ -4662,19 +2884,6 @@ msgstr "Окрашено Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ ÑкÑтрудера %1%" msgid "Move" msgstr "Перемещение" -<<<<<<< HEAD -#: src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp:461 -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:527 -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:546 -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:562 src/libslic3r/PrintConfig.cpp:3739 -msgid "Rotate" -msgstr "Поворот" - -#: src/slic3r/GUI/Gizmos/GLGizmoScale.cpp:78 -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:238 -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:547 -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:563 src/libslic3r/PrintConfig.cpp:3754 -======= #: src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp:466 #: src/slic3r/GUI/GUI_ObjectManipulation.cpp:543 #: src/slic3r/GUI/GUI_ObjectManipulation.cpp:562 @@ -4697,7 +2906,6 @@ msgstr "Применить" #: src/slic3r/GUI/GUI_ObjectManipulation.cpp:563 #: src/slic3r/GUI/GUI_ObjectManipulation.cpp:579 #: src/libslic3r/PrintConfig.cpp:4395 ->>>>>>> master msgid "Scale" msgstr "МаÑштаб" @@ -4715,15 +2923,6 @@ msgstr "Блокировка шва" msgid "Seam painting" msgstr "РиÑование шва" -<<<<<<< HEAD -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:47 -msgid "Head diameter" -msgstr "Диаметр ноÑика поддержки" - -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:48 -msgid "Lock supports under new islands" -msgstr "Блокировка поддержки под новые оÑтрова" -======= #: src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:67 msgid "Mesh name" msgstr "Ð˜Ð¼Ñ Ñетки" @@ -4744,7 +2943,6 @@ msgid "" msgstr "" "Обработка модели '%1%' Ñ Ð±Ð¾Ð»ÐµÐµ чем 1 млн треугольников может быть медленной. " "ÐаÑтоÑтельно рекомендуетÑÑ ÑƒÐ¼ÐµÐ½ÑŒÑˆÐ¸Ñ‚ÑŒ количеÑтво треугольников." ->>>>>>> master #: src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:116 #: src/slic3r/GUI/GUI_Factories.cpp:705 @@ -4755,34 +2953,6 @@ msgstr "УпроÑтить полигональную Ñетку" msgid "Simplify" msgstr "Упрощение полигональной Ñетки" -<<<<<<< HEAD -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:51 -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1221 -msgid "Apply changes" -msgstr "Применить изменениÑ" - -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:52 -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1222 -msgid "Discard changes" -msgstr "Отменить изменениÑ" - -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:53 -msgid "Minimal points distance" -msgstr "Мин. раÑÑтоÑние м/у точками" - -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:54 src/libslic3r/PrintConfig.cpp:3013 -msgid "Support points density" -msgstr "ПлотноÑÑ‚ÑŒ точек поддержки" - -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:55 -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1224 -msgid "Auto-generate points" -msgstr "Сгенерировать точки автоматичеÑки" - -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:56 -msgid "Manual editing" -msgstr "Ручное редактирование" -======= #: src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:156 msgid "Simplification is currently only allowed when a single part is selected" msgstr "Ð’ наÑтоÑщее Ð²Ñ€ÐµÐ¼Ñ ÑƒÐ¿Ñ€Ð¾Ñ‰ÐµÐ½Ð¸Ðµ работает только при выборе одной модели" @@ -4808,7 +2978,6 @@ msgstr "Средний" #: src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:253 msgid "Low" msgstr "Ðизкий" ->>>>>>> master #: src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:254 msgid "Extra low" @@ -4907,29 +3076,12 @@ msgid "SLA Support Points" msgstr "Точки SLA поддержки" #: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:897 -<<<<<<< HEAD -msgid "SLA gizmo turned on" -msgstr "Гизмо SLA включено" - -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:911 -msgid "Do you want to save your manually edited support points?" -msgstr "Сохранить отредактированные вручную точки поддержки?" - -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:912 -msgid "Save changes?" -msgstr "Сохранить изменениÑ?" - -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:924 -msgid "SLA gizmo turned off" -msgstr "Гизмо SLA отключено" -======= msgid "Do you want to save your manually edited support points?" msgstr "Сохранить отредактированные вручную точки поддержки?" #: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:898 msgid "Save support points?" msgstr "Сохранить точки поддержки?" ->>>>>>> master #: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:958 msgid "Move support point" @@ -4946,16 +3098,6 @@ msgstr "ÐÐ²Ñ‚Ð¾Ð³ÐµÐ½ÐµÑ€Ð°Ñ†Ð¸Ñ Ñотрёт вÑе опорные точки #: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1132 msgid "Are you sure you want to do it?" msgstr "Ð’Ñ‹ уверены, что хотите Ñто Ñделать?" -<<<<<<< HEAD - -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1129 src/slic3r/GUI/GUI.cpp:256 -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:557 -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:581 src/slic3r/GUI/WipeTowerDialog.cpp:45 -#: src/slic3r/GUI/WipeTowerDialog.cpp:366 -msgid "Warning" -msgstr "Предупреждение" -======= ->>>>>>> master #: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1138 msgid "Autogenerate support points" @@ -4963,21 +3105,13 @@ msgstr "ÐÐ²Ñ‚Ð¾Ð³ÐµÐ½ÐµÑ€Ð°Ñ†Ð¸Ñ Ñ‚Ð¾Ñ‡ÐµÐº поддержки" #: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1186 msgid "SLA gizmo keyboard shortcuts" -<<<<<<< HEAD -msgstr "ГорÑчие клавиши \"Гизмо SLA\"" -======= msgstr "ГорÑчие клавиши «Гизмо SLA»" ->>>>>>> master #: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1197 msgid "Note: some shortcuts work in (non)editing mode only." msgstr "" -<<<<<<< HEAD -"Примечание: некоторые ÑÐ¾Ñ‡ÐµÑ‚Ð°Ð½Ð¸Ñ ÐºÐ»Ð°Ð²Ð¸Ñˆ работают только в режиме (не)редактированиÑ." -======= "Примечание: некоторые ÑÐ¾Ñ‡ÐµÑ‚Ð°Ð½Ð¸Ñ ÐºÐ»Ð°Ð²Ð¸Ñˆ работают только в режиме " "(не)редактированиÑ." ->>>>>>> master #: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1215 #: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1218 @@ -5058,33 +3192,6 @@ msgstr "Гизмо маÑштаба" msgid "Gizmo-Place on Face" msgstr "Гизмо поверхноÑтью на Ñтол" -<<<<<<< HEAD -#: src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp:39 -msgid "Entering Paint-on supports" -msgstr "Войти в режим риÑÐ¾Ð²Ð°Ð½Ð¸Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐµÐº" - -#: src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp:40 -msgid "Entering Seam painting" -msgstr "Войти в режим риÑÐ¾Ð²Ð°Ð½Ð¸Ñ ÑˆÐ²Ð°" - -#: src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp:47 -msgid "Leaving Seam painting" -msgstr "Выйти из режима риÑÐ¾Ð²Ð°Ð½Ð¸Ñ ÑˆÐ²Ð°" - -#: src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp:48 -msgid "Leaving Paint-on supports" -msgstr "Выйти из режима риÑÐ¾Ð²Ð°Ð½Ð¸Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐµÐº" - -#: src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp:371 -msgid "Add supports" -msgstr "Добавление поддержек" - -#: src/slic3r/GUI/GUI_App.cpp:239 -msgid "is based on Slic3r by Alessandro Ranellucci and the RepRap community." -msgstr "is based on Slic3r by Alessandro Ranellucci and the RepRap community." - -#: src/slic3r/GUI/GUI_App.cpp:241 -======= #: src/slic3r/GUI/Gizmos/GLGizmosManager.cpp:1270 msgid "" "You are currently editing SLA support points. Please, apply or discard your " @@ -5152,7 +3259,6 @@ msgid "Developed by Prusa Research." msgstr "Разработано Prusa Research." #: src/slic3r/GUI/GUI_App.cpp:269 ->>>>>>> master msgid "" "Contributions by Vojtech Bubnik, Enrico Turri, Oleksandra Iushchenko, Tamas " "Meszaros, Lukas Matena, Vojtech Kral, David Kocik and numerous others." @@ -5160,34 +3266,26 @@ msgstr "" "Contributions by Vojtech Bubnik, Enrico Turri, Oleksandra Iushchenko, Tamas " "Meszaros, Lukas Matena, Vojtech Kral, David Kocik and numerous others." -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_App.cpp:242 -msgid "Artwork model by Nora Al-Badri and Jan Nikolai Nelles" -msgstr "Artwork model by Nora Al-Badri and Jan Nikolai Nelles" - -#: src/slic3r/GUI/GUI_App.cpp:382 -======= #: src/slic3r/GUI/GUI_App.cpp:270 msgid "Artwork model by M Boyer" msgstr "" #: src/slic3r/GUI/GUI_App.cpp:411 #, boost-format ->>>>>>> master msgid "" -"Starting with %1% 2.3, configuration directory on Linux has changed (according to " -"XDG Base Directory Specification) to \n" +"Starting with %1% 2.3, configuration directory on Linux has changed " +"(according to XDG Base Directory Specification) to \n" "%2%.\n" "\n" -"This directory did not exist yet (maybe you run the new version for the first " -"time).\n" +"This directory did not exist yet (maybe you run the new version for the " +"first time).\n" "However, an old %1% configuration directory was detected in \n" "%3%.\n" "\n" -"Consider moving the contents of the old directory to the new location in order to " -"access your profiles, etc.\n" -"Note that if you decide to downgrade %1% in future, it will use the old location " -"again.\n" +"Consider moving the contents of the old directory to the new location in " +"order to access your profiles, etc.\n" +"Note that if you decide to downgrade %1% in future, it will use the old " +"location again.\n" "\n" "What do you want to do now?" msgstr "" @@ -5206,23 +3304,6 @@ msgstr "" "\n" "Что вы хотите ÑÐµÐ¹Ñ‡Ð°Ñ Ñделать?" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_App.cpp:390 -#, c-format -msgid "%s - BREAKING CHANGE" -msgstr "%s - КРИТИЧЕСКОЕ ИЗМЕÐЕÐИЕ" - -#: src/slic3r/GUI/GUI_App.cpp:392 -msgid "Quit, I will move my data now" -msgstr "Выйти и перенеÑти Ñвои данные" - -#: src/slic3r/GUI/GUI_App.cpp:392 -msgid "Start the application" -msgstr "ЗапуÑтить приложение" - -#: src/slic3r/GUI/GUI_App.cpp:580 -#, c-format -======= #: src/slic3r/GUI/GUI_App.cpp:419 #, c-format, boost-format msgid "%s - BREAKING CHANGE" @@ -5238,44 +3319,13 @@ msgstr "ЗапуÑтить приложение" #: src/slic3r/GUI/GUI_App.cpp:698 #, c-format, boost-format ->>>>>>> master msgid "" -"%s has encountered an error. It was likely caused by running out of memory. If you " -"are sure you have enough RAM on your system, this may also be a bug and we would be " -"glad if you reported it.\n" +"%s has encountered an error. It was likely caused by running out of memory. " +"If you are sure you have enough RAM on your system, this may also be a bug " +"and we would be glad if you reported it.\n" "\n" "The application will now terminate." msgstr "" -<<<<<<< HEAD -"При работе Ñ %s произошла Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ¾Ð¹. Скорее вÑего, Ñто было вызвано нехваткой " -"памÑти. ЕÑли вы уверены, что в вашей ÑиÑтеме доÑтаточно оперативной памÑти и " -"произошла Ñта ошибка, Ñообщите нам об Ñтом.\n" -"\n" -"Приложение будет закрыто." - -#: src/slic3r/GUI/GUI_App.cpp:583 -msgid "Fatal error" -msgstr "КритичеÑÐºÐ°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°" - -#: src/slic3r/GUI/GUI_App.cpp:587 -msgid "" -"PrusaSlicer has encountered a localization error. Please report to PrusaSlicer " -"team, what language was active and in which scenario this issue happened. Thank " -"you.\n" -"\n" -"The application will now terminate." -msgstr "" -"PrusaSlicer обнаружил непредвиденную ошибку в локализации приложениÑ. ПожалуйÑта, " -"Ñообщите команде PrusaSlicer, какой Ñзык был активен и при каком Ñценарии произошла " -"Ñта ошибка.\n" -"Теперь приложение будет закрыто." - -#: src/slic3r/GUI/GUI_App.cpp:590 -msgid "Critical error" -msgstr "КритичеÑÐºÐ°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°" - -#: src/slic3r/GUI/GUI_App.cpp:711 -======= "При работе Ñ %s произошла Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ¾Ð¹. Скорее вÑего, Ñто было вызвано " "нехваткой памÑти. ЕÑли вы уверены, что в вашей ÑиÑтеме доÑтаточно " "оперативной памÑти и произошла Ñта ошибка, Ñообщите нам об Ñтом.\n" @@ -5309,36 +3359,21 @@ msgid "Internal error: %1%" msgstr "ВнутреннÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ°: %1%" #: src/slic3r/GUI/GUI_App.cpp:901 src/slic3r/GUI/GUI_App.cpp:999 ->>>>>>> master msgid "" -"Error parsing PrusaSlicer config file, it is probably corrupted. Try to manually " -"delete the file to recover from the error. Your user profiles will not be affected." +"Error parsing PrusaSlicer config file, it is probably corrupted. Try to " +"manually delete the file to recover from the error. Your user profiles will " +"not be affected." msgstr "" -<<<<<<< HEAD -"Ошибка обработки конфигурационного файла PrusaSlicer. ВероÑтно, он повреждён. \n" -"Попробуйте вручную удалить файл Ð´Ð»Ñ Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð¾Ñле ошибки. ПользовательÑкие " -"профили не будут затронуты." - -#: src/slic3r/GUI/GUI_App.cpp:717 -======= "Ошибка обработки конфигурационного файла PrusaSlicer. ВероÑтно, он " "повреждён. \n" "Попробуйте вручную удалить файл Ð´Ð»Ñ Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð¾Ñле ошибки. " "ПользовательÑкие профили не будут затронуты." #: src/slic3r/GUI/GUI_App.cpp:907 src/slic3r/GUI/GUI_App.cpp:1005 ->>>>>>> master msgid "" "Error parsing PrusaGCodeViewer config file, it is probably corrupted. Try to " "manually delete the file to recover from the error." msgstr "" -<<<<<<< HEAD -"Ошибка обработки конфигурационного файла PrusaGCodeViewer. ВероÑтно, он повреждён. " -"Попробуйте вручную удалить файл Ð´Ð»Ñ Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð¾Ñле ошибки." - -#: src/slic3r/GUI/GUI_App.cpp:771 -#, c-format -======= "Ошибка обработки конфигурационного файла PrusaGCodeViewer. ВероÑтно, он " "повреждён. Попробуйте вручную удалить файл Ð´Ð»Ñ Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð¾Ñле ошибки." @@ -5408,7 +3443,6 @@ msgstr "" #: src/slic3r/GUI/GUI_App.cpp:1126 #, c-format, boost-format ->>>>>>> master msgid "" "%s\n" "Do you want to continue?" @@ -5416,27 +3450,6 @@ msgstr "" "%s\n" "Хотите продолжить?" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_App.cpp:773 src/slic3r/GUI/UnsavedChangesDialog.cpp:665 -msgid "Remember my choice" -msgstr "Запомнить мой выбор" - -#: src/slic3r/GUI/GUI_App.cpp:808 -msgid "Loading configuration" -msgstr "Загрузка конфигурации" - -#: src/slic3r/GUI/GUI_App.cpp:876 -msgid "Preparing settings tabs" -msgstr "Подготовка вкладок наÑтроек" - -#: src/slic3r/GUI/GUI_App.cpp:1115 -msgid "You have the following presets with saved options for \"Print Host upload\"" -msgstr "" -"У Ð²Ð°Ñ Ð¸Ð¼ÐµÑŽÑ‚ÑÑ Ñледующие профили Ñ Ñохраненными параметрами Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸ на хоÑÑ‚ " -"печати" - -#: src/slic3r/GUI/GUI_App.cpp:1119 -======= #: src/slic3r/GUI/GUI_App.cpp:1128 src/slic3r/GUI/GUI_App.cpp:3070 #: src/slic3r/GUI/Plater.cpp:1728 src/slic3r/GUI/UnsavedChangesDialog.cpp:888 msgid "Remember my choice" @@ -5507,120 +3520,21 @@ msgstr "" "хоÑÑ‚ печати" #: src/slic3r/GUI/GUI_App.cpp:1661 ->>>>>>> master msgid "" -"But since this version of PrusaSlicer we don't show this information in Printer " -"Settings anymore.\n" +"But since this version of PrusaSlicer we don't show this information in " +"Printer Settings anymore.\n" "Settings will be available in physical printers settings." msgstr "" "ÐÐ°Ñ‡Ð¸Ð½Ð°Ñ Ñ Ñтой верÑии PrusaSlicer мы больше не показываем Ñту информацию в " "наÑтройках принтера.\n" "Теперь Ñти наÑтройки будут доÑтупны в разделе наÑтройки физичеÑких принтеров." -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_App.cpp:1121 -======= #: src/slic3r/GUI/GUI_App.cpp:1663 ->>>>>>> master msgid "" -"By default new Printer devices will be named as \"Printer N\" during its creation.\n" +"By default new Printer devices will be named as \"Printer N\" during its " +"creation.\n" "Note: This name can be changed later from the physical printers settings" msgstr "" -<<<<<<< HEAD -"При Ñоздании новых принтеров они будут именоватьÑÑ ÐºÐ°Ðº \"Принтер N\".\n" -"Примечание: Ñто Ð¸Ð¼Ñ Ð¼Ð¾Ð¶Ð½Ð¾ изменить позже в наÑтройках физичеÑких принтеров" - -#: src/slic3r/GUI/GUI_App.cpp:1124 src/slic3r/GUI/PhysicalPrinterDialog.cpp:626 -msgid "Information" -msgstr "ИнформациÑ" - -#: src/slic3r/GUI/GUI_App.cpp:1137 src/slic3r/GUI/GUI_App.cpp:1148 -msgid "Recreating" -msgstr "ВоÑÑоздание" - -#: src/slic3r/GUI/GUI_App.cpp:1153 -msgid "Loading of current presets" -msgstr "Загрузка текущих профилей" - -#: src/slic3r/GUI/GUI_App.cpp:1158 -msgid "Loading of a mode view" -msgstr "Загрузка режима проÑмотра" - -#: src/slic3r/GUI/GUI_App.cpp:1234 -msgid "Choose one file (3MF/AMF):" -msgstr "Выберите один файл (3MF/AMF):" - -#: src/slic3r/GUI/GUI_App.cpp:1246 -msgid "Choose one or more files (STL/OBJ/AMF/3MF/PRUSA):" -msgstr "Выберите один или неÑколько файлов (STL/OBJ/AMF/3MF/PRUSA):" - -#: src/slic3r/GUI/GUI_App.cpp:1258 -msgid "Choose one file (GCODE/.GCO/.G/.ngc/NGC):" -msgstr "Выберите один файл (GCODE/.GCO/.G/.ngc/NGC):" - -#: src/slic3r/GUI/GUI_App.cpp:1269 -msgid "Changing of an application language" -msgstr "Изменение Ñзыка приложениÑ" - -#: src/slic3r/GUI/GUI_App.cpp:1392 -msgid "Select the language" -msgstr "Выбор Ñзыка" - -#: src/slic3r/GUI/GUI_App.cpp:1392 -msgid "Language" -msgstr "Язык" - -#: src/slic3r/GUI/GUI_App.cpp:1541 -msgid "modified" -msgstr "изменено" - -#: src/slic3r/GUI/GUI_App.cpp:1590 -#, c-format -msgid "Run %s" -msgstr "ЗапуÑтить %s" - -#: src/slic3r/GUI/GUI_App.cpp:1594 -msgid "&Configuration Snapshots" -msgstr "&Резервные копии конфигурации (Ñнапшот)" - -#: src/slic3r/GUI/GUI_App.cpp:1594 -msgid "Inspect / activate configuration snapshots" -msgstr "Проверка и Ð°ÐºÑ‚Ð¸Ð²Ð°Ñ†Ð¸Ñ Ñ€ÐµÐ·ÐµÑ€Ð²Ð½Ñ‹Ñ… копий конфигурации" - -#: src/slic3r/GUI/GUI_App.cpp:1595 -msgid "Take Configuration &Snapshot" -msgstr "Сделать &Ñнапшот" - -#: src/slic3r/GUI/GUI_App.cpp:1595 -msgid "Capture a configuration snapshot" -msgstr "Сделать резервную копию конфигурации (Ñнапшот)" - -#: src/slic3r/GUI/GUI_App.cpp:1596 -msgid "Check for updates" -msgstr "Проверить наличие обновлений" - -#: src/slic3r/GUI/GUI_App.cpp:1596 -msgid "Check for configuration updates" -msgstr "Проверка наличие обновлений конфигурации" - -#: src/slic3r/GUI/GUI_App.cpp:1599 -msgid "&Preferences" -msgstr "&ÐаÑтройки приложениÑ" - -#: src/slic3r/GUI/GUI_App.cpp:1605 -msgid "Application preferences" -msgstr "ÐаÑтройки приложениÑ" - -#: src/slic3r/GUI/GUI_App.cpp:1610 src/slic3r/GUI/wxExtensions.cpp:685 -msgid "Simple" -msgstr "ПроÑтой" - -#: src/slic3r/GUI/GUI_App.cpp:1610 -msgid "Simple View Mode" -msgstr "ПроÑтой режим проÑмотра интерфейÑа приложениÑ" - -#: src/slic3r/GUI/GUI_App.cpp:1612 src/slic3r/GUI/wxExtensions.cpp:687 -======= "При Ñоздании новых принтеров они будут именоватьÑÑ ÐºÐ°Ðº «Принтер N».\n" "Примечание: Ñто Ð¸Ð¼Ñ Ð¼Ð¾Ð¶Ð½Ð¾ изменить позже в наÑтройках физичеÑких принтеров" @@ -5714,63 +3628,10 @@ msgid "Simple View Mode" msgstr "ПроÑтой режим проÑмотра интерфейÑа приложениÑ" #: src/slic3r/GUI/GUI_App.cpp:2240 src/slic3r/GUI/wxExtensions.cpp:710 ->>>>>>> master msgctxt "Mode" msgid "Advanced" msgstr "РаÑширенный" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_App.cpp:1612 -msgid "Advanced View Mode" -msgstr "РаÑширенный режим проÑмотра интерфейÑа приложениÑ" - -#: src/slic3r/GUI/GUI_App.cpp:1613 src/slic3r/GUI/wxExtensions.cpp:688 -msgid "Expert" -msgstr "Продвинутый" - -#: src/slic3r/GUI/GUI_App.cpp:1613 -msgid "Expert View Mode" -msgstr "Продвинутый режим проÑмотра интерфейÑа приложениÑ" - -#: src/slic3r/GUI/GUI_App.cpp:1618 -msgid "Mode" -msgstr "Режим интерфейÑа" - -#: src/slic3r/GUI/GUI_App.cpp:1618 -#, c-format -msgid "%s View Mode" -msgstr "%s режим проÑмотра" - -#: src/slic3r/GUI/GUI_App.cpp:1621 -msgid "&Language" -msgstr "&Язык программы" - -#: src/slic3r/GUI/GUI_App.cpp:1624 -msgid "Flash printer &firmware" -msgstr "&Прошивка принтера" - -#: src/slic3r/GUI/GUI_App.cpp:1624 -msgid "Upload a firmware image into an Arduino based printer" -msgstr "Загрузить прошивку в принтер на оÑнове Arduino" - -#: src/slic3r/GUI/GUI_App.cpp:1640 -msgid "Taking configuration snapshot" -msgstr "Создание Ñнапшота" - -#: src/slic3r/GUI/GUI_App.cpp:1640 -msgid "Snapshot name" -msgstr "Ð˜Ð¼Ñ Ñнапшота" - -#: src/slic3r/GUI/GUI_App.cpp:1669 -msgid "Failed to activate configuration snapshot." -msgstr "Сбой активации Ñнапшота." - -#: src/slic3r/GUI/GUI_App.cpp:1719 -msgid "Language selection" -msgstr "Выбор Ñзыка" - -#: src/slic3r/GUI/GUI_App.cpp:1721 -======= #: src/slic3r/GUI/GUI_App.cpp:2240 msgid "Advanced View Mode" msgstr "РаÑширенный режим проÑмотра интерфейÑа приложениÑ" @@ -5842,7 +3703,6 @@ msgid "Language selection" msgstr "Выбор Ñзыка" #: src/slic3r/GUI/GUI_App.cpp:2369 ->>>>>>> master msgid "" "Switching the language will trigger application restart.\n" "You will lose content of the plater." @@ -5850,106 +3710,6 @@ msgstr "" "Смена Ñзыка вызовет перезапуÑк приложениÑ.\n" "Ð’Ñ‹ потерÑете Ñодержимое Ñтола." -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_App.cpp:1723 -msgid "Do you want to proceed?" -msgstr "Хотите продолжить?" - -#: src/slic3r/GUI/GUI_App.cpp:1750 -msgid "&Configuration" -msgstr "&ÐаÑтройки" - -#: src/slic3r/GUI/GUI_App.cpp:1781 -msgid "The preset(s) modifications are successfully saved" -msgstr "Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² профиле(-ÑÑ…) уÑпешно Ñохранены" - -#: src/slic3r/GUI/GUI_App.cpp:1802 -msgid "The uploads are still ongoing" -msgstr "Загрузки вÑÑ‘ ещё продолжаютÑÑ" - -#: src/slic3r/GUI/GUI_App.cpp:1802 -msgid "Stop them and continue anyway?" -msgstr "ОÑтановить их и продолжить?" - -#: src/slic3r/GUI/GUI_App.cpp:1805 -msgid "Ongoing uploads" -msgstr "Текущие загрузки" - -#: src/slic3r/GUI/GUI_App.cpp:2019 src/slic3r/GUI/Tab.cpp:3242 -msgid "It's impossible to print multi-part object(s) with SLA technology." -msgstr "По технологии SLA невозможно напечатать ÑоÑтавную модель(и)." - -#: src/slic3r/GUI/GUI_App.cpp:2020 -msgid "Please check and fix your object list." -msgstr "ПожалуйÑта, проверьте и иÑправьте ваш ÑпиÑок моделей." - -#: src/slic3r/GUI/GUI_App.cpp:2021 src/slic3r/GUI/Jobs/SLAImportJob.cpp:210 -#: src/slic3r/GUI/Plater.cpp:2359 src/slic3r/GUI/Tab.cpp:3244 -msgid "Attention!" -msgstr "Внимание!" - -#: src/slic3r/GUI/GUI_App.cpp:2038 -msgid "Select a gcode file:" -msgstr "Выбрать файл G-кода:" - -#: src/slic3r/GUI/GUI_Init.cpp:73 src/slic3r/GUI/GUI_Init.cpp:76 -msgid "PrusaSlicer GUI initialization failed" -msgstr "Ошибка инициализации графичеÑкого интерфейÑа PrusaSlicer" - -#: src/slic3r/GUI/GUI_Init.cpp:76 -msgid "Fatal error, exception catched: %1%" -msgstr "КритичеÑÐºÐ°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°, обнаружено иÑключение: %1%" - -#: src/slic3r/GUI/GUI_ObjectLayers.cpp:29 -msgid "Start at height" -msgstr "Ðачинать Ñ" - -#: src/slic3r/GUI/GUI_ObjectLayers.cpp:29 -msgid "Stop at height" -msgstr "Закончить на" - -#: src/slic3r/GUI/GUI_ObjectLayers.cpp:161 -msgid "Remove layer range" -msgstr "Удалить диапазон Ñлоёв" - -#: src/slic3r/GUI/GUI_ObjectLayers.cpp:165 -msgid "Add layer range" -msgstr "Добавить диапазон Ñлоёв" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:34 src/slic3r/GUI/GUI_ObjectList.cpp:92 -#: src/slic3r/GUI/GUI_ObjectList.cpp:667 src/libslic3r/PrintConfig.cpp:74 -#: src/libslic3r/PrintConfig.cpp:189 src/libslic3r/PrintConfig.cpp:231 -#: src/libslic3r/PrintConfig.cpp:240 src/libslic3r/PrintConfig.cpp:464 -#: src/libslic3r/PrintConfig.cpp:530 src/libslic3r/PrintConfig.cpp:538 -#: src/libslic3r/PrintConfig.cpp:970 src/libslic3r/PrintConfig.cpp:1219 -#: src/libslic3r/PrintConfig.cpp:1584 src/libslic3r/PrintConfig.cpp:1650 -#: src/libslic3r/PrintConfig.cpp:1835 src/libslic3r/PrintConfig.cpp:2302 -#: src/libslic3r/PrintConfig.cpp:2361 src/libslic3r/PrintConfig.cpp:2370 -msgid "Layers and Perimeters" -msgstr "Слои и периметры" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:36 src/slic3r/GUI/GUI_ObjectList.cpp:95 -#: src/slic3r/GUI/GUI_ObjectList.cpp:670 src/slic3r/GUI/GUI_Preview.cpp:240 -#: src/slic3r/GUI/Tab.cpp:1472 src/slic3r/GUI/Tab.cpp:1474 -#: src/libslic3r/ExtrusionEntity.cpp:320 src/libslic3r/ExtrusionEntity.cpp:352 -#: src/libslic3r/PrintConfig.cpp:426 src/libslic3r/PrintConfig.cpp:1715 -#: src/libslic3r/PrintConfig.cpp:2093 src/libslic3r/PrintConfig.cpp:2099 -#: src/libslic3r/PrintConfig.cpp:2107 src/libslic3r/PrintConfig.cpp:2119 -#: src/libslic3r/PrintConfig.cpp:2129 src/libslic3r/PrintConfig.cpp:2137 -#: src/libslic3r/PrintConfig.cpp:2152 src/libslic3r/PrintConfig.cpp:2173 -#: src/libslic3r/PrintConfig.cpp:2185 src/libslic3r/PrintConfig.cpp:2201 -#: src/libslic3r/PrintConfig.cpp:2210 src/libslic3r/PrintConfig.cpp:2219 -#: src/libslic3r/PrintConfig.cpp:2230 src/libslic3r/PrintConfig.cpp:2244 -#: src/libslic3r/PrintConfig.cpp:2252 src/libslic3r/PrintConfig.cpp:2253 -#: src/libslic3r/PrintConfig.cpp:2262 src/libslic3r/PrintConfig.cpp:2270 -#: src/libslic3r/PrintConfig.cpp:2284 -msgid "Support material" -msgstr "Поддержка" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:39 src/slic3r/GUI/GUI_ObjectList.cpp:99 -#: src/slic3r/GUI/GUI_ObjectList.cpp:674 src/libslic3r/PrintConfig.cpp:2480 -#: src/libslic3r/PrintConfig.cpp:2488 -======= #: src/slic3r/GUI/GUI_App.cpp:2371 src/slic3r/GUI/Preferences.cpp:582 msgid "Do you want to proceed?" msgstr "Хотите продолжить?" @@ -6090,7 +3850,6 @@ msgstr "Поддержка" #: src/slic3r/GUI/GUI_Factories.cpp:59 src/slic3r/GUI/GUI_Factories.cpp:135 #: src/libslic3r/PrintConfig.cpp:3004 src/libslic3r/PrintConfig.cpp:3012 ->>>>>>> master msgid "Wipe options" msgstr "Параметры очиÑтки" @@ -6098,436 +3857,6 @@ msgstr "Параметры очиÑтки" msgid "Pad and Support" msgstr "Подложка и Поддержка" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_ObjectList.cpp:51 -msgid "Add part" -msgstr "Добавить Ñлемент" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:52 -msgid "Add modifier" -msgstr "Добавить модификатор" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:53 -msgid "Add support enforcer" -msgstr "ÐŸÑ€Ð¸Ð½ÑƒÐ´Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ°" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:54 -msgid "Add support blocker" -msgstr "Блокировщик поддержки" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:94 src/slic3r/GUI/GUI_ObjectList.cpp:669 -#: src/slic3r/GUI/GUI_Preview.cpp:236 src/slic3r/GUI/Tab.cpp:1442 -#: src/libslic3r/ExtrusionEntity.cpp:316 src/libslic3r/ExtrusionEntity.cpp:344 -#: src/libslic3r/PrintConfig.cpp:1226 src/libslic3r/PrintConfig.cpp:1232 -#: src/libslic3r/PrintConfig.cpp:1246 src/libslic3r/PrintConfig.cpp:1256 -#: src/libslic3r/PrintConfig.cpp:1264 src/libslic3r/PrintConfig.cpp:1266 -msgid "Ironing" -msgstr "Разглаживание" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:96 src/slic3r/GUI/GUI_ObjectList.cpp:671 -#: src/slic3r/GUI/GUI_Preview.cpp:217 src/slic3r/GUI/Tab.cpp:1498 -#: src/libslic3r/PrintConfig.cpp:291 src/libslic3r/PrintConfig.cpp:518 -#: src/libslic3r/PrintConfig.cpp:1012 src/libslic3r/PrintConfig.cpp:1192 -#: src/libslic3r/PrintConfig.cpp:1265 src/libslic3r/PrintConfig.cpp:1640 -#: src/libslic3r/PrintConfig.cpp:1916 src/libslic3r/PrintConfig.cpp:1968 -#: src/libslic3r/PrintConfig.cpp:2346 -msgid "Speed" -msgstr "СкороÑÑ‚ÑŒ" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:97 src/slic3r/GUI/GUI_ObjectList.cpp:672 -#: src/slic3r/GUI/Tab.cpp:1534 src/slic3r/GUI/Tab.cpp:2112 -#: src/libslic3r/PrintConfig.cpp:548 src/libslic3r/PrintConfig.cpp:1146 -#: src/libslic3r/PrintConfig.cpp:1618 src/libslic3r/PrintConfig.cpp:1937 -#: src/libslic3r/PrintConfig.cpp:2165 src/libslic3r/PrintConfig.cpp:2192 -msgid "Extruders" -msgstr "ÐкÑтрудеры" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:98 src/slic3r/GUI/GUI_ObjectList.cpp:673 -#: src/libslic3r/PrintConfig.cpp:507 src/libslic3r/PrintConfig.cpp:616 -#: src/libslic3r/PrintConfig.cpp:957 src/libslic3r/PrintConfig.cpp:1154 -#: src/libslic3r/PrintConfig.cpp:1627 src/libslic3r/PrintConfig.cpp:1957 -#: src/libslic3r/PrintConfig.cpp:2174 src/libslic3r/PrintConfig.cpp:2334 -msgid "Extrusion Width" -msgstr "Ширина ÑкÑтрузии" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:102 src/slic3r/GUI/GUI_ObjectList.cpp:677 -#: src/slic3r/GUI/Tab.cpp:1428 src/slic3r/GUI/Tab.cpp:1452 src/slic3r/GUI/Tab.cpp:1555 -#: src/slic3r/GUI/Tab.cpp:1558 src/slic3r/GUI/Tab.cpp:1855 src/slic3r/GUI/Tab.cpp:2197 -#: src/slic3r/GUI/Tab.cpp:4114 src/libslic3r/PrintConfig.cpp:92 -#: src/libslic3r/PrintConfig.cpp:132 src/libslic3r/PrintConfig.cpp:279 -#: src/libslic3r/PrintConfig.cpp:1097 src/libslic3r/PrintConfig.cpp:1181 -#: src/libslic3r/PrintConfig.cpp:2504 src/libslic3r/PrintConfig.cpp:2676 -msgid "Advanced" -msgstr "Дополнительно" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:104 src/slic3r/GUI/GUI_ObjectList.cpp:679 -#: src/slic3r/GUI/Plater.cpp:357 src/slic3r/GUI/Tab.cpp:4048 -#: src/slic3r/GUI/Tab.cpp:4049 src/libslic3r/PrintConfig.cpp:2842 -#: src/libslic3r/PrintConfig.cpp:2849 src/libslic3r/PrintConfig.cpp:2858 -#: src/libslic3r/PrintConfig.cpp:2867 src/libslic3r/PrintConfig.cpp:2877 -#: src/libslic3r/PrintConfig.cpp:2887 src/libslic3r/PrintConfig.cpp:2924 -#: src/libslic3r/PrintConfig.cpp:2931 src/libslic3r/PrintConfig.cpp:2942 -#: src/libslic3r/PrintConfig.cpp:2952 src/libslic3r/PrintConfig.cpp:2961 -#: src/libslic3r/PrintConfig.cpp:2974 src/libslic3r/PrintConfig.cpp:2984 -#: src/libslic3r/PrintConfig.cpp:2993 src/libslic3r/PrintConfig.cpp:3003 -#: src/libslic3r/PrintConfig.cpp:3014 src/libslic3r/PrintConfig.cpp:3022 -msgid "Supports" -msgstr "Поддержка" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:105 src/slic3r/GUI/GUI_ObjectList.cpp:680 -#: src/slic3r/GUI/Plater.cpp:500 src/slic3r/GUI/Tab.cpp:4089 -#: src/slic3r/GUI/Tab.cpp:4090 src/slic3r/GUI/Tab.cpp:4161 -#: src/libslic3r/PrintConfig.cpp:3030 src/libslic3r/PrintConfig.cpp:3037 -#: src/libslic3r/PrintConfig.cpp:3051 src/libslic3r/PrintConfig.cpp:3062 -#: src/libslic3r/PrintConfig.cpp:3072 src/libslic3r/PrintConfig.cpp:3094 -#: src/libslic3r/PrintConfig.cpp:3105 src/libslic3r/PrintConfig.cpp:3112 -#: src/libslic3r/PrintConfig.cpp:3119 src/libslic3r/PrintConfig.cpp:3130 -#: src/libslic3r/PrintConfig.cpp:3139 src/libslic3r/PrintConfig.cpp:3148 -msgid "Pad" -msgstr "Подложка" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:106 src/slic3r/GUI/Tab.cpp:4107 -#: src/slic3r/GUI/Tab.cpp:4108 src/libslic3r/SLA/Hollowing.cpp:45 -#: src/libslic3r/SLA/Hollowing.cpp:57 src/libslic3r/SLA/Hollowing.cpp:66 -#: src/libslic3r/SLA/Hollowing.cpp:75 src/libslic3r/PrintConfig.cpp:3158 -#: src/libslic3r/PrintConfig.cpp:3165 src/libslic3r/PrintConfig.cpp:3175 -#: src/libslic3r/PrintConfig.cpp:3184 -msgid "Hollowing" -msgstr "ПолоÑÑ‚ÑŒ" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:300 src/slic3r/GUI/GUI_ObjectManipulation.cpp:161 -msgid "Name" -msgstr "Файл" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:316 src/slic3r/GUI/GUI_ObjectList.cpp:457 -msgid "Editing" -msgstr "Правка" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:402 -#, c-format -msgid "Auto-repaired (%d errors):" -msgstr "ИÑправлено ошибок: %d" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:409 -msgid "degenerate facets" -msgstr "Вырожденных граней" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:410 -msgid "edges fixed" -msgstr "Рёбер починено" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:411 -msgid "facets removed" -msgstr "Граней удалено" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:412 -msgid "facets added" -msgstr "Граней добавлено" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:413 -msgid "facets reversed" -msgstr "Граней реверÑировано" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:414 -msgid "backwards edges" -msgstr "Вывернуто рёбер" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:422 -msgid "Right button click the icon to fix STL through Netfabb" -msgstr "" -"Щёлкните правой кнопкой мыши на воÑклицательный знак, чтобы иÑправить STL Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ " -"ÑервиÑа Netfabb." - -#: src/slic3r/GUI/GUI_ObjectList.cpp:459 -msgid "Right button click the icon to change the object settings" -msgstr "Щёлкните правой кнопкой мыши на значок, чтобы изменить наÑтройки модели." - -#: src/slic3r/GUI/GUI_ObjectList.cpp:461 -msgid "Click the icon to change the object settings" -msgstr "Щёлкните кнопкой мыши на значок, чтобы изменить наÑтройки модели." - -#: src/slic3r/GUI/GUI_ObjectList.cpp:465 -msgid "Right button click the icon to change the object printable property" -msgstr "" -"Щёлкните правой кнопкой мыши на значок, чтобы разрешить\\запретить печать модели." - -#: src/slic3r/GUI/GUI_ObjectList.cpp:467 -msgid "Click the icon to change the object printable property" -msgstr "Щёлкните кнопкой мыши на значок, чтобы разрешить\\запретить печать модели." - -#: src/slic3r/GUI/GUI_ObjectList.cpp:590 -msgid "Change Extruder" -msgstr "Смена ÑкÑтрудера" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:605 -msgid "Rename Object" -msgstr "Переименование модели" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:605 -msgid "Rename Sub-object" -msgstr "Переименование подобъекта" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1247 src/slic3r/GUI/GUI_ObjectList.cpp:4372 -msgid "Instances to Separated Objects" -msgstr "ÐšÐ¾Ð¿Ð¸Ñ ÐºÐ°Ðº Ð¾Ñ‚Ð´ÐµÐ»ÑŒÐ½Ð°Ñ Ð¼Ð¾Ð´ÐµÐ»ÑŒ" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1262 -msgid "Volumes in Object reordered" -msgstr "Объёмы в модели переупорÑдочены" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1262 -msgid "Object reordered" -msgstr "Модель переупорÑдочена" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1338 src/slic3r/GUI/GUI_ObjectList.cpp:1693 -#: src/slic3r/GUI/GUI_ObjectList.cpp:1699 src/slic3r/GUI/GUI_ObjectList.cpp:2081 -#, c-format -msgid "Quick Add Settings (%s)" -msgstr "БыÑтрое добавление наÑтроек (%s)" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1428 -msgid "Select showing settings" -msgstr "Выбор параметров отображениÑ" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1477 -msgid "Add Settings for Layers" -msgstr "Добавление параметров Ð´Ð»Ñ Ñлоёв" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1478 -msgid "Add Settings for Sub-object" -msgstr "Добавление параметров Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¾Ð±ÑŠÐµÐºÑ‚Ð°" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1479 -msgid "Add Settings for Object" -msgstr "Добавление параметров Ð´Ð»Ñ Ð¼Ð¾Ð´ÐµÐ»Ð¸" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1549 -msgid "Add Settings Bundle for Height range" -msgstr "Добавление набора наÑтроек Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð¾Ð¹ выÑоты Ñлоёв" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1550 -msgid "Add Settings Bundle for Sub-object" -msgstr "Добавление набора параметров Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¾Ð±ÑŠÐµÐºÑ‚Ð°" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1551 -msgid "Add Settings Bundle for Object" -msgstr "Добавление набора параметров Ð´Ð»Ñ Ð¼Ð¾Ð´ÐµÐ»Ð¸" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1590 -msgid "Load" -msgstr "Загрузить" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1595 src/slic3r/GUI/GUI_ObjectList.cpp:1627 -#: src/slic3r/GUI/GUI_ObjectList.cpp:1631 -msgid "Box" -msgstr "Куб" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1595 -msgid "Cylinder" -msgstr "Цилиндр" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1595 -msgid "Slab" -msgstr "Плита" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1663 -msgid "Height range Modifier" -msgstr "Модификатор переменной выÑоты Ñлоёв" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1672 -msgid "Add settings" -msgstr "Добавить наÑтройки" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1750 -msgid "Change type" -msgstr "Изменить тип" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1760 src/slic3r/GUI/GUI_ObjectList.cpp:1772 -msgid "Set as a Separated Object" -msgstr "Превратить в отдельную модель" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1772 -msgid "Set as a Separated Objects" -msgstr "Превратить в отдельные модели" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1782 -msgid "Printable" -msgstr "Ð”Ð»Ñ Ð¿ÐµÑ‡Ð°Ñ‚Ð¸" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1797 -msgid "Rename" -msgstr "Переименовать" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1808 -msgid "Fix through the Netfabb" -msgstr "Ремонт модели Ñлужбой Netfabb" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1818 src/slic3r/GUI/Plater.cpp:4035 -msgid "Export as STL" -msgstr "ÐкÑпорт в STL" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1825 src/slic3r/GUI/GUI_ObjectList.cpp:4567 -#: src/slic3r/GUI/Plater.cpp:4001 -msgid "Reload the selected volumes from disk" -msgstr "Перезагрузить выбранные объёмы Ñ Ð´Ð¸Ñка" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1832 -msgid "Set extruder for selected items" -msgstr "Задать ÑкÑтрудер Ð´Ð»Ñ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ñ‹Ñ… чаÑтей" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1864 src/libslic3r/PrintConfig.cpp:391 -msgid "Default" -msgstr "По умолчанию" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1884 -msgid "Scale to print volume" -msgstr "ОтмаÑштабировать под облаÑÑ‚ÑŒ печати" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1884 -msgid "Scale the selected object to fit the print volume" -msgstr "ОтмаÑштабировать выбранную модель до объёма Ñтола" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1913 src/slic3r/GUI/Plater.cpp:5224 -msgid "Convert from imperial units" -msgstr "Преобразовать размер из английÑкой ÑиÑтемы мер" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1915 src/slic3r/GUI/Plater.cpp:5224 -msgid "Revert conversion from imperial units" -msgstr "Отменить преобразование размера из английÑкой ÑиÑтемы мер" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1944 src/slic3r/GUI/GUI_ObjectList.cpp:1952 -#: src/slic3r/GUI/GUI_ObjectList.cpp:2630 src/libslic3r/PrintConfig.cpp:3730 -msgid "Merge" -msgstr "Объединить" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1944 -msgid "Merge objects to the one multipart object" -msgstr "Объединить модели в одну ÑоÑтавную модель" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1952 -msgid "Merge objects to the one single object" -msgstr "Объединить модели в одну единую модель" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2026 src/slic3r/GUI/GUI_ObjectList.cpp:2283 -msgid "Add Shape" -msgstr "Добавить фигуру" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2111 -msgid "Load Part" -msgstr "Загрузка Ñлемента" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2150 -msgid "Error!" -msgstr "Ошибка!" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2225 -msgid "Add Generic Subobject" -msgstr "Добавление Ñгенерированного Ñлемента" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2254 -msgid "Generic" -msgstr "Сгенерирован" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2380 -msgid "Delete Settings" -msgstr "Удаление наÑтроек" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2402 -msgid "Delete All Instances from Object" -msgstr "Удаление вÑех копий из модели" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2418 -msgid "Delete Height Range" -msgstr "Удаление переменной выÑоты Ñлоёв" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2450 -msgid "From Object List You can't delete the last solid part from object." -msgstr "" -"Ð’Ñ‹ не можете удалить из ÑпиÑка моделей поÑледний твердотельный Ñлемент модели." - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2454 -msgid "Delete Subobject" -msgstr "Удаление чаÑти" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2469 -msgid "Last instance of an object cannot be deleted." -msgstr "ПоÑледнÑÑ ÐºÐ¾Ð¿Ð¸Ñ Ð¼Ð¾Ð´ÐµÐ»Ð¸ не может быть удалена." - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2473 -msgid "Delete Instance" -msgstr "Удаление копии" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2497 src/slic3r/GUI/Plater.cpp:2865 -msgid "The selected object couldn't be split because it contains only one part." -msgstr "Ð’Ñ‹Ð±Ñ€Ð°Ð½Ð½Ð°Ñ Ð¼Ð¾Ð´ÐµÐ»ÑŒ не может быть разделена, так как она ÑоÑтоит из одной чаÑти." - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2501 -msgid "Split to Parts" -msgstr "Разделение на чаÑти" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2637 -msgid "Merged" -msgstr "Объединённые" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2721 -msgid "Merge all parts to the one single object" -msgstr "Объединить вÑе чаÑти в одну единую модель" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2753 -msgid "Add Layers" -msgstr "Добавление Ñлоёв" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2907 -msgid "Group manipulation" -msgstr "Групповые манипулÑции" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2919 -msgid "Object manipulation" -msgstr "МанипулÑÑ†Ð¸Ñ Ð½Ð°Ð´ моделÑми" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2932 -msgid "Object Settings to modify" -msgstr "Параметры модели Ð´Ð»Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2936 -msgid "Part Settings to modify" -msgstr "Параметры Ñлемента Ð´Ð»Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2941 -msgid "Layer range Settings to modify" -msgstr "Изменение параметров диапазона Ñлоёв" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2947 -msgid "Part manipulation" -msgstr "МанипулÑÑ†Ð¸Ñ Ð½Ð°Ð´ Ñлементом" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2953 -msgid "Instance manipulation" -msgstr "МанипулÑÑ†Ð¸Ñ Ñ ÐºÐ¾Ð¿Ð¸Ñми" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2960 -msgid "Height ranges" -msgstr "ÐŸÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ Ð²Ñ‹Ñота Ñлоёв" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2960 -msgid "Settings for height range" -msgstr "ÐаÑтройки Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð¾Ð¹ выÑоты Ñлоёв" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:3144 -msgid "Delete Selected Item" -msgstr "Удаление выбранных чаÑтей" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:3332 -msgid "Delete Selected" -msgstr "Удаление выбранного" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:3408 src/slic3r/GUI/GUI_ObjectList.cpp:3436 -#: src/slic3r/GUI/GUI_ObjectList.cpp:3456 -msgid "Add Height Range" -msgstr "Добавить переменную выÑоту Ñлоёв" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:3502 -======= #: src/slic3r/GUI/GUI_Factories.cpp:129 src/slic3r/GUI/GUI_Preview.cpp:245 #: src/slic3r/GUI/Tab.cpp:1516 src/libslic3r/ExtrusionEntity.cpp:324 #: src/libslic3r/ExtrusionEntity.cpp:352 src/libslic3r/PrintConfig.cpp:1537 @@ -7175,7 +4504,6 @@ msgid "Add Height Range" msgstr "Добавить диапазон выÑот Ñлоёв" #: src/slic3r/GUI/GUI_ObjectList.cpp:3104 ->>>>>>> master 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" @@ -7186,13 +4514,10 @@ msgstr "" "чтобы его можно было разделить на два ÑÐ»Ð¾Ñ \n" "без Ð½Ð°Ñ€ÑƒÑˆÐµÐ½Ð¸Ñ Ð¼Ð¸Ð½Ð¸Ð¼Ð°Ð»ÑŒÐ½Ð¾Ð¹ выÑоты ÑлоÑ." -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_ObjectList.cpp:3506 -======= #: src/slic3r/GUI/GUI_ObjectList.cpp:3108 ->>>>>>> master msgid "" -"Cannot insert a new layer range between the current and the next layer range.\n" +"Cannot insert a new layer range between the current and the next layer " +"range.\n" "The gap between the current layer range and the next layer range\n" "is thinner than the minimum layer height allowed." msgstr "" @@ -7201,11 +4526,7 @@ msgstr "" "диапазоном Ñлоёв и Ñледующим диапазоном Ñлоёв меньше \n" "минимально допуÑтимой выÑоты ÑлоÑ." -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_ObjectList.cpp:3511 -======= #: src/slic3r/GUI/GUI_ObjectList.cpp:3113 ->>>>>>> master msgid "" "Cannot insert a new layer range after the current layer range.\n" "Current layer range overlaps with the next layer range." @@ -7214,116 +4535,6 @@ msgstr "" "текущего диапазона Ñлоёв. Текущий диапазон Ñлоёв \n" "перекрываетÑÑ Ñо Ñледующим диапазоном Ñлоёв." -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_ObjectList.cpp:3570 -msgid "Edit Height Range" -msgstr "Редактирование переменной выÑоты Ñлоёв" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:3865 -msgid "Selection-Remove from list" -msgstr "Выбор\\Удаление из ÑпиÑка" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:3873 -msgid "Selection-Add from list" -msgstr "Выбор\\Добавление из ÑпиÑка" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4008 -msgid "Object or Instance" -msgstr "Модель или копиÑ" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4009 src/slic3r/GUI/GUI_ObjectList.cpp:4142 -msgid "Part" -msgstr "Ñлемент" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4009 -msgid "Layer" -msgstr "Слои" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4011 -msgid "Unsupported selection" -msgstr "Ðеподдерживаемый выбор" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4012 -#, c-format -msgid "You started your selection with %s Item." -msgstr "Ð’Ñ‹ начали Ñвой выбор Ñ ÑущноÑти %s." - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4013 -#, c-format -msgid "In this mode you can select only other %s Items%s" -msgstr "Ð’ Ñтом режиме можно выбирать только ÑущноÑти %s%s" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4016 -msgid "of a current Object" -msgstr "текущей модели" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4021 src/slic3r/GUI/GUI_ObjectList.cpp:4096 -#: src/slic3r/GUI/Plater.cpp:143 -msgid "Info" -msgstr "ИнформациÑ" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4137 -msgid "You can't change a type of the last solid part of the object." -msgstr "Ð’Ñ‹ не можете изменить тип поÑледнего твердотельного Ñлемента модели." - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4142 -msgid "Modifier" -msgstr "Модификатор" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4142 -msgid "Support Enforcer" -msgstr "ÐŸÑ€Ð¸Ð½ÑƒÐ´Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ°" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4142 -msgid "Support Blocker" -msgstr "Блокировщик поддержки" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4144 -msgid "Select type of part" -msgstr "Выбор типа Ñлемента" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4149 -msgid "Change Part Type" -msgstr "Изменение типа Ñлемента" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4394 -msgid "Enter new name" -msgstr "Введите новое имÑ" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4394 -msgid "Renaming" -msgstr "Переименование" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4410 src/slic3r/GUI/GUI_ObjectList.cpp:4537 -#: src/slic3r/GUI/SavePresetDialog.cpp:101 src/slic3r/GUI/SavePresetDialog.cpp:109 -msgid "The supplied name is not valid;" -msgstr "Заданное Ð¸Ð¼Ñ Ð½ÐµÐ´Ð¾Ð¿ÑƒÑтимо;" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4411 src/slic3r/GUI/GUI_ObjectList.cpp:4538 -#: src/slic3r/GUI/SavePresetDialog.cpp:102 -msgid "the following characters are not allowed:" -msgstr "Ñледующие знаки не разрешаютÑÑ:" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4586 -msgid "Select extruder number:" -msgstr "Выберите номер ÑкÑтрудера:" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4587 -msgid "This extruder will be set for selected items" -msgstr "Ðтот ÑкÑтрудер будет задан Ð´Ð»Ñ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ñ‹Ñ… чаÑтей" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4612 -msgid "Change Extruders" -msgstr "Смена ÑкÑтрудеров" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4709 src/slic3r/GUI/Selection.cpp:1485 -msgid "Set Printable" -msgstr "Задать \"Ð”Ð»Ñ Ð¿ÐµÑ‡Ð°Ñ‚Ð¸\"" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4709 src/slic3r/GUI/Selection.cpp:1485 -msgid "Set Unprintable" -msgstr "Задать \"Ðе Ð´Ð»Ñ Ð¿ÐµÑ‡Ð°Ñ‚Ð¸\"" -======= #: src/slic3r/GUI/GUI_ObjectList.cpp:3172 msgid "Edit Height Range" msgstr "Редактирование диапазона выÑот Ñлоёв" @@ -7465,7 +4676,6 @@ msgstr "ÐšÐ¾Ð¿Ð¸Ñ Ð´Ð»Ñ Ð¿ÐµÑ‡Ð°Ñ‚Ð¸" #: src/slic3r/GUI/GUI_ObjectList.cpp:4410 msgid "Set Unprintable Instance" msgstr "ÐšÐ¾Ð¿Ð¸Ñ Ð½Ðµ Ð´Ð»Ñ Ð¿ÐµÑ‡Ð°Ñ‚Ð¸" ->>>>>>> master #: src/slic3r/GUI/GUI_ObjectManipulation.cpp:55 #: src/slic3r/GUI/GUI_ObjectManipulation.cpp:84 @@ -7480,16 +4690,10 @@ msgstr "Ð›Ð¾ÐºÐ°Ð»ÑŒÐ½Ð°Ñ Ð¡Ðš" #: src/slic3r/GUI/GUI_ObjectManipulation.cpp:60 msgid "Select coordinate space, in which the transformation will be performed." msgstr "" -<<<<<<< HEAD -"Выберите координатное проÑтранÑтво, в котором будет выполнÑÑ‚ÑŒÑÑ Ð¿Ñ€ÐµÐ¾Ð±Ñ€Ð°Ð·Ð¾Ð²Ð°Ð½Ð¸Ðµ." - -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:163 src/libslic3r/GCode.cpp:537 -======= "Выберите координатное проÑтранÑтво, в котором будет выполнÑÑ‚ÑŒÑÑ " "преобразование." #: src/slic3r/GUI/GUI_ObjectManipulation.cpp:141 src/libslic3r/GCode.cpp:540 ->>>>>>> master msgid "Object name" msgstr "Ð˜Ð¼Ñ Ð¼Ð¾Ð´ÐµÐ»Ð¸" @@ -7498,16 +4702,10 @@ msgstr "Ð˜Ð¼Ñ Ð¼Ð¾Ð´ÐµÐ»Ð¸" msgid "Position" msgstr "ПозициÑ" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:224 -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:506 -#: src/slic3r/GUI/Mouse3DController.cpp:486 src/slic3r/GUI/Mouse3DController.cpp:507 -======= #: src/slic3r/GUI/GUI_ObjectManipulation.cpp:202 #: src/slic3r/GUI/GUI_ObjectManipulation.cpp:522 #: src/slic3r/GUI/Mouse3DController.cpp:478 #: src/slic3r/GUI/Mouse3DController.cpp:499 ->>>>>>> master msgid "Rotation" msgstr "Вращение" @@ -7539,11 +4737,7 @@ msgstr "Ð¡Ð±Ñ€Ð¾Ñ Ð²Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ" msgid "Reset scale" msgstr "Ð¡Ð±Ñ€Ð¾Ñ Ð¼Ð°Ñштаба" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:423 -======= #: src/slic3r/GUI/GUI_ObjectManipulation.cpp:414 ->>>>>>> master msgid "Inches" msgstr "Дюймы" @@ -7555,20 +4749,12 @@ msgstr "МаÑштаб" msgid "Translate" msgstr "Перемещение" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:625 -msgid "You cannot use non-uniform scaling mode for multiple objects/parts selection" -msgstr "" -"ÐÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать режим неравномерного маÑштабированиÑ, когда выбрано неÑколько " -"моделей/чаÑтей." -======= #: src/slic3r/GUI/GUI_ObjectManipulation.cpp:640 msgid "" "You cannot use non-uniform scaling mode for multiple objects/parts selection" msgstr "" "ÐÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать режим неравномерного маÑштабированиÑ, когда выбрано " "неÑколько моделей/чаÑтей." ->>>>>>> master #: src/slic3r/GUI/GUI_ObjectManipulation.cpp:820 msgid "Set Position" @@ -7584,20 +4770,16 @@ msgstr "Задание маÑштаба" #: src/slic3r/GUI/GUI_ObjectManipulation.cpp:980 msgid "" -"The currently manipulated object is tilted (rotation angles are not multiples of " -"90°).\n" -"Non-uniform scaling of tilted objects is only possible in the World coordinate " -"system,\n" +"The currently manipulated object is tilted (rotation angles are not " +"multiples of 90°).\n" +"Non-uniform scaling of tilted objects is only possible in the World " +"coordinate system,\n" "once the rotation is embedded into the object coordinates." msgstr "" "Модель, Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð¹ вы работаете, наклонена (углы поворота не кратен 90 °).\n" "Ðеравномерное маÑштабирование наклонных объектов возможно только в мировой \n" -<<<<<<< HEAD -"ÑиÑтеме координат, когда Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ вращении запиÑываетÑÑ Ð² координаты модели." -======= "ÑиÑтеме координат, когда Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ вращении запиÑываетÑÑ Ð² координаты " "модели." ->>>>>>> master #: src/slic3r/GUI/GUI_ObjectManipulation.cpp:983 msgid "" @@ -7625,104 +4807,6 @@ msgstr "Удаление параметра %s" msgid "Change Option %s" msgstr "Изменение параметра %s" -<<<<<<< HEAD -#: src/slic3r/GUI/GUI_Preview.cpp:212 -msgid "View" -msgstr "Вид" - -#: src/slic3r/GUI/GUI_Preview.cpp:215 src/libslic3r/PrintConfig.cpp:560 -msgid "Height" -msgstr "Ð’Ñ‹Ñота" - -#: src/slic3r/GUI/GUI_Preview.cpp:216 src/libslic3r/PrintConfig.cpp:2466 -msgid "Width" -msgstr "Ширина" - -#: src/slic3r/GUI/GUI_Preview.cpp:218 src/slic3r/GUI/Tab.cpp:1840 -msgid "Fan speed" -msgstr "СкороÑÑ‚ÑŒ вентилÑтора" - -#: src/slic3r/GUI/GUI_Preview.cpp:219 -msgid "Volumetric flow rate" -msgstr "Объёмный раÑход" - -#: src/slic3r/GUI/GUI_Preview.cpp:224 -msgid "Show" -msgstr "Отображать" - -#: src/slic3r/GUI/GUI_Preview.cpp:227 src/slic3r/GUI/GUI_Preview.cpp:245 -msgid "Feature types" -msgstr "Типы линий" - -#: src/slic3r/GUI/GUI_Preview.cpp:230 src/libslic3r/ExtrusionEntity.cpp:310 -#: src/libslic3r/ExtrusionEntity.cpp:332 -msgid "Perimeter" -msgstr "Внутренний периметр" - -#: src/slic3r/GUI/GUI_Preview.cpp:231 src/libslic3r/ExtrusionEntity.cpp:311 -#: src/libslic3r/ExtrusionEntity.cpp:334 -msgid "External perimeter" -msgstr "Внешний периметр" - -#: src/slic3r/GUI/GUI_Preview.cpp:232 src/libslic3r/ExtrusionEntity.cpp:312 -#: src/libslic3r/ExtrusionEntity.cpp:336 -msgid "Overhang perimeter" -msgstr "ÐавиÑающий периметр" - -#: src/slic3r/GUI/GUI_Preview.cpp:233 src/libslic3r/ExtrusionEntity.cpp:313 -#: src/libslic3r/ExtrusionEntity.cpp:338 -msgid "Internal infill" -msgstr "Заполнение" - -#: src/slic3r/GUI/GUI_Preview.cpp:234 src/libslic3r/ExtrusionEntity.cpp:314 -#: src/libslic3r/ExtrusionEntity.cpp:340 src/libslic3r/PrintConfig.cpp:1956 -#: src/libslic3r/PrintConfig.cpp:1967 -msgid "Solid infill" -msgstr "Сплошное заполнение" - -#: src/slic3r/GUI/GUI_Preview.cpp:235 src/libslic3r/ExtrusionEntity.cpp:315 -#: src/libslic3r/ExtrusionEntity.cpp:342 src/libslic3r/PrintConfig.cpp:2333 -#: src/libslic3r/PrintConfig.cpp:2345 -msgid "Top solid infill" -msgstr "Верхний Ñплошной Ñлой" - -#: src/slic3r/GUI/GUI_Preview.cpp:237 src/libslic3r/ExtrusionEntity.cpp:317 -#: src/libslic3r/ExtrusionEntity.cpp:346 -msgid "Bridge infill" -msgstr "МоÑÑ‚Ñ‹" - -#: src/slic3r/GUI/GUI_Preview.cpp:238 src/libslic3r/ExtrusionEntity.cpp:318 -#: src/libslic3r/ExtrusionEntity.cpp:348 src/libslic3r/PrintConfig.cpp:1011 -msgid "Gap fill" -msgstr "Заполнение пробелов" - -#: src/slic3r/GUI/GUI_Preview.cpp:239 src/slic3r/GUI/Tab.cpp:1462 -#: src/libslic3r/ExtrusionEntity.cpp:319 src/libslic3r/ExtrusionEntity.cpp:350 -msgid "Skirt" -msgstr "Юбка" - -#: src/slic3r/GUI/GUI_Preview.cpp:241 src/libslic3r/ExtrusionEntity.cpp:321 -#: src/libslic3r/ExtrusionEntity.cpp:354 src/libslic3r/PrintConfig.cpp:2218 -msgid "Support material interface" -msgstr "СвÑзующий Ñлой поддержки" - -#: src/slic3r/GUI/GUI_Preview.cpp:242 src/slic3r/GUI/Tab.cpp:1545 -#: src/libslic3r/ExtrusionEntity.cpp:322 src/libslic3r/ExtrusionEntity.cpp:356 -msgid "Wipe tower" -msgstr "Ð§ÐµÑ€Ð½Ð¾Ð²Ð°Ñ Ð±Ð°ÑˆÐ½Ñ" - -#: src/slic3r/GUI/GUI_Preview.cpp:1031 -msgid "Shells" -msgstr "Оболочка" - -#: src/slic3r/GUI/GUI_Preview.cpp:1032 -msgid "Tool marker" -msgstr "Маркер инÑтрумента" - -#: src/slic3r/GUI/GUI_Preview.cpp:1033 -msgid "Legend/Estimated printing time" -msgstr "УÑловные обозначениÑ/РаÑчётное Ð²Ñ€ÐµÐ¼Ñ Ð¿ÐµÑ‡Ð°Ñ‚Ð¸" -======= #: src/slic3r/GUI/GUI_Preview.cpp:211 msgid "View" msgstr "Вид" @@ -7843,7 +4927,6 @@ msgstr "УÑловные обозначениÑ/РаÑчётное Ð²Ñ€ÐµÐ¼Ñ Ð¿ #: src/slic3r/GUI/NotificationManager.cpp:391 msgid "More" msgstr "Подробнее" ->>>>>>> master #: src/slic3r/GUI/HintNotification.cpp:908 msgid "Open Preferences." @@ -7868,19 +4951,6 @@ msgstr "КатегориÑ" #: src/slic3r/GUI/ImGuiWrapper.cpp:963 src/slic3r/GUI/Search.cpp:474 msgid "Search in English" msgstr "ИÑкать на английÑком Ñзыке" -<<<<<<< HEAD - -#: src/slic3r/GUI/Jobs/ArrangeJob.cpp:145 -msgid "Arranging" -msgstr "РаÑÑтановка" - -#: src/slic3r/GUI/Jobs/ArrangeJob.cpp:175 -msgid "Could not arrange model objects! Some geometries may be invalid." -msgstr "" -"Ðе удалоÑÑŒ раÑÑтавить чаÑти модели! Ðекоторые геометрии могут быть недопуÑтимыми." - -#: src/slic3r/GUI/Jobs/ArrangeJob.cpp:181 -======= #: src/slic3r/GUI/Jobs/ArrangeJob.cpp:171 msgid "Could not arrange model objects! Some geometries may be invalid." @@ -7893,7 +4963,6 @@ msgid "Arranging" msgstr "РаÑÑтановка" #: src/slic3r/GUI/Jobs/ArrangeJob.cpp:204 ->>>>>>> master msgid "Arranging canceled." msgstr "РаÑÑтановка отменена." @@ -7928,13 +4997,6 @@ msgstr "Заполнение Ñтола закончено." msgid "ERROR: not enough resources to execute a new job." msgstr "ОШИБКÐ: недоÑтаточно реÑурÑов Ð´Ð»Ñ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ заданиÑ." -<<<<<<< HEAD -#: src/slic3r/GUI/Jobs/RotoptimizeJob.cpp:41 -msgid "Searching for optimal orientation" -msgstr "ПоиÑк оптимального положениÑ" - -#: src/slic3r/GUI/Jobs/RotoptimizeJob.cpp:73 -======= #: src/slic3r/GUI/Jobs/PlaterJob.cpp:13 msgid "An unexpected error occured" msgstr "Произошла Ð½ÐµÐ¿Ñ€ÐµÐ´Ð²Ð¸Ð´ÐµÐ½Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°:" @@ -7979,7 +5041,6 @@ msgid "Searching for optimal orientation" msgstr "ПоиÑк оптимального положениÑ" #: src/slic3r/GUI/Jobs/RotoptimizeJob.cpp:77 ->>>>>>> master msgid "Orientation search canceled." msgstr "ПоиÑк оптимального Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð¾Ñ‚Ð¼ÐµÐ½Ñ‘Ð½." @@ -8022,8 +5083,6 @@ msgstr "СкороÑÑ‚ÑŒ" #: src/slic3r/GUI/Jobs/SLAImportJob.cpp:140 msgid "Importing SLA archive" msgstr "Импорт SLA архива" -<<<<<<< HEAD -======= #: src/slic3r/GUI/Jobs/SLAImportJob.cpp:158 msgid "" @@ -8032,7 +5091,6 @@ msgid "" msgstr "" "Ðрхив SLA не Ñодержит никаких профилей. ПожалуйÑта, Ñначала активируйте " "какой-нибудь профиль SLA принтера , прежде чем импортировать Ñтот SLA архив." ->>>>>>> master #: src/slic3r/GUI/Jobs/SLAImportJob.cpp:164 msgid "Importing canceled." @@ -8041,162 +5099,6 @@ msgstr "Импорт отменен." #: src/slic3r/GUI/Jobs/SLAImportJob.cpp:165 msgid "Importing done." msgstr "Импорт завершён." -<<<<<<< HEAD - -#: src/slic3r/GUI/Jobs/SLAImportJob.cpp:208 src/slic3r/GUI/Plater.cpp:2357 -msgid "You cannot load SLA project with a multi-part object on the bed" -msgstr "Ð’Ñ‹ не можете загрузить SLA проект Ñ ÑоÑтавной моделью на Ñтоле" - -#: src/slic3r/GUI/Jobs/SLAImportJob.cpp:209 src/slic3r/GUI/Plater.cpp:2358 -#: src/slic3r/GUI/Tab.cpp:3243 -msgid "Please check your object list before preset changing." -msgstr "ПожалуйÑта, проверьте ÑпиÑок моделей перед изменением профилÑ." - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:17 src/slic3r/GUI/MainFrame.cpp:894 -msgid "Keyboard Shortcuts" -msgstr "ГорÑчие клавиши" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:69 -msgid "New project, clear plater" -msgstr "Ðовый проект, пуÑтой Ñтол" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:70 -msgid "Open project STL/OBJ/AMF/3MF with config, clear plater" -msgstr "Открыть STL/OBJ/AMF/3MF проект Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸ÐµÐ¹, очиÑтив Ñтол" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:71 -msgid "Save project (3mf)" -msgstr "Сохранить проект (3mf)" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:72 -msgid "Save project as (3mf)" -msgstr "Сохранить проект (3MF)" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:73 -msgid "(Re)slice" -msgstr "(Пере)Ðарезать" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:75 -msgid "Import STL/OBJ/AMF/3MF without config, keep plater" -msgstr "Загрузить STL/OBJ/AMF/3MF проект Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸ÐµÐ¹, не Ð¾Ñ‡Ð¸Ñ‰Ð°Ñ Ñтол" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:76 -msgid "Import Config from ini/amf/3mf/gcode" -msgstr "Загрузить конфигурацию из ini/amf/3mf/g-кода" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:77 -msgid "Load Config from ini/amf/3mf/gcode and merge" -msgstr "Загрузить конфигурацию из ini/amf/3mf/g-кода и объединить" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:79 src/slic3r/GUI/Plater.cpp:770 -#: src/slic3r/GUI/Plater.cpp:6054 src/libslic3r/PrintConfig.cpp:3635 -msgid "Export G-code" -msgstr "ÐкÑпорт в G-код" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:80 src/slic3r/GUI/Plater.cpp:6055 -msgid "Send G-code" -msgstr "Отправить G-код" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:81 -msgid "Export config" -msgstr "Сохранить текущую конфигурацию" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:82 src/slic3r/GUI/Plater.cpp:758 -msgid "Export to SD card / Flash drive" -msgstr "ÐкÑпорт на SD-карту / USB-накопитель" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:83 -msgid "Eject SD card / Flash drive" -msgstr "Извлечь SD-карту / USB-накопитель" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:85 -msgid "Select all objects" -msgstr "Выбрать вÑе модели" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:86 -msgid "Deselect all" -msgstr "СнÑÑ‚ÑŒ выбор Ñо вÑего" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:87 -msgid "Delete selected" -msgstr "Удалить выбранные" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:91 -msgid "Copy to clipboard" -msgstr "Копировать в буфер" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:92 -msgid "Paste from clipboard" -msgstr "Ð’Ñтавить из буфера обмена" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:94 src/slic3r/GUI/KBShortcutsDialog.cpp:96 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:187 -msgid "Reload plater from disk" -msgstr "Перезагрузить Ñтол Ñ Ð´Ð¸Ñка" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:100 -msgid "Select Plater Tab" -msgstr "Вкладка Ñтола" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:101 -msgid "Select Print Settings Tab" -msgstr "Вкладка наÑтройки печати" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:102 -msgid "Select Filament Settings Tab" -msgstr "Вкладка наÑтройки прутка" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:103 -msgid "Select Printer Settings Tab" -msgstr "Вкладка наÑтройки принтера" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:104 -msgid "Switch to 3D" -msgstr "ПереключитьÑÑ Ð½Ð° 3D вид" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:105 -msgid "Switch to Preview" -msgstr "ПереключитьÑÑ Ð½Ð° предпроÑмотр" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:106 src/slic3r/GUI/PrintHostDialogs.cpp:165 -msgid "Print host upload queue" -msgstr "Очередь загрузки на хоÑÑ‚ печати" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:107 src/slic3r/GUI/MainFrame.cpp:65 -#: src/slic3r/GUI/MainFrame.cpp:1191 -msgid "Open new instance" -msgstr "ЗапуÑтить новый ÑкземплÑÑ€ программы" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:109 -msgid "Camera view" -msgstr "ÐŸÐ¾Ð·Ð¸Ñ†Ð¸Ñ ÐºÐ°Ð¼ÐµÑ€Ñ‹" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:110 -msgid "Show/Hide object/instance labels" -msgstr "Показать/Скрыть имена файлов модели/копии" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:112 src/slic3r/GUI/Preferences.cpp:13 -msgid "Preferences" -msgstr "ÐаÑтройки приложениÑ" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:114 -msgid "Show keyboard shortcuts list" -msgstr "Показать ÑпиÑок Ñочетаний клавиш" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:117 src/slic3r/GUI/KBShortcutsDialog.cpp:191 -msgid "Commands" -msgstr "Команды" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:122 -msgid "Add Instance of the selected object" -msgstr "Сделать копию выбранной модели" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:123 -msgid "Remove Instance of the selected object" -msgstr "Удалить копию выбранной модели" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:124 -======= #: src/slic3r/GUI/Jobs/SLAImportJob.cpp:210 msgid "" @@ -8361,7 +5263,6 @@ msgid "Remove Instance of the selected object" msgstr "Удалить копию выбранной модели" #: src/slic3r/GUI/KBShortcutsDialog.cpp:136 ->>>>>>> master msgid "" "Press to select multiple objects\n" "or move multiple objects with mouse" @@ -8369,125 +5270,6 @@ msgstr "" "Выбор неÑкольких моделей или перемещение \n" "неÑкольких моделей Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ мышки" -<<<<<<< HEAD -#: src/slic3r/GUI/KBShortcutsDialog.cpp:125 -msgid "Press to activate selection rectangle" -msgstr "ÐÐºÑ‚Ð¸Ð²Ð°Ñ†Ð¸Ñ Ð¿Ñ€Ñмоугольника выделениÑ" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:126 -msgid "Press to activate deselection rectangle" -msgstr "ÐÐºÑ‚Ð¸Ð²Ð°Ñ†Ð¸Ñ Ð¿Ñ€Ñмоугольника отмены выделениÑ" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:127 src/slic3r/GUI/KBShortcutsDialog.cpp:196 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:207 src/slic3r/GUI/KBShortcutsDialog.cpp:219 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:226 src/slic3r/GUI/KBShortcutsDialog.cpp:243 -msgid "Arrow Up" -msgstr "Стрелка вверх" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:127 -msgid "Move selection 10 mm in positive Y direction" -msgstr "Перемещение выбранного на 10 мм по оÑи Y+" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:128 src/slic3r/GUI/KBShortcutsDialog.cpp:197 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:208 src/slic3r/GUI/KBShortcutsDialog.cpp:220 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:227 src/slic3r/GUI/KBShortcutsDialog.cpp:244 -msgid "Arrow Down" -msgstr "Стрелка вниз" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:128 -msgid "Move selection 10 mm in negative Y direction" -msgstr "Перемещение выбранного на 10 мм по оÑи Y-" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:129 src/slic3r/GUI/KBShortcutsDialog.cpp:198 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:221 src/slic3r/GUI/KBShortcutsDialog.cpp:228 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:241 src/slic3r/GUI/KBShortcutsDialog.cpp:246 -msgid "Arrow Left" -msgstr "Стрелка влево" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:129 -msgid "Move selection 10 mm in negative X direction" -msgstr "Перемещение выбранного на 10 мм по оÑи X-" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:130 src/slic3r/GUI/KBShortcutsDialog.cpp:199 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:222 src/slic3r/GUI/KBShortcutsDialog.cpp:229 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:242 src/slic3r/GUI/KBShortcutsDialog.cpp:247 -msgid "Arrow Right" -msgstr "Стрелка вправо" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:130 -msgid "Move selection 10 mm in positive X direction" -msgstr "Перемещение выбранного на 10 мм по оÑи X+" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:131 src/slic3r/GUI/KBShortcutsDialog.cpp:132 -msgid "Any arrow" -msgstr "Ð›ÑŽÐ±Ð°Ñ Ñтрелка" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:131 -msgid "Movement step set to 1 mm" -msgstr "ЗафикÑировать шаг Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰ÐµÐ½Ð¸Ñ Ð½Ð° 1 мм" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:132 -msgid "Movement in camera space" -msgstr "Перемещение выбранного по отношению к камере" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:133 -msgid "Page Up" -msgstr "Page Up" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:133 -msgid "Rotate selection 45 degrees CCW" -msgstr "Поворот выбранного на 45° против чаÑовой Ñтрелки" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:134 -msgid "Page Down" -msgstr "Page Down" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:134 -msgid "Rotate selection 45 degrees CW" -msgstr "Поворот выбранного на 45° по чаÑовой Ñтрелки" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:135 -msgid "Gizmo move" -msgstr "Гизмо перемещениÑ" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:136 -msgid "Gizmo scale" -msgstr "Гизмо маÑштаба" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:137 -msgid "Gizmo rotate" -msgstr "Гизмо поворота" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:138 -msgid "Gizmo cut" -msgstr "Гизмо разреза" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:139 -msgid "Gizmo Place face on bed" -msgstr "Гизмо поверхноÑтью на Ñтол" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:140 -msgid "Gizmo SLA hollow" -msgstr "Гизмо полоÑти" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:141 -msgid "Gizmo SLA support points" -msgstr "Гизмо точки SLA поддержки" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:142 -msgid "Unselect gizmo or clear selection" -msgstr "Убрать гизмо выделение или очиÑтить выбор" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:143 -msgid "Change camera type (perspective, orthographic)" -msgstr "Тип камеры (вид в перÑпективе или ортогональный)" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:144 -msgid "Zoom to Bed" -msgstr "Приблизить до размера Ñтола" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:145 -======= #: src/slic3r/GUI/KBShortcutsDialog.cpp:137 msgid "Press to activate selection rectangle" msgstr "ÐÐºÑ‚Ð¸Ð²Ð°Ñ†Ð¸Ñ Ð¿Ñ€Ñмоугольника выделениÑ" @@ -8622,7 +5404,6 @@ msgid "Zoom to Bed" msgstr "Приблизить до размера Ñтола" #: src/slic3r/GUI/KBShortcutsDialog.cpp:160 ->>>>>>> master msgid "" "Zoom to selected object\n" "or all objects in scene, if none selected" @@ -8630,30 +5411,6 @@ msgstr "" "Приближение камеры к выбранной модели \n" "или вÑем моделÑм в Ñцене, еÑли ничего не выбрано" -<<<<<<< HEAD -#: src/slic3r/GUI/KBShortcutsDialog.cpp:146 -msgid "Zoom in" -msgstr "Приблизить" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:147 -msgid "Zoom out" -msgstr "Отдалить" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:148 -msgid "Switch between Editor/Preview" -msgstr "Переключение между редактором/предпроÑмотром" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:149 -msgid "Collapse/Expand the sidebar" -msgstr "Свернуть/Развернуть боковую панель" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:152 -msgid "Show/Hide 3Dconnexion devices settings dialog, if enabled" -msgstr "" -"Показать/Ñкрыть диалоговое окно наÑтроек уÑтройÑтв 3Dconnexion (еÑли включено)" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:154 src/slic3r/GUI/KBShortcutsDialog.cpp:158 -======= #: src/slic3r/GUI/KBShortcutsDialog.cpp:161 msgid "Zoom in" msgstr "Приблизить" @@ -8678,158 +5435,10 @@ msgstr "" #: src/slic3r/GUI/KBShortcutsDialog.cpp:169 #: src/slic3r/GUI/KBShortcutsDialog.cpp:172 ->>>>>>> master msgid "Show/Hide 3Dconnexion devices settings dialog" msgstr "" "Показать/Скрыть диалоговое окно наÑтроек \n" "уÑтройÑтв 3Dconnexion" -<<<<<<< HEAD - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:167 src/slic3r/GUI/MainFrame.cpp:331 -#: src/slic3r/GUI/MainFrame.cpp:343 -msgid "Plater" -msgstr "Стол" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:170 -msgid "All gizmos: Rotate - left mouse button; Pan - right mouse button" -msgstr "" -"Ð’Ñе гизмо: Вращение камеры - Ð»ÐµÐ²Ð°Ñ ÐºÐ½Ð¾Ð¿ÐºÐ° мыши; Перемещение камеры - Ð¿Ñ€Ð°Ð²Ð°Ñ ÐºÐ½Ð¾Ð¿ÐºÐ° " -"мыши" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:171 -msgid "Gizmo move: Press to snap by 1mm" -msgstr "Гизмо перемещениÑ: ФикÑации Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰ÐµÐ½Ð¸Ñ Ð½Ð° 1 мм" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:172 -msgid "Gizmo scale: Press to snap by 5%" -msgstr "Гизмо маÑштаба: ФикÑÐ°Ñ†Ð¸Ñ ÑƒÐ²ÐµÐ»Ð¸Ñ‡ÐµÐ½Ð¸Ñ Ð½Ð° 5%" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:173 -msgid "Gizmo scale: Scale selection to fit print volume" -msgstr "Гизмо маÑштаба: МаÑштабирование модели под облаÑÑ‚ÑŒ печати" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:174 -msgid "Gizmo scale: Press to activate one direction scaling" -msgstr "Гизмо маÑштаба: ÐÐºÑ‚Ð¸Ð²Ð°Ñ†Ð¸Ñ Ð¼Ð°ÑÑˆÑ‚Ð°Ð±Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð² одном направлении" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:175 -msgid "Gizmo scale: Press to scale selected objects around their own center" -msgstr "Гизмо маÑштаба: МаÑштабирование выбранных моделей вокруг Ñвоего центра" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:176 -msgid "Gizmo rotate: Press to rotate selected objects around their own center" -msgstr "Гизмо поворота: Поворот выбранных моделей вокруг Ñвоего центра" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:179 -msgid "Gizmos" -msgstr "Гизмо" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:179 -msgid "The following shortcuts are applicable when the specified gizmo is active" -msgstr "Следующие ÑÐ¾Ñ‡ÐµÑ‚Ð°Ð½Ð¸Ñ ÐºÐ»Ð°Ð²Ð¸Ñˆ применимы, когда активна Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ð°Ñ Ð³Ð¸Ð·Ð¼Ð¾" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:183 src/slic3r/GUI/MainFrame.cpp:1244 -msgid "Open a G-code file" -msgstr "Выберите G-код файл" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:185 src/slic3r/GUI/MainFrame.cpp:1142 -#: src/slic3r/GUI/MainFrame.cpp:1146 src/slic3r/GUI/MainFrame.cpp:1249 -#: src/slic3r/GUI/MainFrame.cpp:1253 -msgid "Reload the plater from disk" -msgstr "Перезагрузить Ñтол Ñ Ð´Ð¸Ñка" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:196 src/slic3r/GUI/KBShortcutsDialog.cpp:200 -msgid "Vertical slider - Move active thumb Up" -msgstr "Вертикальный ползунок - Сдвинуть активный ползунок вверх" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:197 src/slic3r/GUI/KBShortcutsDialog.cpp:201 -msgid "Vertical slider - Move active thumb Down" -msgstr "Вертикальный ползунок - Сдвинуть активный ползунок вниз" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:198 src/slic3r/GUI/KBShortcutsDialog.cpp:202 -msgid "Horizontal slider - Move active thumb Left" -msgstr "Горизонтальный ползунок - Сдвинуть активный ползунок влево" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:199 src/slic3r/GUI/KBShortcutsDialog.cpp:203 -msgid "Horizontal slider - Move active thumb Right" -msgstr "Горизонтальный ползунок - Сдвинуть активный ползунок вправо" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:204 -msgid "On/Off one layer mode of the vertical slider" -msgstr "Включение/Отключение функции \"Режим одного ÑлоÑ\" у вертикального ползунка" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:205 -msgid "Show/Hide Legend and Estimated printing time" -msgstr "Показать/Скрыть уÑловные обозначениÑ/раÑчётное Ð²Ñ€ÐµÐ¼Ñ Ð¿ÐµÑ‡Ð°Ñ‚Ð¸" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:207 -msgid "Upper layer" -msgstr "Слой +" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:208 -msgid "Lower layer" -msgstr "Слой -" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:209 -msgid "Upper Layer" -msgstr "Слой +" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:210 -msgid "Lower Layer" -msgstr "Слой -" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:211 -msgid "Show/Hide Legend & Estimated printing time" -msgstr "Показать/Скрыть уÑловные обозначениÑ/раÑчётное Ð²Ñ€ÐµÐ¼Ñ Ð¿ÐµÑ‡Ð°Ñ‚Ð¸" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:215 src/slic3r/GUI/Plater.cpp:4200 -#: src/slic3r/GUI/Tab.cpp:2602 -msgid "Preview" -msgstr "ПредпроÑмотр нарезки" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:219 -msgid "Move active thumb Up" -msgstr "Сдвинуть активный ползунок вверх" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:220 -msgid "Move active thumb Down" -msgstr "Сдвинуть активный ползунок вниз" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:221 -msgid "Set upper thumb as active" -msgstr "ПеремеÑтить ползунок в верхнее положение" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:222 -msgid "Set lower thumb as active" -msgstr "ПеремеÑтить ползунок в нижнее положение" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:223 src/slic3r/GUI/KBShortcutsDialog.cpp:230 -msgid "Add color change marker for current layer" -msgstr "Добавить маркер Ñмены цвета Ð´Ð»Ñ Ñ‚ÐµÐºÑƒÑ‰ÐµÐ³Ð¾ ÑлоÑ" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:224 src/slic3r/GUI/KBShortcutsDialog.cpp:231 -msgid "Delete color change marker for current layer" -msgstr "Удалить маркер Ñмены цвета Ð´Ð»Ñ Ñ‚ÐµÐºÑƒÑ‰ÐµÐ³Ð¾ ÑлоÑ" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:226 -msgid "Move current slider thumb Up" -msgstr "Сдвинуть ползунок вверх" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:227 -msgid "Move current slider thumb Down" -msgstr "Сдвинуть ползунок вниз" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:228 -msgid "Set upper thumb to current slider thumb" -msgstr "ПеремеÑтить ползунок в верхнее положение" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:229 -msgid "Set lower thumb to current slider thumb" -msgstr "ПеремеÑтить ползунок в нижнее положение" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:233 src/slic3r/GUI/KBShortcutsDialog.cpp:234 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:249 src/slic3r/GUI/KBShortcutsDialog.cpp:250 -======= #: src/slic3r/GUI/KBShortcutsDialog.cpp:170 msgid "Minimize application" @@ -8973,7 +5582,6 @@ msgstr "Удалить маркер Ñмены цвета Ð´Ð»Ñ Ñ‚ÐµÐºÑƒÑ‰ÐµÐ³Ð #: src/slic3r/GUI/KBShortcutsDialog.cpp:240 #: src/slic3r/GUI/KBShortcutsDialog.cpp:250 #: src/slic3r/GUI/KBShortcutsDialog.cpp:251 ->>>>>>> master msgid "" "Press to speed up 5 times while moving thumb\n" "with arrow keys or mouse wheel" @@ -8981,16 +5589,6 @@ msgstr "" "УÑкорить перемещение ползунка в 5 раз Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ \n" "Ñтрелок на клавиатуре или колеÑом мыши" -<<<<<<< HEAD -#: src/slic3r/GUI/KBShortcutsDialog.cpp:237 -msgid "Vertical Slider" -msgstr "Вертикальный ползунок" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:237 -msgid "" -"The following shortcuts are applicable in G-code preview when the vertical slider " -"is active" -======= #: src/slic3r/GUI/KBShortcutsDialog.cpp:243 msgid "Vertical Slider" msgstr "Вертикальный ползунок" @@ -8999,45 +5597,10 @@ msgstr "Вертикальный ползунок" msgid "" "The following shortcuts are applicable in G-code preview when the vertical " "slider is active" ->>>>>>> master msgstr "" "Следующие ÑÐ¾Ñ‡ÐµÑ‚Ð°Ð½Ð¸Ñ ÐºÐ»Ð°Ð²Ð¸Ñˆ применимы в окне предпроÑмотра G-кода, когда " "вертикальный ползунок активен" -<<<<<<< HEAD -#: src/slic3r/GUI/KBShortcutsDialog.cpp:241 -msgid "Move active thumb Left" -msgstr "Сдвинуть активный ползунок влево" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:242 -msgid "Move active thumb Right" -msgstr "Сдвинуть активный ползунок вправо" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:243 -msgid "Set left thumb as active" -msgstr "ПеремеÑтить ползунок в левое положение" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:244 -msgid "Set right thumb as active" -msgstr "ПеремеÑтить ползунок в правое положение" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:246 -msgid "Move active slider thumb Left" -msgstr "Сдвинуть активный ползунок влево" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:247 -msgid "Move active slider thumb Right" -msgstr "Сдвинуть активный ползунок вправо" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:253 -msgid "Horizontal Slider" -msgstr "Горизонтальный ползунок" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:253 -msgid "" -"The following shortcuts are applicable in G-code preview when the horizontal slider " -"is active" -======= #: src/slic3r/GUI/KBShortcutsDialog.cpp:246 msgid "Move active thumb Left" msgstr "Сдвинуть активный ползунок влево" @@ -9062,118 +5625,10 @@ msgstr "Горизонтальный ползунок" msgid "" "The following shortcuts are applicable in G-code preview when the horizontal " "slider is active" ->>>>>>> master msgstr "" "Следующие ÑÐ¾Ñ‡ÐµÑ‚Ð°Ð½Ð¸Ñ ÐºÐ»Ð°Ð²Ð¸Ñˆ применимы в окне предпроÑмотра G-кода, когда " "горизонтальный ползунок активен" -<<<<<<< HEAD -#: src/slic3r/GUI/KBShortcutsDialog.cpp:276 -msgid "Keyboard shortcuts" -msgstr "ГорÑчие клавиши" - -#: src/slic3r/GUI/MainFrame.cpp:65 src/slic3r/GUI/MainFrame.cpp:79 -#: src/slic3r/GUI/MainFrame.cpp:1191 -msgid "Open a new PrusaSlicer instance" -msgstr "ЗапуÑтить новый ÑкземплÑÑ€ PrusaSlicer" - -#: src/slic3r/GUI/MainFrame.cpp:68 src/slic3r/GUI/MainFrame.cpp:81 -msgid "G-code preview" -msgstr "ПредпроÑмотр G-кода" - -#: src/slic3r/GUI/MainFrame.cpp:68 src/slic3r/GUI/MainFrame.cpp:1091 -msgid "Open G-code viewer" -msgstr "Открыть проÑмотрщик G-кода" - -#: src/slic3r/GUI/MainFrame.cpp:79 src/slic3r/GUI/MainFrame.cpp:1260 -msgid "Open PrusaSlicer" -msgstr "Открыть PrusaSlicer" - -#: src/slic3r/GUI/MainFrame.cpp:81 -msgid "Open new G-code viewer" -msgstr "Открыть новый проÑмотрщик G-кода" - -#: src/slic3r/GUI/MainFrame.cpp:153 -msgid "" -"Remember to check for updates at https://github.com/prusa3d/PrusaSlicer/releases" -msgstr "" -"- Ðе забывайте периодичеÑки проверÑÑ‚ÑŒ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð½Ð° https://github.com/prusa3d/" -"PrusaSlicer/releases" - -#: src/slic3r/GUI/MainFrame.cpp:510 -msgid "based on Slic3r" -msgstr "ÑÐ¾Ð·Ð´Ð°Ð½Ð½Ð°Ñ Ð½Ð° оÑтове Slic3r" - -#: src/slic3r/GUI/MainFrame.cpp:866 -msgid "Prusa 3D &Drivers" -msgstr "&Драйверы Prusa 3D" - -#: src/slic3r/GUI/MainFrame.cpp:866 -msgid "Open the Prusa3D drivers download page in your browser" -msgstr "Открыть Ñтраницу загрузки драйверов Prusa3D" - -#: src/slic3r/GUI/MainFrame.cpp:868 -msgid "Software &Releases" -msgstr "PrusaSlicer на Github" - -#: src/slic3r/GUI/MainFrame.cpp:868 -msgid "Open the software releases page in your browser" -msgstr "Открыть Ñтраницу программы PrusaSlicer на Github" - -#: src/slic3r/GUI/MainFrame.cpp:874 -#, c-format -msgid "%s &Website" -msgstr "Сайт %s" - -#: src/slic3r/GUI/MainFrame.cpp:875 -#, c-format -msgid "Open the %s website in your browser" -msgstr "Открыть Ñайт %s" - -#: src/slic3r/GUI/MainFrame.cpp:881 -msgid "System &Info" -msgstr "&Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ ÑиÑтеме" - -#: src/slic3r/GUI/MainFrame.cpp:881 -msgid "Show system information" -msgstr "Показать ÑиÑтемную информацию" - -#: src/slic3r/GUI/MainFrame.cpp:883 -msgid "Show &Configuration Folder" -msgstr "Показать &конфигурационную папку" - -#: src/slic3r/GUI/MainFrame.cpp:883 -msgid "Show user configuration folder (datadir)" -msgstr "Показать папку конфигурации Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ (datadir)" - -#: src/slic3r/GUI/MainFrame.cpp:885 -msgid "Report an I&ssue" -msgstr "Сообщить о &проблеме" - -#: src/slic3r/GUI/MainFrame.cpp:885 -#, c-format -msgid "Report an issue on %s" -msgstr "Сообщить о проблеме в %s" - -#: src/slic3r/GUI/MainFrame.cpp:888 src/slic3r/GUI/MainFrame.cpp:891 -#, c-format -msgid "&About %s" -msgstr "&O программе %s" - -#: src/slic3r/GUI/MainFrame.cpp:888 src/slic3r/GUI/MainFrame.cpp:891 -msgid "Show about dialog" -msgstr "Показать окно Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸ÐµÐ¹ о программе" - -#: src/slic3r/GUI/MainFrame.cpp:894 -msgid "Show the list of the keyboard shortcuts" -msgstr "Показать ÑпиÑок Ñочетаний клавиш" - -#: src/slic3r/GUI/MainFrame.cpp:908 -msgid "Iso" -msgstr "ИзометриÑ" - -#: src/slic3r/GUI/MainFrame.cpp:908 -======= #: src/slic3r/GUI/KBShortcutsDialog.cpp:278 msgid "Keyboard shortcuts" msgstr "ГорÑчие клавиши" @@ -9323,97 +5778,23 @@ msgid "Iso" msgstr "ИзометриÑ" #: src/slic3r/GUI/MainFrame.cpp:1114 ->>>>>>> master msgid "Iso View" msgstr "ИзометричеÑÐºÐ°Ñ Ð¿Ñ€Ð¾ÐµÐºÑ†Ð¸Ñ" #. TRN To be shown in the main menu View->Top #. TRN To be shown in Print Settings "Top solid layers" -<<<<<<< HEAD -#: src/slic3r/GUI/MainFrame.cpp:912 src/libslic3r/PrintConfig.cpp:2360 -#: src/libslic3r/PrintConfig.cpp:2369 -msgid "Top" -msgstr "Сверху" - -#: src/slic3r/GUI/MainFrame.cpp:912 -======= #: src/slic3r/GUI/MainFrame.cpp:1118 src/libslic3r/PrintConfig.cpp:2867 #: src/libslic3r/PrintConfig.cpp:2876 msgid "Top" msgstr "Сверху" #: src/slic3r/GUI/MainFrame.cpp:1118 ->>>>>>> master msgid "Top View" msgstr "Вид Ñверху" #. TRN To be shown in the main menu View->Bottom #. TRN To be shown in Print Settings "Bottom solid layers" #. TRN To be shown in Print Settings "Top solid layers" -<<<<<<< HEAD -#: src/slic3r/GUI/MainFrame.cpp:915 src/libslic3r/PrintConfig.cpp:230 -#: src/libslic3r/PrintConfig.cpp:239 -msgid "Bottom" -msgstr "Снизу" - -#: src/slic3r/GUI/MainFrame.cpp:915 -msgid "Bottom View" -msgstr "Вид Ñнизу" - -#: src/slic3r/GUI/MainFrame.cpp:917 -msgid "Front" -msgstr "Спереди" - -#: src/slic3r/GUI/MainFrame.cpp:917 -msgid "Front View" -msgstr "Вид Ñпереди" - -#: src/slic3r/GUI/MainFrame.cpp:919 src/libslic3r/PrintConfig.cpp:1845 -msgid "Rear" -msgstr "Сзади" - -#: src/slic3r/GUI/MainFrame.cpp:919 -msgid "Rear View" -msgstr "Вид Ñзади" - -#: src/slic3r/GUI/MainFrame.cpp:921 -msgid "Left" -msgstr "Слева" - -#: src/slic3r/GUI/MainFrame.cpp:921 -msgid "Left View" -msgstr "Вид Ñлева" - -#: src/slic3r/GUI/MainFrame.cpp:923 -msgid "Right" -msgstr "Справа" - -#: src/slic3r/GUI/MainFrame.cpp:923 -msgid "Right View" -msgstr "Вид Ñправа" - -#: src/slic3r/GUI/MainFrame.cpp:936 -msgid "&New Project" -msgstr "&Ðовый проект" - -#: src/slic3r/GUI/MainFrame.cpp:936 -msgid "Start a new project" -msgstr "Ðачать новый проект" - -#: src/slic3r/GUI/MainFrame.cpp:939 -msgid "&Open Project" -msgstr "&Открыть проект" - -#: src/slic3r/GUI/MainFrame.cpp:939 -msgid "Open a project file" -msgstr "Открыть файл проекта" - -#: src/slic3r/GUI/MainFrame.cpp:944 -msgid "Recent projects" -msgstr "Ðедавние проекты" - -#: src/slic3r/GUI/MainFrame.cpp:953 -======= #: src/slic3r/GUI/MainFrame.cpp:1121 src/libslic3r/PrintConfig.cpp:423 #: src/libslic3r/PrintConfig.cpp:432 msgid "Bottom" @@ -9476,7 +5857,6 @@ msgid "Recent projects" msgstr "Ðедавние проекты" #: src/slic3r/GUI/MainFrame.cpp:1162 ->>>>>>> master msgid "" "The selected project is no longer available.\n" "Do you want to remove it from the recent projects list?" @@ -9484,218 +5864,6 @@ msgstr "" "Выбранный проект больше недоÑтупен.\n" "Удалить его из ÑпиÑка поÑледних проектов?" -<<<<<<< HEAD -#: src/slic3r/GUI/MainFrame.cpp:953 src/slic3r/GUI/MainFrame.cpp:1343 -#: src/slic3r/GUI/PrintHostDialogs.cpp:263 -msgid "Error" -msgstr "Ошибка" - -#: src/slic3r/GUI/MainFrame.cpp:978 -msgid "&Save Project" -msgstr "&Сохранить проект" - -#: src/slic3r/GUI/MainFrame.cpp:978 -msgid "Save current project file" -msgstr "Сохранить текущий файл проекта" - -#: src/slic3r/GUI/MainFrame.cpp:982 src/slic3r/GUI/MainFrame.cpp:984 -msgid "Save Project &as" -msgstr "Сохранить проект &как" - -#: src/slic3r/GUI/MainFrame.cpp:982 src/slic3r/GUI/MainFrame.cpp:984 -msgid "Save current project file as" -msgstr "Сохранить текущий файл проекта как" - -#: src/slic3r/GUI/MainFrame.cpp:992 -msgid "Import STL/OBJ/AM&F/3MF" -msgstr "Загрузить STL/OBJ/AMF/3MF" - -#: src/slic3r/GUI/MainFrame.cpp:992 -msgid "Load a model" -msgstr "Загрузить модель" - -#: src/slic3r/GUI/MainFrame.cpp:996 -msgid "Import STL (imperial units)" -msgstr "Загрузить STL (английÑÐºÐ°Ñ ÑиÑтема мер)" - -#: src/slic3r/GUI/MainFrame.cpp:996 -msgid "Load an model saved with imperial units" -msgstr "Загрузить модель, Ñохраненную Ñ Ñ€Ð°Ð·Ð¼ÐµÑ€Ð°Ð¼Ð¸ в английÑкой ÑиÑтеме мер" - -#: src/slic3r/GUI/MainFrame.cpp:1000 -msgid "Import SL1 archive" -msgstr "Импорт SL1 архива" - -#: src/slic3r/GUI/MainFrame.cpp:1000 -msgid "Load an SL1 archive" -msgstr "Импорт SL1 архива" - -#: src/slic3r/GUI/MainFrame.cpp:1005 -msgid "Import &Config" -msgstr "Загрузить текущую конфигурацию" - -#: src/slic3r/GUI/MainFrame.cpp:1005 -msgid "Load exported configuration file" -msgstr "Загрузить Ñохранённый файл конфигурации" - -#: src/slic3r/GUI/MainFrame.cpp:1008 -msgid "Import Config from &project" -msgstr "Загрузить конфигурацию из проекта" - -#: src/slic3r/GUI/MainFrame.cpp:1008 -msgid "Load configuration from project file" -msgstr "Загрузить конфигурацию из файла проекта" - -#: src/slic3r/GUI/MainFrame.cpp:1012 -msgid "Import Config &Bundle" -msgstr "Импортировать вÑе профили" - -#: src/slic3r/GUI/MainFrame.cpp:1012 -msgid "Load presets from a bundle" -msgstr "Импортировать вÑе профили из файла" - -#: src/slic3r/GUI/MainFrame.cpp:1015 -msgid "&Import" -msgstr "&Импорт" - -#: src/slic3r/GUI/MainFrame.cpp:1018 src/slic3r/GUI/MainFrame.cpp:1305 -msgid "Export &G-code" -msgstr "ÐкÑпорт в G-&код" - -#: src/slic3r/GUI/MainFrame.cpp:1018 -msgid "Export current plate as G-code" -msgstr "ÐкÑпортировать текущие модели Ñо Ñтола в G-код" - -#: src/slic3r/GUI/MainFrame.cpp:1022 src/slic3r/GUI/MainFrame.cpp:1306 -msgid "S&end G-code" -msgstr "&Отправить G-код" - -#: src/slic3r/GUI/MainFrame.cpp:1022 -msgid "Send to print current plate as G-code" -msgstr "Отправить на печать текущий Ñтол как G-код" - -#: src/slic3r/GUI/MainFrame.cpp:1026 -msgid "Export G-code to SD card / Flash drive" -msgstr "ÐкÑпорт G-кода на SD-карту / USB-накопитель" - -#: src/slic3r/GUI/MainFrame.cpp:1026 -msgid "Export current plate as G-code to SD card / Flash drive" -msgstr "ÐкÑпортировать текущие модели Ñо Ñтола в G-код на SD-карту / USB-накопитель" - -#: src/slic3r/GUI/MainFrame.cpp:1030 -msgid "Export plate as &STL" -msgstr "ÐкÑпорт &Ñтола в STL" - -#: src/slic3r/GUI/MainFrame.cpp:1030 -msgid "Export current plate as STL" -msgstr "ÐкÑпортировать текущие модели Ñо Ñтола в STL" - -#: src/slic3r/GUI/MainFrame.cpp:1033 -msgid "Export plate as STL &including supports" -msgstr "ÐкÑпорт Ñтола в STL вмеÑте Ñ &поддержками" - -#: src/slic3r/GUI/MainFrame.cpp:1033 -msgid "Export current plate as STL including supports" -msgstr "ÐкÑпортировать текущий Ñтол в STL, Ð²ÐºÐ»ÑŽÑ‡Ð°Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ¸" - -#: src/slic3r/GUI/MainFrame.cpp:1036 -msgid "Export plate as &AMF" -msgstr "ÐкÑпорт Ñтол&а в AMF" - -#: src/slic3r/GUI/MainFrame.cpp:1036 -msgid "Export current plate as AMF" -msgstr "ÐкÑпортировать текущие модели Ñо Ñтола в AMF" - -#: src/slic3r/GUI/MainFrame.cpp:1040 src/slic3r/GUI/MainFrame.cpp:1257 -msgid "Export &toolpaths as OBJ" -msgstr "ÐкÑпорт траектории &инÑтрумента в OBJ" - -#: src/slic3r/GUI/MainFrame.cpp:1040 src/slic3r/GUI/MainFrame.cpp:1257 -msgid "Export toolpaths as OBJ" -msgstr "ÐкÑпортировать траекторию инÑтрумента в OBJ" - -#: src/slic3r/GUI/MainFrame.cpp:1044 -msgid "Export &Config" -msgstr "ÐкÑпорт &текущей конфигурации" - -#: src/slic3r/GUI/MainFrame.cpp:1044 -msgid "Export current configuration to file" -msgstr "ÐкÑпортировать текущую конфигурацию в файл" - -#: src/slic3r/GUI/MainFrame.cpp:1047 -msgid "Export Config &Bundle" -msgstr "ÐкÑпорт &вÑех профилей" - -#: src/slic3r/GUI/MainFrame.cpp:1047 -msgid "Export all presets to file" -msgstr "ÐкÑпортировать вÑе профили в единый файл" - -#: src/slic3r/GUI/MainFrame.cpp:1050 -msgid "Export Config Bundle With Physical Printers" -msgstr "ÐкÑпорт вÑех профилей Ñ Ñ„Ð¸Ð·Ð¸Ñ‡ÐµÑкими принтерами" - -#: src/slic3r/GUI/MainFrame.cpp:1050 -msgid "Export all presets including physical printers to file" -msgstr "ÐкÑпорт вÑех профилей в файл, Ð²ÐºÐ»ÑŽÑ‡Ð°Ñ Ñ„Ð¸Ð·Ð¸Ñ‡ÐµÑкие принтеры" - -#: src/slic3r/GUI/MainFrame.cpp:1053 -msgid "&Export" -msgstr "&ÐкÑпорт" - -#: src/slic3r/GUI/MainFrame.cpp:1055 -msgid "Ejec&t SD card / Flash drive" -msgstr "Из&влечь SD-карту / USB-накопитель" - -#: src/slic3r/GUI/MainFrame.cpp:1055 -msgid "Eject SD card / Flash drive after the G-code was exported to it." -msgstr "Извлечение SD-карты / USB-Ð½Ð°ÐºÐ¾Ð¿Ð¸Ñ‚ÐµÐ»Ñ (поÑле ÑкÑпорта G-кода на ноÑитель)" - -#: src/slic3r/GUI/MainFrame.cpp:1063 -msgid "Quick Slice" -msgstr "БыÑтро нарезать" - -#: src/slic3r/GUI/MainFrame.cpp:1063 -msgid "Slice a file into a G-code" -msgstr "Ðарезать файл" - -#: src/slic3r/GUI/MainFrame.cpp:1069 -msgid "Quick Slice and Save As" -msgstr "БыÑтро нарезать и Ñохранить как" - -#: src/slic3r/GUI/MainFrame.cpp:1069 -msgid "Slice a file into a G-code, save as" -msgstr "Ðарезать файл и Ñохранить как" - -#: src/slic3r/GUI/MainFrame.cpp:1075 -msgid "Repeat Last Quick Slice" -msgstr "Повторить поÑледнюю быÑтрую нарезку" - -#: src/slic3r/GUI/MainFrame.cpp:1075 -msgid "Repeat last quick slice" -msgstr "Повтор поÑледней быÑтрой нарезки" - -#: src/slic3r/GUI/MainFrame.cpp:1083 -msgid "(Re)Slice No&w" -msgstr "(&Пере)Ðарезать" - -#: src/slic3r/GUI/MainFrame.cpp:1083 -msgid "Start new slicing process" -msgstr "Ðачать новый процеÑÑ Ð½Ð°Ñ€ÐµÐ·ÐºÐ¸" - -#: src/slic3r/GUI/MainFrame.cpp:1087 -msgid "&Repair STL file" -msgstr "По&чинить STL файл" - -#: src/slic3r/GUI/MainFrame.cpp:1087 -msgid "Automatically repair an STL file" -msgstr "ÐвтоматичеÑÐºÐ°Ñ Ð¿Ð¾Ñ‡Ð¸Ð½ÐºÐ° STL файла" - -#: src/slic3r/GUI/MainFrame.cpp:1091 -msgid "&G-code preview" -msgstr "Пред&проÑмотр G-кода" - -#: src/slic3r/GUI/MainFrame.cpp:1094 src/slic3r/GUI/MainFrame.cpp:1264 -======= #: src/slic3r/GUI/MainFrame.cpp:1187 msgid "&Save Project" msgstr "&Сохранить проект" @@ -9895,66 +6063,9 @@ msgid "&G-code Preview" msgstr "Пр&едпроÑмотр G-кода" #: src/slic3r/GUI/MainFrame.cpp:1304 src/slic3r/GUI/MainFrame.cpp:1538 ->>>>>>> master msgid "&Quit" msgstr "Ð’&ыход" -<<<<<<< HEAD -#: src/slic3r/GUI/MainFrame.cpp:1094 src/slic3r/GUI/MainFrame.cpp:1264 -#, c-format -msgid "Quit %s" -msgstr "Выйти из %s" - -#: src/slic3r/GUI/MainFrame.cpp:1109 -msgid "&Select all" -msgstr "Выбрать &вÑÑ‘" - -#: src/slic3r/GUI/MainFrame.cpp:1110 -msgid "Selects all objects" -msgstr "Выбрать вÑе модели" - -#: src/slic3r/GUI/MainFrame.cpp:1112 -msgid "D&eselect all" -msgstr "&СнÑÑ‚ÑŒ выбор Ñо вÑего" - -#: src/slic3r/GUI/MainFrame.cpp:1113 -msgid "Deselects all objects" -msgstr "Выбрать вÑе модели" - -#: src/slic3r/GUI/MainFrame.cpp:1116 -msgid "&Delete selected" -msgstr "&Удалить выбранные" - -#: src/slic3r/GUI/MainFrame.cpp:1117 -msgid "Deletes the current selection" -msgstr "Удалить текущие выбранные модели" - -#: src/slic3r/GUI/MainFrame.cpp:1119 -msgid "Delete &all" -msgstr "Уд&алить вÑÑ‘" - -#: src/slic3r/GUI/MainFrame.cpp:1120 -msgid "Deletes all objects" -msgstr "Удалить вÑе модели" - -#: src/slic3r/GUI/MainFrame.cpp:1124 -msgid "&Undo" -msgstr "&Отмена" - -#: src/slic3r/GUI/MainFrame.cpp:1127 -msgid "&Redo" -msgstr "&Повтор" - -#: src/slic3r/GUI/MainFrame.cpp:1132 -msgid "&Copy" -msgstr "С&копировать" - -#: src/slic3r/GUI/MainFrame.cpp:1133 -msgid "Copy selection to clipboard" -msgstr "Скопировать выделенное в буфер обмена" - -#: src/slic3r/GUI/MainFrame.cpp:1135 -======= #: src/slic3r/GUI/MainFrame.cpp:1304 src/slic3r/GUI/MainFrame.cpp:1538 #, c-format, boost-format msgid "Quit %s" @@ -10009,181 +6120,9 @@ msgid "Copy selection to clipboard" msgstr "Скопировать выделенное в буфер обмена" #: src/slic3r/GUI/MainFrame.cpp:1345 ->>>>>>> master msgid "&Paste" msgstr "Ð’Ñ&тавить" -<<<<<<< HEAD -#: src/slic3r/GUI/MainFrame.cpp:1136 -msgid "Paste clipboard" -msgstr "Ð’Ñтавить из буфера обмена" - -#: src/slic3r/GUI/MainFrame.cpp:1141 src/slic3r/GUI/MainFrame.cpp:1145 -#: src/slic3r/GUI/MainFrame.cpp:1248 src/slic3r/GUI/MainFrame.cpp:1252 -msgid "Re&load from disk" -msgstr "Пере&загрузить Ñ Ð´Ð¸Ñка" - -#: src/slic3r/GUI/MainFrame.cpp:1151 -msgid "Searc&h" -msgstr "&ПоиÑк" - -#: src/slic3r/GUI/MainFrame.cpp:1152 -msgid "Search in settings" -msgstr "ПоиÑк в наÑтройках" - -#: src/slic3r/GUI/MainFrame.cpp:1160 -msgid "&Plater Tab" -msgstr "Вкладка &Ñтола" - -#: src/slic3r/GUI/MainFrame.cpp:1160 -msgid "Show the plater" -msgstr "Показать вкладку Ñтола" - -#: src/slic3r/GUI/MainFrame.cpp:1165 -msgid "P&rint Settings Tab" -msgstr "Вкладка наÑтройки &печати" - -#: src/slic3r/GUI/MainFrame.cpp:1165 -msgid "Show the print settings" -msgstr "Показать наÑтройки печати" - -#: src/slic3r/GUI/MainFrame.cpp:1168 src/slic3r/GUI/MainFrame.cpp:1308 -msgid "&Filament Settings Tab" -msgstr "Вкладка наÑтройки п&рутка" - -#: src/slic3r/GUI/MainFrame.cpp:1168 -msgid "Show the filament settings" -msgstr "Показать наÑтройки прутка" - -#: src/slic3r/GUI/MainFrame.cpp:1172 -msgid "Print&er Settings Tab" -msgstr "Вкладка наÑтройки прин&тера" - -#: src/slic3r/GUI/MainFrame.cpp:1172 -msgid "Show the printer settings" -msgstr "Показать наÑтройки принтера" - -#: src/slic3r/GUI/MainFrame.cpp:1178 -msgid "3&D" -msgstr "&3D-вид" - -#: src/slic3r/GUI/MainFrame.cpp:1178 -msgid "Show the 3D editing view" -msgstr "Показать вкладку 3D-вид" - -#: src/slic3r/GUI/MainFrame.cpp:1181 -msgid "Pre&view" -msgstr "Предпр&оÑмотр нарезки" - -#: src/slic3r/GUI/MainFrame.cpp:1181 -msgid "Show the 3D slices preview" -msgstr "Показать предпроÑмотр нарезки" - -#: src/slic3r/GUI/MainFrame.cpp:1187 -msgid "Print &Host Upload Queue" -msgstr "Очередь загрузки на &хоÑÑ‚ печати" - -#: src/slic3r/GUI/MainFrame.cpp:1187 -msgid "Display the Print Host Upload Queue window" -msgstr "Показать очередь загрузки на хоÑÑ‚ печати" - -#: src/slic3r/GUI/MainFrame.cpp:1201 -msgid "Show &labels" -msgstr "Показать &имена файлов" - -#: src/slic3r/GUI/MainFrame.cpp:1201 -msgid "Show object/instance labels in 3D scene" -msgstr "Отображать имена файлов моделей\\копий в окне 3D-вида" - -#: src/slic3r/GUI/MainFrame.cpp:1204 -msgid "&Collapse sidebar" -msgstr "&Свернуть боковую панель" - -#: src/slic3r/GUI/MainFrame.cpp:1204 src/slic3r/GUI/Plater.cpp:2247 -msgid "Collapse sidebar" -msgstr "Свернуть боковую панель" - -#: src/slic3r/GUI/MainFrame.cpp:1216 src/slic3r/GUI/MainFrame.cpp:1279 -msgid "&File" -msgstr "&Файл" - -#: src/slic3r/GUI/MainFrame.cpp:1217 -msgid "&Edit" -msgstr "&Правка" - -#: src/slic3r/GUI/MainFrame.cpp:1218 -msgid "&Window" -msgstr "&Окна" - -#: src/slic3r/GUI/MainFrame.cpp:1219 src/slic3r/GUI/MainFrame.cpp:1280 -msgid "&View" -msgstr "&Вид" - -#: src/slic3r/GUI/MainFrame.cpp:1222 src/slic3r/GUI/MainFrame.cpp:1283 -msgid "&Help" -msgstr "&Помощь" - -#: src/slic3r/GUI/MainFrame.cpp:1244 -msgid "&Open G-code" -msgstr "&Открыть G-код файл" - -#: src/slic3r/GUI/MainFrame.cpp:1260 -msgid "Open &PrusaSlicer" -msgstr "Открыть &PrusaSlicer" - -#: src/slic3r/GUI/MainFrame.cpp:1305 -msgid "E&xport" -msgstr "&ÐкÑпорт" - -#: src/slic3r/GUI/MainFrame.cpp:1306 -msgid "S&end to print" -msgstr "&Отправить на печать" - -#: src/slic3r/GUI/MainFrame.cpp:1308 -msgid "Mate&rial Settings Tab" -msgstr "Вкладка наÑтройки материала" - -#: src/slic3r/GUI/MainFrame.cpp:1331 -msgid "Choose a file to slice (STL/OBJ/AMF/3MF/PRUSA):" -msgstr "Выберите файл Ð´Ð»Ñ Ð½Ð°Ñ€ÐµÐ·ÐºÐ¸ (STL/OBJ/AMF/3MF/PRUSA):" - -#: src/slic3r/GUI/MainFrame.cpp:1342 -msgid "No previously sliced file." -msgstr "Ðет ранее нарезанного файла." - -#: src/slic3r/GUI/MainFrame.cpp:1348 -msgid "Previously sliced file (" -msgstr "Ранее нарезанный файл" - -#: src/slic3r/GUI/MainFrame.cpp:1348 -msgid ") not found." -msgstr ") не найден." - -#: src/slic3r/GUI/MainFrame.cpp:1349 -msgid "File Not Found" -msgstr "Файл не найден" - -#: src/slic3r/GUI/MainFrame.cpp:1384 -#, c-format -msgid "Save %s file as:" -msgstr "Сохранить %s файл как:" - -#: src/slic3r/GUI/MainFrame.cpp:1384 -msgid "SVG" -msgstr "SVG" - -#: src/slic3r/GUI/MainFrame.cpp:1384 -msgid "G-code" -msgstr "G-код" - -#: src/slic3r/GUI/MainFrame.cpp:1396 -msgid "Save zip file as:" -msgstr "Сохранить .zip файл как:" - -#: src/slic3r/GUI/MainFrame.cpp:1405 src/slic3r/GUI/Plater.cpp:3009 -#: src/slic3r/GUI/Plater.cpp:5581 src/slic3r/GUI/Tab.cpp:1575 -#: src/slic3r/GUI/Tab.cpp:4115 -======= #: src/slic3r/GUI/MainFrame.cpp:1346 msgid "Paste clipboard" msgstr "Ð’Ñтавить из буфера обмена" @@ -10378,51 +6317,10 @@ msgstr "Сохранить .zip файл как:" #: src/slic3r/GUI/MainFrame.cpp:1682 src/slic3r/GUI/Plater.cpp:3295 #: src/slic3r/GUI/Plater.cpp:6011 src/slic3r/GUI/Tab.cpp:1666 #: src/slic3r/GUI/Tab.cpp:4674 ->>>>>>> master msgid "Slicing" msgstr "Ðарезка" #. TRN "Processing input_file_basename" -<<<<<<< HEAD -#: src/slic3r/GUI/MainFrame.cpp:1407 -#, c-format -msgid "Processing %s" -msgstr "Обработка %s" - -#: src/slic3r/GUI/MainFrame.cpp:1430 -msgid "%1% was successfully sliced." -msgstr "%1% уÑпешно нарезан." - -#: src/slic3r/GUI/MainFrame.cpp:1432 -msgid "Slicing Done!" -msgstr "Ðарезка завершена!" - -#: src/slic3r/GUI/MainFrame.cpp:1447 -msgid "Select the STL file to repair:" -msgstr "Выберите STL файл Ð´Ð»Ñ Ð¿Ð¾Ñ‡Ð¸Ð½ÐºÐ¸:" - -#: src/slic3r/GUI/MainFrame.cpp:1457 -msgid "Save OBJ file (less prone to coordinate errors than STL) as:" -msgstr "Сохранить в OBJ как (меньше подвержен ошибкам в координатах, чем STL):" - -#: src/slic3r/GUI/MainFrame.cpp:1469 -msgid "Your file was repaired." -msgstr "Ваш файл был починен." - -#: src/slic3r/GUI/MainFrame.cpp:1469 src/libslic3r/PrintConfig.cpp:3735 -msgid "Repair" -msgstr "Ремонт" - -#: src/slic3r/GUI/MainFrame.cpp:1483 -msgid "Save configuration as:" -msgstr "Сохранить конфигурацию в файл как:" - -#: src/slic3r/GUI/MainFrame.cpp:1502 src/slic3r/GUI/MainFrame.cpp:1564 -msgid "Select configuration to load:" -msgstr "Выберите файл конфигурации Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸:" - -#: src/slic3r/GUI/MainFrame.cpp:1538 -======= #: src/slic3r/GUI/MainFrame.cpp:1684 #, c-format, boost-format msgid "Processing %s" @@ -10478,127 +6376,9 @@ msgstr "" "ÑкÑпортированы в пакет конфигурации." #: src/slic3r/GUI/MainFrame.cpp:1819 ->>>>>>> master msgid "Save presets bundle as:" msgstr "Сохранить вÑе конфигурации в файл как:" -<<<<<<< HEAD -#: src/slic3r/GUI/MainFrame.cpp:1585 -#, c-format -msgid "%d presets successfully imported." -msgstr "УÑпешно импортировано профилей: %d шт." - -#: src/slic3r/GUI/Mouse3DController.cpp:461 -msgid "3Dconnexion settings" -msgstr "ÐаÑтройки 3Dconnexion" - -#: src/slic3r/GUI/Mouse3DController.cpp:472 -msgid "Device:" -msgstr "УÑтройÑтво:" - -#: src/slic3r/GUI/Mouse3DController.cpp:477 -msgid "Speed:" -msgstr "СкороÑÑ‚ÑŒ:" - -#: src/slic3r/GUI/Mouse3DController.cpp:480 src/slic3r/GUI/Mouse3DController.cpp:501 -msgid "Translation" -msgstr "Перемещение" - -#: src/slic3r/GUI/Mouse3DController.cpp:492 src/slic3r/GUI/Mouse3DController.cpp:501 -msgid "Zoom" -msgstr "МаÑштаб" - -#: src/slic3r/GUI/Mouse3DController.cpp:498 -msgid "Deadzone:" -msgstr "ÐœÑ‘Ñ€Ñ‚Ð²Ð°Ñ Ð·Ð¾Ð½Ð°:" - -#: src/slic3r/GUI/Mouse3DController.cpp:513 -msgid "Options:" -msgstr "Опции:" - -#: src/slic3r/GUI/Mouse3DController.cpp:516 -msgid "Swap Y/Z axes" -msgstr "ПоменÑÑ‚ÑŒ меÑтами оÑи Y/Z" - -#: src/slic3r/GUI/MsgDialog.cpp:70 -#, c-format -msgid "%s error" -msgstr "%s ошибка" - -#: src/slic3r/GUI/MsgDialog.cpp:71 -#, c-format -msgid "%s has encountered an error" -msgstr "%s обнаружил ошибку" - -#: src/slic3r/GUI/NotificationManager.hpp:471 -msgid "3D Mouse disconnected." -msgstr "3D-мышь отключена." - -#: src/slic3r/GUI/NotificationManager.hpp:474 -msgid "Configuration update is available." -msgstr "ДоÑтупно обновление конфигурации." - -#: src/slic3r/GUI/NotificationManager.hpp:474 -msgid "See more." -msgstr "Подробнее." - -#: src/slic3r/GUI/NotificationManager.hpp:476 -msgid "New version is available." -msgstr "ДоÑтупна Ð½Ð¾Ð²Ð°Ñ Ð²ÐµÑ€ÑиÑ." - -#: src/slic3r/GUI/NotificationManager.hpp:476 -msgid "See Releases page." -msgstr "Смотрите Ñтраницу релизов." - -#: src/slic3r/GUI/NotificationManager.hpp:479 -msgid "" -"You have just added a G-code for color change, but its value is empty.\n" -"To export the G-code correctly, check the \"Color Change G-code\" in \"Printer " -"Settings > Custom G-code\"" -msgstr "" -"Ð’Ñ‹ только что добавили G-код Ñмена цвета, но его значение в ÑоответÑтвующем поле не " -"задано.\n" -"Ð”Ð»Ñ Ð¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¾Ð³Ð¾ ÑкÑпорта G-кода, проверьте пункт \"G-код Ñмены цвета\" в разделе " -"ÐаÑтройки принтера > ПользовательÑкий G-код." - -#: src/slic3r/GUI/NotificationManager.cpp:490 -#: src/slic3r/GUI/NotificationManager.cpp:500 -msgid "More" -msgstr "Подробнее" - -#: src/slic3r/GUI/NotificationManager.cpp:864 -#: src/slic3r/GUI/NotificationManager.cpp:1141 -msgid "Export G-Code." -msgstr "ÐкÑпорт в G-код." - -#: src/slic3r/GUI/NotificationManager.cpp:908 -msgid "Open Folder." -msgstr "Открыть папку." - -#: src/slic3r/GUI/NotificationManager.cpp:946 -msgid "Eject drive" -msgstr "Извлечь диÑк" - -#: src/slic3r/GUI/NotificationManager.cpp:1060 -#: src/slic3r/GUI/NotificationManager.cpp:1076 -#: src/slic3r/GUI/NotificationManager.cpp:1087 -msgid "ERROR:" -msgstr "ОШИБКÐ:" - -#: src/slic3r/GUI/NotificationManager.cpp:1065 -#: src/slic3r/GUI/NotificationManager.cpp:1080 -#: src/slic3r/GUI/NotificationManager.cpp:1095 -msgid "WARNING:" -msgstr "ПРЕДУПРЕЖДЕÐИЕ:" - -#: src/slic3r/GUI/NotificationManager.cpp:1144 -msgid "Slicing finished." -msgstr "Ðарезка завершена." - -#: src/slic3r/GUI/NotificationManager.cpp:1186 -msgid "Exporting finished." -msgstr "ÐкÑпорт завершён." -======= #: src/slic3r/GUI/MainFrame.cpp:1842 msgid "Loading of a configuration bundle" msgstr "Загрузка пакета конфигураций" @@ -10820,7 +6600,6 @@ msgstr "ÐкÑпорт завершён." #: src/slic3r/GUI/ObjectDataViewModel.cpp:50 msgid "Paint-on seam" msgstr "РиÑование шва" ->>>>>>> master #: src/slic3r/GUI/ObjectDataViewModel.cpp:52 msgid "Sinking" @@ -10836,13 +6615,8 @@ msgstr "Копии" msgid "Instance %d" msgstr "ÐšÐ¾Ð¿Ð¸Ñ %d" -<<<<<<< HEAD -#: src/slic3r/GUI/ObjectDataViewModel.cpp:69 src/slic3r/GUI/Tab.cpp:3962 -#: src/slic3r/GUI/Tab.cpp:4044 -======= #: src/slic3r/GUI/ObjectDataViewModel.cpp:105 src/slic3r/GUI/Tab.cpp:4512 #: src/slic3r/GUI/Tab.cpp:4603 ->>>>>>> master msgid "Layers" msgstr "Слои" @@ -10856,17 +6630,10 @@ msgid "" "PrusaSlicer requires OpenGL 2.0 capable graphics driver to run correctly, \n" "while OpenGL version %s, render %s, vendor %s was detected." msgstr "" -<<<<<<< HEAD -"Обнаружена графичеÑÐºÐ°Ñ Ð¿Ð¾Ð´ÑиÑтема Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ¾Ð¹ OpenGL верÑии %s (рендеринг %s, " -"поÑтавщик %s).\n" -"Ð”Ð»Ñ Ð¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¾Ð¹ же работы PrusaSlicer требуетÑÑ Ð´Ñ€Ð°Ð¹Ð²ÐµÑ€ графичеÑкой подÑиÑтемы, " -"поддерживающий OpenGL 2.0." -======= "Обнаружена графичеÑÐºÐ°Ñ Ð¿Ð¾Ð´ÑиÑтема Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ¾Ð¹ OpenGL верÑии %s (рендеринг " "%s, поÑтавщик %s).\n" "Ð”Ð»Ñ Ð¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¾Ð¹ же работы PrusaSlicer требуетÑÑ Ð´Ñ€Ð°Ð¹Ð²ÐµÑ€ графичеÑкой " "подÑиÑтемы, поддерживающий OpenGL 2.0." ->>>>>>> master #: src/slic3r/GUI/OpenGLManager.cpp:260 msgid "You may need to update your graphics card driver." @@ -10874,20 +6641,11 @@ msgstr "Возможно, вам потребуетÑÑ Ð¾Ð±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ драР#: src/slic3r/GUI/OpenGLManager.cpp:263 msgid "" -<<<<<<< HEAD -"As a workaround, you may run PrusaSlicer with a software rendered 3D graphics by " -"running prusa-slicer.exe with the --sw_renderer parameter." -msgstr "" -"Ð’ качеÑтве обходного пути вы можете запуÑтить PrusaSlicer Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð½Ñ‹Ð¼ рендерингом " -"(поÑÑ‚Ñ€Ð¾ÐµÐ½Ð¸Ñ Ð¸Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ Ð±ÐµÐ· помощи GPU), запуÑтив prusa-slicer.exe Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¾Ð¼ --" -"sw_renderer." -======= "As a workaround, you may run PrusaSlicer with a software rendered 3D " "graphics by running prusa-slicer.exe with the --sw-renderer parameter." msgstr "" "Ð’ качеÑтве обходного пути вы можете запуÑтить PrusaSlicer Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð½Ð¾Ð¹ " "рендерингом 3D-графики, запуÑтив prusa-sler.exe Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¾Ð¼ --sw-renderer." ->>>>>>> master #: src/slic3r/GUI/OpenGLManager.cpp:265 msgid "Unsupported OpenGL version" @@ -10906,20 +6664,12 @@ msgstr "" msgid "Error loading shaders" msgstr "Ошибка загрузки шейдеров" -<<<<<<< HEAD -#: src/slic3r/GUI/OptionsGroup.cpp:335 -======= #: src/slic3r/GUI/OptionsGroup.cpp:352 ->>>>>>> master msgctxt "Layers" msgid "Top" msgstr "Сверху" -<<<<<<< HEAD -#: src/slic3r/GUI/OptionsGroup.cpp:335 -======= #: src/slic3r/GUI/OptionsGroup.cpp:352 ->>>>>>> master msgctxt "Layers" msgid "Bottom" msgstr "Снизу" @@ -10932,15 +6682,7 @@ msgstr "Удалить Ñтот профиль у данного принтерРmsgid "This printer will be shown in the presets list as" msgstr "Ðтот принтер будет отображатьÑÑ Ð² ÑпиÑке профилей как" -<<<<<<< HEAD -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:155 -msgid "Physical Printer" -msgstr "ФизичеÑкий принтер" - -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:161 -======= #: src/slic3r/GUI/PhysicalPrinterDialog.cpp:165 ->>>>>>> master msgid "Type here the name of your printer device" msgstr "Введите здеÑÑŒ Ð¸Ð¼Ñ Ð²Ð°ÑˆÐµÐ³Ð¾ принтера" @@ -10958,12 +6700,8 @@ msgstr "Загрузка на хоÑÑ‚ печати" #: src/slic3r/GUI/PhysicalPrinterDialog.cpp:268 msgid "Connection to printers connected via the print host failed." -<<<<<<< HEAD -msgstr "Ðе удалоÑÑŒ подключитьÑÑ Ðº принтерам, подключенным через через хоÑÑ‚ печати." -======= msgstr "" "Ðе удалоÑÑŒ подключитьÑÑ Ðº принтерам, подключенным через через хоÑÑ‚ печати." ->>>>>>> master #: src/slic3r/GUI/PhysicalPrinterDialog.cpp:310 msgid "Test" @@ -10983,8 +6721,8 @@ msgstr "Обновить принтеры" #: src/slic3r/GUI/PhysicalPrinterDialog.cpp:364 msgid "" -"HTTPS CA file is optional. It is only needed if you use HTTPS with a self-signed " -"certificate." +"HTTPS CA file is optional. It is only needed if you use HTTPS with a self-" +"signed certificate." msgstr "" "Файл HTTPS CA не обÑзателен. Он необходим только при иÑпользовании HTTPS Ñ " "ÑамоподпиÑанным Ñертификатом." @@ -10997,28 +6735,19 @@ msgstr "Файлы Ñертификатов (*.crt, *.pem)|*.crt;*.pem|Ð’Ñе Ñ„ msgid "Open CA certificate file" msgstr "Открыть файл Ñертификата CA" -<<<<<<< HEAD -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:395 src/libslic3r/PrintConfig.cpp:124 -======= #: src/slic3r/GUI/PhysicalPrinterDialog.cpp:404 #: src/libslic3r/PrintConfig.cpp:307 ->>>>>>> master msgid "HTTPS CA File" msgstr "Файл HTTPS CA Ñертификата" #: src/slic3r/GUI/PhysicalPrinterDialog.cpp:405 #, c-format, boost-format msgid "" -"On this system, %s uses HTTPS certificates from the system Certificate Store or " -"Keychain." +"On this system, %s uses HTTPS certificates from the system Certificate Store " +"or Keychain." msgstr "" -<<<<<<< HEAD -"Ð’ Ñтой ÑиÑтеме %s иÑпользует HTTPS Ñертификаты из ÑиÑтемного хранилища Ñертификатов/" -"Keychain." -======= "Ð’ Ñтой ÑиÑтеме %s иÑпользует HTTPS Ñертификаты из ÑиÑтемного хранилища " "Ñертификатов/Keychain." ->>>>>>> master #: src/slic3r/GUI/PhysicalPrinterDialog.cpp:406 msgid "" @@ -11048,13 +6777,6 @@ msgstr "Заменить?" #: src/slic3r/GUI/PhysicalPrinterDialog.cpp:670 #, boost-format msgid "" -<<<<<<< HEAD -"Following printer preset(s) is duplicated:%1%The above preset for printer \"%2%\" " -"will be used just once." -msgstr "" -"Следующий профиль(-и) принтера будет продублирован: %1% Вышеуказанный профиль Ð´Ð»Ñ " -"принтера %2% будет иÑпользован только один раз." -======= "Following printer preset is duplicated:%1%The above preset for printer \"%2%" "\" will be used just once." msgid_plural "" @@ -11069,13 +6791,10 @@ msgstr[1] "" msgstr[2] "" "Следующие профили принтера дублируютÑÑ:%1%ВышеупомÑнутые профили Ð´Ð»Ñ " "принтера \\\"%2%\\\" будут иÑпользоватьÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ один раз." ->>>>>>> master #: src/slic3r/GUI/PhysicalPrinterDialog.cpp:720 msgid "It's not possible to delete the last related preset for the printer." msgstr "Ðевозможно удалить поÑледний ÑвÑзанный профиль принтера." -<<<<<<< HEAD -======= #: src/slic3r/GUI/Plater.cpp:141 msgid "The provided name is not valid;" @@ -11093,7 +6812,6 @@ msgstr "" "Ð”Ð»Ñ Ð¼Ð¾Ð´ÐµÐ»Ð¸, ÑоÑтоÑщей из неÑкольких чаÑтей, Ñто значение не ÑвлÑетÑÑ " "точным.\n" "Оно не учитывает переÑÐµÑ‡ÐµÐ½Ð¸Ñ Ð¸ отрицательные объёмы." ->>>>>>> master #: src/slic3r/GUI/Plater.cpp:211 msgid "Volume" @@ -11126,14 +6844,11 @@ msgstr "ИÑпользовано материала (единиц)" #: src/slic3r/GUI/Plater.cpp:300 msgid "Cost (money)" msgstr "СтоимоÑÑ‚ÑŒ" -<<<<<<< HEAD -======= #: src/slic3r/GUI/Plater.cpp:301 src/slic3r/GUI/Plater.cpp:1339 #: src/slic3r/GUI/Plater.cpp:1426 msgid "Estimated printing time" msgstr "РаÑчётное Ð²Ñ€ÐµÐ¼Ñ Ð¿ÐµÑ‡Ð°Ñ‚Ð¸" ->>>>>>> master #: src/slic3r/GUI/Plater.cpp:302 msgid "Number of tool changes" @@ -11143,13 +6858,8 @@ msgstr "КоличеÑтво инÑтрументов" msgid "Select what kind of support do you need" msgstr "Выбор варианта поддержки" -<<<<<<< HEAD -#: src/slic3r/GUI/Plater.cpp:362 src/libslic3r/PrintConfig.cpp:2128 -#: src/libslic3r/PrintConfig.cpp:2923 -======= #: src/slic3r/GUI/Plater.cpp:433 src/libslic3r/PrintConfig.cpp:2540 #: src/libslic3r/PrintConfig.cpp:3499 ->>>>>>> master msgid "Support on build plate only" msgstr "Только от Ñтола" @@ -11161,30 +6871,19 @@ msgstr "Только принудительнаÑ" msgid "Everywhere" msgstr "Везде" -<<<<<<< HEAD -#: src/slic3r/GUI/Plater.cpp:396 src/slic3r/GUI/Tab.cpp:1469 -======= #: src/slic3r/GUI/Plater.cpp:467 src/slic3r/GUI/Tab.cpp:1545 ->>>>>>> master msgid "Brim" msgstr "Кайма" #: src/slic3r/GUI/Plater.cpp:469 msgid "" -"This flag enables the brim that will be printed around each object on the first " -"layer." +"This flag enables the brim that will be printed around each object on the " +"first layer." msgstr "" -<<<<<<< HEAD -"РаÑÑтоÑние от модели до Ñамой дальней линии каймы. Ð¨Ð¸Ñ€Ð¾ÐºÐ°Ñ ÐºÐ°Ð¹Ð¼Ð° повышает адгезию к " -"Ñтолу, но уменьшает полезную площадь печати. Увеличение Ñтого параметра очень важно " -"Ð´Ð»Ñ Ð¼Ð¾Ð´ÐµÐ»ÐµÐ¹ Ñ Ð¼Ð°Ð»ÐµÐ½ÑŒÐºÐ¾Ð¹ площадью контакта Ñо Ñтолом и оÑобенно важно при печати ABS " -"плаÑтиком." -======= "РаÑÑтоÑние от модели до Ñамой дальней линии каймы. Ð¨Ð¸Ñ€Ð¾ÐºÐ°Ñ ÐºÐ°Ð¹Ð¼Ð° повышает " "адгезию к Ñтолу, но уменьшает полезную площадь печати. Увеличение Ñтого " "параметра очень важно Ð´Ð»Ñ Ð¼Ð¾Ð´ÐµÐ»ÐµÐ¹ Ñ Ð¼Ð°Ð»ÐµÐ½ÑŒÐºÐ¾Ð¹ площадью контакта Ñо Ñтолом и " "оÑобенно важно при печати ABS плаÑтиком." ->>>>>>> master #: src/slic3r/GUI/Plater.cpp:477 msgid "Purging volumes" @@ -11196,28 +6895,11 @@ msgstr "Выбор варианта подложки" #: src/slic3r/GUI/Plater.cpp:579 msgid "Below object" -<<<<<<< HEAD -msgstr "Ðиже модели" -======= msgstr "Под моделью" ->>>>>>> master #: src/slic3r/GUI/Plater.cpp:580 msgid "Around object" msgstr "Вокруг модели" -<<<<<<< HEAD - -#: src/slic3r/GUI/Plater.cpp:695 -msgid "SLA print settings" -msgstr "ÐаÑтройки SLA печати" - -#: src/slic3r/GUI/Plater.cpp:756 src/slic3r/GUI/Plater.cpp:6055 -msgid "Send to printer" -msgstr "Ðа принтер" - -#: src/slic3r/GUI/Plater.cpp:771 src/slic3r/GUI/Plater.cpp:3009 -#: src/slic3r/GUI/Plater.cpp:5584 -======= #: src/slic3r/GUI/Plater.cpp:893 src/slic3r/GUI/Plater.cpp:6493 msgid "Send to printer" @@ -11225,35 +6907,12 @@ msgstr "Ðа принтер" #: src/slic3r/GUI/Plater.cpp:913 src/slic3r/GUI/Plater.cpp:3295 #: src/slic3r/GUI/Plater.cpp:6014 ->>>>>>> master msgid "Slice now" msgstr "ÐÐРЕЗÐТЬ" #: src/slic3r/GUI/Plater.cpp:1086 msgid "Hold Shift to Slice & Export G-code" msgstr "Удерживайте клавишу Shift, чтобы нарезать и ÑкÑпортировать в G-код" -<<<<<<< HEAD - -#: src/slic3r/GUI/Plater.cpp:1071 -#, c-format -msgid "%d (%d shells)" -msgstr "%d (оболочек: %d)" - -#: src/slic3r/GUI/Plater.cpp:1076 -#, c-format -msgid "Auto-repaired (%d errors)" -msgstr "ИÑправлено ошибок: %d" - -#: src/slic3r/GUI/Plater.cpp:1079 -#, c-format -msgid "" -"%d degenerate facets, %d edges fixed, %d facets removed, %d facets added, %d facets " -"reversed, %d backwards edges" -msgstr "" -"Вырожденных граней: %d. | Рёбер починено: %d. | Граней удалено: %d. | Граней " -"добавлено: %d. | Граней реверÑировано: %d. | Вывернуто рёбер: %d." -======= ->>>>>>> master #: src/slic3r/GUI/Plater.cpp:1286 #, boost-format @@ -11267,18 +6926,12 @@ msgstr[2] "%1% (%2$d оболочек)" msgid "Used Material (ml)" msgstr "ИÑпользовано материала (мл)" -<<<<<<< HEAD -#: src/slic3r/GUI/Plater.cpp:1113 -msgid "object(s)" -msgstr "модель(и)" -======= #: src/slic3r/GUI/Plater.cpp:1317 msgid "object" msgid_plural "objects" msgstr[0] "модель" msgstr[1] "модели" msgstr[2] "моделей" ->>>>>>> master #: src/slic3r/GUI/Plater.cpp:1317 msgid "supports and pad" @@ -11305,21 +6958,12 @@ msgstr "ИÑпользовано прутка (дюймы³)" msgid "Filament at extruder %1%" msgstr "Прутка в ÑкÑтрудере %1%" -<<<<<<< HEAD -#: src/slic3r/GUI/Plater.cpp:1195 -msgid "(including spool)" -msgstr "(Ð²ÐºÐ»ÑŽÑ‡Ð°Ñ ÐºÐ°Ñ‚ÑƒÑˆÐºÑƒ)" - -#: src/slic3r/GUI/Plater.cpp:1204 src/libslic3r/PrintConfig.cpp:822 -#: src/libslic3r/PrintConfig.cpp:2738 src/libslic3r/PrintConfig.cpp:2739 -======= #: src/slic3r/GUI/Plater.cpp:1401 msgid "(including spool)" msgstr "(Ð²ÐºÐ»ÑŽÑ‡Ð°Ñ ÐºÐ°Ñ‚ÑƒÑˆÐºÑƒ)" #: src/slic3r/GUI/Plater.cpp:1410 src/libslic3r/PrintConfig.cpp:1045 #: src/libslic3r/PrintConfig.cpp:3293 src/libslic3r/PrintConfig.cpp:3294 ->>>>>>> master msgid "Cost" msgstr "СтоимоÑÑ‚ÑŒ" @@ -11330,73 +6974,6 @@ msgstr "нормальный режим" #: src/slic3r/GUI/Plater.cpp:1435 msgid "stealth mode" msgstr "тихий режим" -<<<<<<< HEAD - -#: src/slic3r/GUI/Plater.cpp:1403 src/slic3r/GUI/Plater.cpp:4923 -#, c-format -msgid "%s - Drop project file" -msgstr "%s - ПеретаÑкивание файла-проекта" - -#: src/slic3r/GUI/Plater.cpp:1410 src/slic3r/GUI/Plater.cpp:4930 -msgid "Open as project" -msgstr "Открыть как проект" - -#: src/slic3r/GUI/Plater.cpp:1411 src/slic3r/GUI/Plater.cpp:4931 -msgid "Import geometry only" -msgstr "Импортировать только геометрию" - -#: src/slic3r/GUI/Plater.cpp:1412 src/slic3r/GUI/Plater.cpp:4932 -msgid "Import config only" -msgstr "Импортировать только конфигурацию" - -#: src/slic3r/GUI/Plater.cpp:1415 src/slic3r/GUI/Plater.cpp:4935 -msgid "Select an action to apply to the file" -msgstr "Выберите дейÑтвие Ð´Ð»Ñ Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ðº файлу" - -#: src/slic3r/GUI/Plater.cpp:1416 src/slic3r/GUI/Plater.cpp:4936 -msgid "Action" -msgstr "ДейÑтвие" - -#: src/slic3r/GUI/Plater.cpp:1424 src/slic3r/GUI/Plater.cpp:4944 -msgid "Don't show again" -msgstr "Больше не показывать" - -#: src/slic3r/GUI/Plater.cpp:1469 src/slic3r/GUI/Plater.cpp:4981 -msgid "You can open only one .gcode file at a time." -msgstr "За раз вы можете открыть только один .gcode файл." - -#: src/slic3r/GUI/Plater.cpp:1470 src/slic3r/GUI/Plater.cpp:4982 -msgid "Drag and drop G-code file" -msgstr "Перетащите G-код файл" - -#: src/slic3r/GUI/Plater.cpp:1524 src/slic3r/GUI/Plater.cpp:4796 -#: src/slic3r/GUI/Plater.cpp:5036 -msgid "Import Object" -msgstr "Импорт модели" - -#: src/slic3r/GUI/Plater.cpp:1546 src/slic3r/GUI/Plater.cpp:5058 -msgid "Load File" -msgstr "Загрузить файл" - -#: src/slic3r/GUI/Plater.cpp:1551 src/slic3r/GUI/Plater.cpp:5063 -msgid "Load Files" -msgstr "Загрузить файлы" - -#: src/slic3r/GUI/Plater.cpp:1654 -msgid "Fill bed" -msgstr "Заполнение вÑего Ñтола копиÑми" - -#: src/slic3r/GUI/Plater.cpp:1660 -msgid "Optimize Rotation" -msgstr "ÐžÐ¿Ñ‚Ð¸Ð¼Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ" - -#: src/slic3r/GUI/Plater.cpp:1666 -msgid "Import SLA archive" -msgstr "Импорт SLA архива" - -#: src/slic3r/GUI/Plater.cpp:2129 -#, c-format -======= #: src/slic3r/GUI/Plater.cpp:1672 msgid "Fill bed" @@ -11428,51 +7005,10 @@ msgstr "" #: src/slic3r/GUI/Plater.cpp:2197 #, c-format, boost-format ->>>>>>> master msgid "" "Successfully unmounted. The device %s(%s) can now be safely removed from the " "computer." msgstr "" -<<<<<<< HEAD -"Размонтирование прошло уÑпешно. Теперь уÑтройÑтво %s(%s) может быть безопаÑно " -"извлечено из компьютера." - -#: src/slic3r/GUI/Plater.cpp:2134 -#, c-format -msgid "Ejecting of device %s(%s) has failed." -msgstr "Ðе удалоÑÑŒ извлечь уÑтройÑтво %s(%s)." - -#: src/slic3r/GUI/Plater.cpp:2153 -msgid "New Project" -msgstr "Ðовый проект" - -#: src/slic3r/GUI/Plater.cpp:2246 -msgid "Expand sidebar" -msgstr "Развернуть боковую панель" - -#: src/slic3r/GUI/Plater.cpp:2319 -msgid "Loading" -msgstr "Загрузка" - -#: src/slic3r/GUI/Plater.cpp:2329 -msgid "Loading file" -msgstr "Загрузка файла" - -#: src/slic3r/GUI/Plater.cpp:2415 -#, c-format -msgid "" -"Some object(s) in file %s looks like saved in inches.\n" -"Should I consider them as a saved in inches and convert them?" -msgstr "" -"Похоже какаÑ-то модель(-и) в файле %s Ñохранена в дюймах.\n" -"Считать что она Ñохранена в дюймах и конвертировать?" - -#: src/slic3r/GUI/Plater.cpp:2417 -msgid "The object appears to be saved in inches" -msgstr "Похоже какаÑ-то модель(-и) в файле %s Ñохранена в дюймах" - -#: src/slic3r/GUI/Plater.cpp:2425 -======= "Размонтирование прошло уÑпешно. Теперь уÑтройÑтво %s(%s) может быть " "безопаÑно извлечено из компьютера." @@ -11588,23 +7124,11 @@ msgstr[2] "" "размеры моделей?" #: src/slic3r/GUI/Plater.cpp:2593 ->>>>>>> master msgid "" "This file contains several objects positioned at multiple heights.\n" "Instead of considering them as multiple objects, should \n" "the file be loaded as a single object having multiple parts?" msgstr "" -<<<<<<< HEAD -"Ðтот файл Ñодержит неÑколько моделей, раÑположенных на разных выÑотах.\n" -"ВмеÑто того, чтобы раÑÑматривать их как неÑколько моделей, Ñледует ли раÑÑматривать " -"Ñтот файл как одну модель ÑоÑтоÑщую из неÑколько чаÑтей?" - -#: src/slic3r/GUI/Plater.cpp:2428 src/slic3r/GUI/Plater.cpp:2481 -msgid "Multi-part object detected" -msgstr "Обнаружена модель, ÑоÑтоÑÑ‰Ð°Ñ Ð¸Ð· неÑкольких чаÑтей" - -#: src/slic3r/GUI/Plater.cpp:2435 -======= "Ðтот файл Ñодержит неÑколько моделей, находÑщихÑÑ Ð½Ð° разной выÑоте.\n" "Следует ли загружать файл как единую модель, ÑоÑтоÑщий из неÑкольких\n" "чаÑтей (вмеÑто того, чтобы раÑÑматривать их как неÑколько моделей)?" @@ -11614,22 +7138,10 @@ msgid "Multi-part object detected" msgstr "Обнаружена модель, ÑоÑтоÑÑ‰Ð°Ñ Ð¸Ð· неÑкольких чаÑтей" #: src/slic3r/GUI/Plater.cpp:2604 ->>>>>>> master msgid "" -"This file cannot be loaded in a simple mode. Do you want to switch to an advanced " -"mode?" +"This file cannot be loaded in a simple mode. Do you want to switch to an " +"advanced mode?" msgstr "" -<<<<<<< HEAD -"Ðтот файл не может быть загружен в проÑтом режиме. Хотите перейти в раÑширенный " -"режим?" - -#: src/slic3r/GUI/Plater.cpp:2436 -msgid "Detected advanced data" -msgstr "Обнаружены раÑширенные данные" - -#: src/slic3r/GUI/Plater.cpp:2458 -#, c-format -======= "Ðтот файл не может быть загружен в проÑтом режиме. Хотите перейти в " "раÑширенный режим?" @@ -11639,78 +7151,28 @@ msgstr "Обнаружены раÑширенные данные" #: src/slic3r/GUI/Plater.cpp:2625 #, c-format, boost-format ->>>>>>> master msgid "" -"You can't to add the object(s) from %s because of one or some of them is(are) multi-" -"part" +"You can't to add the object(s) from %s because of one or some of them " +"is(are) multi-part" msgstr "" "Ð’Ñ‹ не можете добавить модель(и) из %s, потому что одна или неÑколько из них " "ÑвлÑÑŽÑ‚ÑÑ ÑоÑтавными (ÑоÑтоÑÑ‚ из неÑкольких чаÑтей)" -<<<<<<< HEAD -#: src/slic3r/GUI/Plater.cpp:2478 -======= #: src/slic3r/GUI/Plater.cpp:2648 ->>>>>>> master msgid "" "Multiple objects were loaded for a multi-material printer.\n" "Instead of considering them as multiple objects, should I consider\n" "these files to represent a single object having multiple parts?" msgstr "" "Ð”Ð»Ñ Ð¼ÑƒÐ»ÑŒÑ‚Ð¸Ð¼Ð°Ñ‚ÐµÑ€Ð¸Ð°Ð»ÑŒÐ½Ð¾Ð³Ð¾ принтера было загружено неÑколько моделей.\n" -<<<<<<< HEAD -"ВмеÑто того, чтобы раÑÑматривать их как неÑколько моделей, Ñледует ли раÑÑматривать " -"их как одну модель, ÑоÑтоÑщую из неÑколько чаÑтей?" - -#: src/slic3r/GUI/Plater.cpp:2494 -msgid "Loaded" -msgstr "Загружено" - -#: src/slic3r/GUI/Plater.cpp:2596 -======= "ВмеÑто того, чтобы раÑÑматривать их как неÑколько моделей, Ñледует ли " "раÑÑматривать их как одну модель, ÑоÑтоÑщую из неÑколько чаÑтей?" #: src/slic3r/GUI/Plater.cpp:2767 ->>>>>>> master msgid "" -"Your object appears to be too large, so it was automatically scaled down to fit " -"your print bed." +"Your object appears to be too large, so it was automatically scaled down to " +"fit your print bed." msgstr "" -<<<<<<< HEAD -"Ваша модель Ñлишком большаÑ, поÑтому она была автоматичеÑки уменьшена до размера " -"вашего печатного Ñтола." - -#: src/slic3r/GUI/Plater.cpp:2597 -msgid "Object too large?" -msgstr "Модель Ñлишком большаÑ?" - -#: src/slic3r/GUI/Plater.cpp:2659 -msgid "Export STL file:" -msgstr "ÐкÑпорт в STL файл:" - -#: src/slic3r/GUI/Plater.cpp:2666 -msgid "Export AMF file:" -msgstr "ÐкÑпорт в AMF файл:" - -#: src/slic3r/GUI/Plater.cpp:2672 -msgid "Save file as:" -msgstr "Сохранить файл как:" - -#: src/slic3r/GUI/Plater.cpp:2678 -msgid "Export OBJ file:" -msgstr "ÐкÑпорт в OBJ файл:" - -#: src/slic3r/GUI/Plater.cpp:2774 -msgid "Delete Object" -msgstr "Удаление модели" - -#: src/slic3r/GUI/Plater.cpp:2785 -msgid "Reset Project" -msgstr "Обнуление проекта" - -#: src/slic3r/GUI/Plater.cpp:2857 -======= "Ваша модель Ñлишком большаÑ, поÑтому она была автоматичеÑки уменьшена до " "размера вашего печатного Ñтола." @@ -11747,310 +7209,10 @@ msgid "Reset Project" msgstr "Обнуление проекта" #: src/slic3r/GUI/Plater.cpp:3086 ->>>>>>> master msgid "" "The selected object couldn't be split because it contains only one solid " "part." msgstr "" -<<<<<<< HEAD -"Ð’Ñ‹Ð±Ñ€Ð°Ð½Ð½Ð°Ñ Ð¼Ð¾Ð´ÐµÐ»ÑŒ не может быть разделена, так как она Ñодержит более одного объёма/" -"материала." - -#: src/slic3r/GUI/Plater.cpp:2868 -msgid "Split to Objects" -msgstr "Разделить на модели" - -#: src/slic3r/GUI/Plater.cpp:2993 src/slic3r/GUI/Plater.cpp:3723 -msgid "Invalid data" -msgstr "Ðеверные данные" - -#: src/slic3r/GUI/Plater.cpp:3003 -msgid "Ready to slice" -msgstr "Готов к нарезке на Ñлои" - -#: src/slic3r/GUI/Plater.cpp:3041 src/slic3r/GUI/PrintHostDialogs.cpp:264 -msgid "Cancelling" -msgstr "Отмена" - -#: src/slic3r/GUI/Plater.cpp:3060 -msgid "Another export job is currently running." -msgstr "Уже идёт другой процеÑÑ ÑкÑпорта." - -#: src/slic3r/GUI/Plater.cpp:3177 -msgid "Please select the file to reload" -msgstr "ПожалуйÑта, выберите файл Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸" - -#: src/slic3r/GUI/Plater.cpp:3212 -msgid "It is not allowed to change the file to reload" -msgstr "Ðе разрешаетÑÑ Ð·Ð°Ð¼ÐµÐ½ÑÑ‚ÑŒ перезагружаемый файл" - -#: src/slic3r/GUI/Plater.cpp:3212 -msgid "Do you want to retry" -msgstr "Повторить Ñнова" - -#: src/slic3r/GUI/Plater.cpp:3230 -msgid "Reload from:" -msgstr "Перезагрузка из:" - -#: src/slic3r/GUI/Plater.cpp:3323 -msgid "Unable to reload:" -msgstr "Ðе удалоÑÑŒ перезагрузить:" - -#: src/slic3r/GUI/Plater.cpp:3328 -msgid "Error during reload" -msgstr "Ошибка во Ð²Ñ€ÐµÐ¼Ñ Ð¿ÐµÑ€ÐµÐ·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸" - -#: src/slic3r/GUI/Plater.cpp:3347 -msgid "Reload all from disk" -msgstr "Перезагрузить вÑÑ‘ Ñ Ð´Ð¸Ñка" - -#: src/slic3r/GUI/Plater.cpp:3374 -msgid "" -"ERROR: Please close all manipulators available from the left toolbar before fixing " -"the mesh." -msgstr "" -"ОШИБКÐ: ПожалуйÑта, перед починкой Ñетки, завершите вÑе манипулÑции на панели " -"инÑтрументов." - -#: src/slic3r/GUI/Plater.cpp:3380 -msgid "Fix through NetFabb" -msgstr "Ремонт модели Ñлужбой Netfabb" - -#: src/slic3r/GUI/Plater.cpp:3397 -msgid "Custom supports and seams were removed after repairing the mesh." -msgstr "ПользовательÑкие поддержки и швы были удалены поÑле почитки Ñетки." - -#: src/slic3r/GUI/Plater.cpp:3680 -msgid "There are active warnings concerning sliced models:" -msgstr "ИмеютÑÑ Ð°ÐºÑ‚Ð¸Ð²Ð½Ñ‹Ðµ Ð¿Ñ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ñ Ð¾ нарезанных моделÑÑ…:" - -#: src/slic3r/GUI/Plater.cpp:3691 -msgid "generated warnings" -msgstr "вызвала предупреждениÑ" - -#: src/slic3r/GUI/Plater.cpp:3731 src/slic3r/GUI/PrintHostDialogs.cpp:265 -msgid "Cancelled" -msgstr "Отменено" - -#: src/slic3r/GUI/Plater.cpp:3998 src/slic3r/GUI/Plater.cpp:4022 -msgid "Remove the selected object" -msgstr "Удалить выбранную модель" - -#: src/slic3r/GUI/Plater.cpp:4007 -msgid "Add one more instance of the selected object" -msgstr "Добавить ещё одну копию выбранной модели" - -#: src/slic3r/GUI/Plater.cpp:4009 -msgid "Remove one instance of the selected object" -msgstr "Удалить одну копию выбранной модели" - -#: src/slic3r/GUI/Plater.cpp:4011 -msgid "Set number of instances" -msgstr "Задать количеÑтво копий" - -#: src/slic3r/GUI/Plater.cpp:4011 -msgid "Change the number of instances of the selected object" -msgstr "Изменить количеÑтва копий выбранной модели" - -#: src/slic3r/GUI/Plater.cpp:4013 -msgid "Fill bed with instances" -msgstr "Заполнить веÑÑŒ Ñтол копиÑми" - -#: src/slic3r/GUI/Plater.cpp:4013 -msgid "Fill the remaining area of bed with instances of the selected object" -msgstr "Заполнить оÑтавшуюÑÑ Ð¾Ð±Ð»Ð°ÑÑ‚ÑŒ печатного Ñтола копиÑми выбранной модели" - -#: src/slic3r/GUI/Plater.cpp:4032 -msgid "Reload the selected object from disk" -msgstr "Перезагрузить выбранную модель файл Ñ Ð´Ð¸Ñка" - -#: src/slic3r/GUI/Plater.cpp:4035 -msgid "Export the selected object as STL file" -msgstr "ÐкÑпортировать выбранную модель в STL файл" - -#: src/slic3r/GUI/Plater.cpp:4065 -msgid "Along X axis" -msgstr "Вдоль оÑи X" - -#: src/slic3r/GUI/Plater.cpp:4065 -msgid "Mirror the selected object along the X axis" -msgstr "Отразить выбранную модель вдоль оÑи X" - -#: src/slic3r/GUI/Plater.cpp:4067 -msgid "Along Y axis" -msgstr "Вдоль оÑи Y" - -#: src/slic3r/GUI/Plater.cpp:4067 -msgid "Mirror the selected object along the Y axis" -msgstr "Отразить выбранную модель вдоль оÑи Y" - -#: src/slic3r/GUI/Plater.cpp:4069 -msgid "Along Z axis" -msgstr "Вдоль оÑи Z" - -#: src/slic3r/GUI/Plater.cpp:4069 -msgid "Mirror the selected object along the Z axis" -msgstr "Отразить выбранную модель вдоль оÑи Z" - -#: src/slic3r/GUI/Plater.cpp:4072 -msgid "Mirror" -msgstr "Отразить" - -#: src/slic3r/GUI/Plater.cpp:4072 -msgid "Mirror the selected object" -msgstr "Отразить выбранную модель" - -#: src/slic3r/GUI/Plater.cpp:4084 -msgid "To objects" -msgstr "Ðа модели" - -#: src/slic3r/GUI/Plater.cpp:4084 src/slic3r/GUI/Plater.cpp:4104 -msgid "Split the selected object into individual objects" -msgstr "Разделить выбранную модель на отдельные модели" - -#: src/slic3r/GUI/Plater.cpp:4086 -msgid "To parts" -msgstr "Ðа чаÑти" - -#: src/slic3r/GUI/Plater.cpp:4086 src/slic3r/GUI/Plater.cpp:4122 -msgid "Split the selected object into individual sub-parts" -msgstr "Разделить выбранную модель на отдельные чаÑти" - -#: src/slic3r/GUI/Plater.cpp:4089 src/slic3r/GUI/Plater.cpp:4104 -#: src/slic3r/GUI/Plater.cpp:4122 src/libslic3r/PrintConfig.cpp:3759 -msgid "Split" -msgstr "Разделить" - -#: src/slic3r/GUI/Plater.cpp:4089 -msgid "Split the selected object" -msgstr "Разделить выбранную модель" - -#: src/slic3r/GUI/Plater.cpp:4111 -msgid "Optimize orientation" -msgstr "ÐžÐ¿Ñ‚Ð¸Ð¼Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð¼Ð¾Ð´ÐµÐ»Ð¸" - -#: src/slic3r/GUI/Plater.cpp:4112 -msgid "Optimize the rotation of the object for better print results." -msgstr "ÐžÐ¿Ñ‚Ð¸Ð¼Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð¼Ð¾Ð´ÐµÐ»Ð¸ Ð´Ð»Ñ Ð»ÑƒÑ‡ÑˆÐµÐ³Ð¾ результата печати." - -#: src/slic3r/GUI/Plater.cpp:4192 -msgid "3D editor view" -msgstr "3D-вид" - -#: src/slic3r/GUI/Plater.cpp:4564 -msgid "" -"%1% printer was active at the time the target Undo / Redo snapshot was taken. " -"Switching to %1% printer requires reloading of %1% presets." -msgstr "" -"Принтер %1% был активен в момент ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ñ†ÐµÐ»ÐµÐ²Ð¾Ð³Ð¾ Ñнапшота Отмены / Повтора. " -"Переключение на принтер %1% потребует перезагрузки Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ %1%." - -#: src/slic3r/GUI/Plater.cpp:4768 -msgid "Load Project" -msgstr "Загрузка проекта" - -#: src/slic3r/GUI/Plater.cpp:4800 -msgid "Import Objects" -msgstr "Импорт моделей" - -#: src/slic3r/GUI/Plater.cpp:4868 -msgid "The selected file" -msgstr "Ð’ выбранном файле" - -#: src/slic3r/GUI/Plater.cpp:4868 -msgid "does not contain valid gcode." -msgstr "G-кода ÑодержатÑÑ Ð½ÐµÐ´Ð¾Ð¿ÑƒÑтимые данные." - -#: src/slic3r/GUI/Plater.cpp:4869 -msgid "Error while loading .gcode file" -msgstr "Ошибка при загрузке .gcode файла" - -#: src/slic3r/GUI/Plater.cpp:5107 -msgid "All objects will be removed, continue?" -msgstr "Ð’Ñе модели будут удалены, продолжить?" - -#: src/slic3r/GUI/Plater.cpp:5115 -msgid "Delete Selected Objects" -msgstr "Удаление выбранных моделей" - -#: src/slic3r/GUI/Plater.cpp:5123 -msgid "Increase Instances" -msgstr "Добавление копии" - -#: src/slic3r/GUI/Plater.cpp:5157 -msgid "Decrease Instances" -msgstr "Удаление копии" - -#: src/slic3r/GUI/Plater.cpp:5188 -msgid "Enter the number of copies:" -msgstr "Введите количеÑтво копий:" - -#: src/slic3r/GUI/Plater.cpp:5189 -msgid "Copies of the selected object" -msgstr "КоличеÑтво копий выбранной модели" - -#: src/slic3r/GUI/Plater.cpp:5193 -#, c-format -msgid "Set numbers of copies to %d" -msgstr "Задать количеÑтво копий: %d" - -#: src/slic3r/GUI/Plater.cpp:5259 -msgid "Cut by Plane" -msgstr "Разрез по плоÑкоÑти" - -#: src/slic3r/GUI/Plater.cpp:5316 -msgid "Save G-code file as:" -msgstr "Сохранить файл G-кода как:" - -#: src/slic3r/GUI/Plater.cpp:5316 -msgid "Save SL1 file as:" -msgstr "Сохранить SL1 файл как:" - -#: src/slic3r/GUI/Plater.cpp:5463 -#, c-format -msgid "STL file exported to %s" -msgstr "STL файл ÑкÑпортирован в %s" - -#: src/slic3r/GUI/Plater.cpp:5480 -#, c-format -msgid "AMF file exported to %s" -msgstr "AMF файл ÑкÑпортирован в %s" - -#: src/slic3r/GUI/Plater.cpp:5483 -#, c-format -msgid "Error exporting AMF file %s" -msgstr "AMF файл ÑкÑпортирован в %s" - -#: src/slic3r/GUI/Plater.cpp:5512 -#, c-format -msgid "3MF file exported to %s" -msgstr "3MF файл ÑкÑпортирован в %s" - -#: src/slic3r/GUI/Plater.cpp:5517 -#, c-format -msgid "Error exporting 3MF file %s" -msgstr "3MF файл ÑкÑпортирован в %s" - -#: src/slic3r/GUI/Plater.cpp:6054 -msgid "Export" -msgstr "ÐкÑпорт" - -#: src/slic3r/GUI/Plater.cpp:6149 -msgid "Paste From Clipboard" -msgstr "Ð’Ñтавка из буфера обмена" - -#: src/slic3r/GUI/Preferences.cpp:56 src/slic3r/GUI/Tab.cpp:2098 -#: src/slic3r/GUI/Tab.cpp:2285 src/slic3r/GUI/Tab.cpp:2393 -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:1080 -msgid "General" -msgstr "Общие" - -#: src/slic3r/GUI/Preferences.cpp:69 -msgid "Remember output directory" -msgstr "Запоминать папку ÑохранениÑ" - -#: src/slic3r/GUI/Preferences.cpp:71 -======= "Ð’Ñ‹Ð±Ñ€Ð°Ð½Ð½Ð°Ñ Ð¼Ð¾Ð´ÐµÐ»ÑŒ не может быть разделена, так как она ÑоÑтоит из одной чаÑти." #: src/slic3r/GUI/Plater.cpp:3093 @@ -12342,30 +7504,10 @@ msgid "Remember output directory" msgstr "Запоминать папку ÑохранениÑ" #: src/slic3r/GUI/Preferences.cpp:123 ->>>>>>> master msgid "" -"If this is enabled, Slic3r will prompt the last output directory instead of the one " -"containing the input files." +"If this is enabled, Slic3r will prompt the last output directory instead of " +"the one containing the input files." msgstr "" -<<<<<<< HEAD -"ЕÑли включено, при Ñохранении G-кода PrusaSlicer откроет поÑледний иÑпользованный " -"выходной каталог вмеÑто того, где лежит иÑходный файл." - -#: src/slic3r/GUI/Preferences.cpp:77 -msgid "Auto-center parts" -msgstr "Ðвтоцентровка моделей" - -#: src/slic3r/GUI/Preferences.cpp:79 -msgid "" -"If this is enabled, Slic3r will auto-center objects around the print bed center." -msgstr "ЕÑли включено, PrusaSlicer будет автоматичеÑки центрировать модели на Ñтоле." - -#: src/slic3r/GUI/Preferences.cpp:85 -msgid "Background processing" -msgstr "Ð¤Ð¾Ð½Ð¾Ð²Ð°Ñ Ð¾Ð±Ñ€Ð°Ð±Ð¾Ñ‚ÐºÐ°" - -#: src/slic3r/GUI/Preferences.cpp:87 -======= "ЕÑли включено, при Ñохранении G-кода PrusaSlicer откроет поÑледний " "иÑпользованный выходной каталог вмеÑто того, где лежит иÑходный файл." @@ -12385,32 +7527,10 @@ msgid "Background processing" msgstr "Ð¤Ð¾Ð½Ð¾Ð²Ð°Ñ Ð¾Ð±Ñ€Ð°Ð±Ð¾Ñ‚ÐºÐ°" #: src/slic3r/GUI/Preferences.cpp:139 ->>>>>>> master -msgid "" -"If this is enabled, Slic3r will pre-process objects as soon as they're loaded in " -"order to save time when exporting G-code." -msgstr "" -<<<<<<< HEAD -"ЕÑли включено, PrusaSlicer будет предварительно проÑчитывать модели при загрузке, " -"чтобы ÑÑкономить Ð²Ñ€ÐµÐ¼Ñ Ð¿Ñ€Ð¸ ÑкÑпорте G-кода." - -#: src/slic3r/GUI/Preferences.cpp:96 msgid "" -"If enabled, PrusaSlicer will check for the new versions of itself online. When a " -"new version becomes available a notification is displayed at the next application " -"startup (never during program usage). This is only a notification mechanisms, no " -"automatic installation is done." +"If this is enabled, Slic3r will pre-process objects as soon as they're " +"loaded in order to save time when exporting G-code." msgstr "" -"ЕÑли включено, то PrusaSlicer проверÑет наличие новых верÑий в Ñети. ЕÑли доÑтупна " -"Ð½Ð¾Ð²Ð°Ñ Ð²ÐµÑ€ÑÐ¸Ñ Ð¿Ñ€Ð¸ Ñледующем запуÑке отображаетÑÑ ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ðµ (не во Ð²Ñ€ÐµÐ¼Ñ Ñ€Ð°Ð±Ð¾Ñ‚Ñ‹ " -"программы). ÐвтоматичеÑÐºÐ°Ñ ÑƒÑтановка не производитÑÑ. Ð’Ñ‹ увидите только уведомление." - -#: src/slic3r/GUI/Preferences.cpp:102 -msgid "Export sources full pathnames to 3mf and amf" -msgstr "При ÑкÑпорте в 3mf, amf, ÑохранÑÑ‚ÑŒ полные пути к иÑходным файлам" - -#: src/slic3r/GUI/Preferences.cpp:104 -======= "ЕÑли включено, PrusaSlicer будет предварительно проÑчитывать модели при " "загрузке, чтобы ÑÑкономить Ð²Ñ€ÐµÐ¼Ñ Ð¿Ñ€Ð¸ ÑкÑпорте G-кода." @@ -12419,103 +7539,58 @@ msgid "Export sources full pathnames to 3mf and amf" msgstr "При ÑкÑпорте в 3mf, amf, ÑохранÑÑ‚ÑŒ полные пути к иÑходным файлам" #: src/slic3r/GUI/Preferences.cpp:150 ->>>>>>> master msgid "" -"If enabled, allows the Reload from disk command to automatically find and load the " -"files when invoked." +"If enabled, allows the Reload from disk command to automatically find and " +"load the files when invoked." msgstr "" -<<<<<<< HEAD -"ЕÑли включено, при выполнении команды \"Перезагрузить Ñ Ð´Ð¸Ñка\" программа будут " -"автоматичеÑки находить и загружать файлы проекта." - -#: src/slic3r/GUI/Preferences.cpp:114 -======= "ЕÑли включено, при выполнении команды «Перезагрузить Ñ Ð´Ð¸Ñка» программа " "будут автоматичеÑки находить и загружать файлы проекта." #: src/slic3r/GUI/Preferences.cpp:159 ->>>>>>> master msgid "If enabled, sets PrusaSlicer as default application to open .3mf files." msgstr "" "ЕÑли включено, назначает PrusaSlicer в качеÑтве Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð¿Ð¾ умолчанию Ð´Ð»Ñ " "Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ .3mf файлов." -<<<<<<< HEAD -#: src/slic3r/GUI/Preferences.cpp:121 -======= #: src/slic3r/GUI/Preferences.cpp:166 ->>>>>>> master msgid "If enabled, sets PrusaSlicer as default application to open .stl files." msgstr "" "ЕÑли включено, назначает PrusaSlicer в качеÑтве Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð¿Ð¾ умолчанию Ð´Ð»Ñ " "Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ .stl файлов." -<<<<<<< HEAD -#: src/slic3r/GUI/Preferences.cpp:131 -======= #: src/slic3r/GUI/Preferences.cpp:177 ->>>>>>> master msgid "" -"If enabled, Slic3r downloads updates of built-in system presets in the background. " -"These updates are downloaded into a separate temporary location. When a new preset " -"version becomes available it is offered at application startup." +"If enabled, Slic3r downloads updates of built-in system presets in the " +"background. These updates are downloaded into a separate temporary location. " +"When a new preset version becomes available it is offered at application " +"startup." msgstr "" -<<<<<<< HEAD -"ЕÑли включено, то PrusaSlicer будет загружать Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð²Ñтроенных ÑиÑтемных " -"профилей в фоновом режиме. Ðти Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð·Ð°Ð³Ñ€ÑƒÐ¶Ð°ÑŽÑ‚ÑÑ Ð² отдельную временную папку. " -"Когда новые профили ÑтановÑÑ‚ÑÑ Ð´Ð¾Ñтупны, они предлагаютÑÑ Ð¿Ñ€Ð¸ запуÑке приложениÑ." - -#: src/slic3r/GUI/Preferences.cpp:136 -======= "ЕÑли включено, то PrusaSlicer будет загружать Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð²Ñтроенных " "ÑиÑтемных профилей в фоновом режиме. Ðти Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð·Ð°Ð³Ñ€ÑƒÐ¶Ð°ÑŽÑ‚ÑÑ Ð² отдельную " "временную папку. Когда новые профили ÑтановÑÑ‚ÑÑ Ð´Ð¾Ñтупны, они предлагаютÑÑ " "при запуÑке приложениÑ." #: src/slic3r/GUI/Preferences.cpp:182 ->>>>>>> master msgid "Suppress \" - default - \" presets" msgstr "ПодавлÑÑ‚ÑŒ профили по умолчанию" -<<<<<<< HEAD -#: src/slic3r/GUI/Preferences.cpp:138 -======= #: src/slic3r/GUI/Preferences.cpp:184 ->>>>>>> master msgid "" -"Suppress \" - default - \" presets in the Print / Filament / Printer selections " -"once there are any other valid presets available." +"Suppress \" - default - \" presets in the Print / Filament / Printer " +"selections once there are any other valid presets available." msgstr "" -"ПодавлÑÑ‚ÑŒ профили по умолчанию во вкладках ÐаÑтройки печати/ÐаÑтройки прутка/ÐаÑтройки принтера, " -"при наличии других допуÑтимых профилей." - -<<<<<<< HEAD -#: src/slic3r/GUI/Preferences.cpp:144 -msgid "Show incompatible print and filament presets" -msgstr "Показывать неÑовмеÑтимые профили печати и прутка" +"ПодавлÑÑ‚ÑŒ профили по умолчанию во вкладках ÐаÑтройки печати/ÐаÑтройки прутка/" +"ÐаÑтройки принтера, при наличии других допуÑтимых профилей." -#: src/slic3r/GUI/Preferences.cpp:146 -======= #: src/slic3r/GUI/Preferences.cpp:190 msgid "Show incompatible print and filament presets" msgstr "Показывать неÑовмеÑтимые профили печати и прутка" #: src/slic3r/GUI/Preferences.cpp:192 ->>>>>>> master msgid "" -"When checked, the print and filament presets are shown in the preset editor even if " -"they are marked as incompatible with the active printer" +"When checked, the print and filament presets are shown in the preset editor " +"even if they are marked as incompatible with the active printer" msgstr "" -<<<<<<< HEAD -"ЕÑли включено, то профили печати и прутка отображаютÑÑ Ð² редакторе профилей, даже " -"еÑли они помечены как неÑовмеÑтимые Ñ Ð°ÐºÑ‚Ð¸Ð²Ð½Ñ‹Ð¼ принтером." - -#: src/slic3r/GUI/Preferences.cpp:152 -msgid "Show drop project dialog" -msgstr "Диалоговое окно при перетаÑкивании файла-проекта" - -#: src/slic3r/GUI/Preferences.cpp:154 -======= "ЕÑли включено, то профили печати и прутка отображаютÑÑ Ð² редакторе профилей, " "даже еÑли они помечены как неÑовмеÑтимые Ñ Ð°ÐºÑ‚Ð¸Ð²Ð½Ñ‹Ð¼ принтером" @@ -12524,69 +7599,35 @@ msgid "Show drop project dialog" msgstr "Диалоговое окно при перетаÑкивании файла-проекта" #: src/slic3r/GUI/Preferences.cpp:202 ->>>>>>> master msgid "" -"When checked, whenever dragging and dropping a project file on the application, " -"shows a dialog asking to select the action to take on the file to load." +"When checked, whenever dragging and dropping a project file on the " +"application, shows a dialog asking to select the action to take on the file " +"to load." msgstr "" "ЕÑли включено, то при каждом перетаÑкивании в приложение файла-проекта будет " "отображаетÑÑ Ð´Ð¸Ð°Ð»Ð¾Ð³Ð¾Ð²Ð¾Ðµ окно Ñ Ð¿Ñ€Ð¾Ñьбой выбрать дейÑтвие, которое необходимо " "выполнить Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð¼." -<<<<<<< HEAD -#: src/slic3r/GUI/Preferences.cpp:161 src/slic3r/GUI/Preferences.cpp:165 -msgid "Allow just a single PrusaSlicer instance" -msgstr "Только одни ÑкземплÑÑ€ программы" - -#: src/slic3r/GUI/Preferences.cpp:163 -======= #: src/slic3r/GUI/Preferences.cpp:208 src/slic3r/GUI/Preferences.cpp:212 msgid "Allow just a single PrusaSlicer instance" msgstr "Только одни ÑкземплÑÑ€ программы" #: src/slic3r/GUI/Preferences.cpp:210 ->>>>>>> master msgid "" -"On OSX there is always only one instance of app running by default. However it is " -"allowed to run multiple instances of same app from the command line. In such case " -"this settings will allow only one instance." +"On OSX there is always only one instance of app running by default. However " +"it is allowed to run multiple instances of same app from the command line. " +"In such case this settings will allow only one instance." msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/Preferences.cpp:167 -======= #: src/slic3r/GUI/Preferences.cpp:214 ->>>>>>> master msgid "" -"If this is enabled, when starting PrusaSlicer and another instance of the same " -"PrusaSlicer is already running, that instance will be reactivated instead." +"If this is enabled, when starting PrusaSlicer and another instance of the " +"same PrusaSlicer is already running, that instance will be reactivated " +"instead." msgstr "" "ЕÑли включено, разрешена работа только одного ÑкземплÑра той же Ñамой верÑии " "программы." -<<<<<<< HEAD -#: src/slic3r/GUI/Preferences.cpp:173 src/slic3r/GUI/UnsavedChangesDialog.cpp:671 -msgid "Ask for unsaved changes when closing application" -msgstr "Ð—Ð°Ð¿Ñ€Ð¾Ñ Ð¾ неÑохраненных изменениÑÑ… при закрытии приложениÑ" - -#: src/slic3r/GUI/Preferences.cpp:175 -msgid "When closing the application, always ask for unsaved changes" -msgstr "Ð’Ñегда Ñпрашивать о неÑохраненных изменениÑÑ… при закрытии приложениÑ." - -#: src/slic3r/GUI/Preferences.cpp:180 src/slic3r/GUI/UnsavedChangesDialog.cpp:672 -msgid "Ask for unsaved changes when selecting new preset" -msgstr "Ð—Ð°Ð¿Ñ€Ð¾Ñ Ð¾ неÑохраненных изменениÑÑ… при выборе нового профилÑ" - -#: src/slic3r/GUI/Preferences.cpp:182 -msgid "Always ask for unsaved changes when selecting new preset" -msgstr "Ð’Ñегда Ñпрашивать о неÑохраненных изменениÑÑ… при выборе нового профилÑ." - -#: src/slic3r/GUI/Preferences.cpp:190 -msgid "Associate .gcode files to PrusaSlicer G-code Viewer" -msgstr "ÐÑÑоциировать файлы .gcode Ñ PrusaSlicer G-code Viewer" - -#: src/slic3r/GUI/Preferences.cpp:192 -======= #: src/slic3r/GUI/Preferences.cpp:224 msgid "" "Always ask for unsaved changes in project, when: \n" @@ -12633,45 +7674,22 @@ msgid "Associate .gcode files to PrusaSlicer G-code Viewer" msgstr "ÐÑÑоциировать файлы .gcode Ñ PrusaSlicer G-code Viewer" #: src/slic3r/GUI/Preferences.cpp:260 ->>>>>>> master msgid "" -"If enabled, sets PrusaSlicer G-code Viewer as default application to open .gcode " -"files." +"If enabled, sets PrusaSlicer G-code Viewer as default application to open ." +"gcode files." msgstr "" "ЕÑли включено, назначает PrusaSlicer G-code Viewer в качеÑтве Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð¿Ð¾ " "умолчанию Ð´Ð»Ñ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ .gcode файлов." -<<<<<<< HEAD -#: src/slic3r/GUI/Preferences.cpp:201 -msgid "Use Retina resolution for the 3D scene" -msgstr "ИÑпользовать разрешение диÑÐ¿Ð»ÐµÑ Retina Ð´Ð»Ñ Ð¾ÐºÐ½Ð° 3D-вида" - -#: src/slic3r/GUI/Preferences.cpp:203 -======= #: src/slic3r/GUI/Preferences.cpp:268 msgid "Use Retina resolution for the 3D scene" msgstr "ИÑпользовать разрешение диÑÐ¿Ð»ÐµÑ Retina Ð´Ð»Ñ Ð¾ÐºÐ½Ð° 3D-вида" #: src/slic3r/GUI/Preferences.cpp:270 ->>>>>>> master msgid "" "If enabled, the 3D scene will be rendered in Retina resolution. If you are " "experiencing 3D performance problems, disabling this option may help." msgstr "" -<<<<<<< HEAD -"ЕÑли включено, окно 3D-вида будет отображатьÑÑ Ñ Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸ÐµÐ¼ диÑÐ¿Ð»ÐµÑ Retina. ЕÑли у " -"Ð²Ð°Ñ Ð²Ð¾Ð·Ð½Ð¸ÐºÐ°ÑŽÑ‚ проблемы Ñ Ð¿Ñ€Ð¾Ð¸Ð·Ð²Ð¾Ð´Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ñтью 3D, отключение Ñтой опции может помочь." - -#: src/slic3r/GUI/Preferences.cpp:211 src/slic3r/GUI/Preferences.cpp:213 -msgid "Show splash screen" -msgstr "Показывать заÑтавку при запуÑке программы" - -#: src/slic3r/GUI/Preferences.cpp:220 -msgid "Enable support for legacy 3DConnexion devices" -msgstr "Включить поддержку уÑтаревших уÑтройÑтв 3DConnexion" - -#: src/slic3r/GUI/Preferences.cpp:222 -======= "ЕÑли включено, окно 3D-вида будет отображатьÑÑ Ñ Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸ÐµÐ¼ диÑÐ¿Ð»ÐµÑ Retina. " "ЕÑли у Ð²Ð°Ñ Ð²Ð¾Ð·Ð½Ð¸ÐºÐ°ÑŽÑ‚ проблемы Ñ Ð¿Ñ€Ð¾Ð¸Ð·Ð²Ð¾Ð´Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ñтью 3D, отключение Ñтой " "опции может помочь." @@ -12700,55 +7718,10 @@ msgid "Enable support for legacy 3DConnexion devices" msgstr "Включить поддержку уÑтаревших уÑтройÑтв 3DConnexion" #: src/slic3r/GUI/Preferences.cpp:305 ->>>>>>> master msgid "" -"If enabled, the legacy 3DConnexion devices settings dialog is available by pressing " -"CTRL+M" +"If enabled, the legacy 3DConnexion devices settings dialog is available by " +"pressing CTRL+M" msgstr "" -<<<<<<< HEAD -"ЕÑли включено, диалоговое окно наÑтроек уÑтаревших уÑтройÑтв 3DConnexion будет " -"доÑтупно при нажатии CTRL+M." - -#: src/slic3r/GUI/Preferences.cpp:232 -msgid "Camera" -msgstr "Камера" - -#: src/slic3r/GUI/Preferences.cpp:237 -msgid "Use perspective camera" -msgstr "ИÑпользовать вид в перÑпективе" - -#: src/slic3r/GUI/Preferences.cpp:239 -msgid "If enabled, use perspective camera. If not enabled, use orthographic camera." -msgstr "ЕÑли включено, иÑпользуетÑÑ Ð²Ð¸Ð´ в перÑпективе, иначе - ортогональный." - -#: src/slic3r/GUI/Preferences.cpp:244 -msgid "Use free camera" -msgstr "ИÑпользовать Ñвободную камеру" - -#: src/slic3r/GUI/Preferences.cpp:246 -msgid "If enabled, use free camera. If not enabled, use constrained camera." -msgstr "" -"ЕÑли включено, иÑпользуетÑÑ Ñвободное вращение камеры. ЕÑли выключено, иÑпользуетÑÑ " -"вращение камера Ñ Ð¾Ð³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÐ½Ð¸Ñми." - -#: src/slic3r/GUI/Preferences.cpp:251 -msgid "Reverse direction of zoom with mouse wheel" -msgstr "Обратное направление маÑÑˆÑ‚Ð°Ð±Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ ÐºÐ¾Ð»ÐµÑиком мыши" - -#: src/slic3r/GUI/Preferences.cpp:253 -msgid "If enabled, reverses the direction of zoom with mouse wheel" -msgstr "ЕÑли включено, менÑетÑÑ Ð½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ðµ маÑÑˆÑ‚Ð°Ð±Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ колеÑа мыши." - -#: src/slic3r/GUI/Preferences.cpp:261 -msgid "GUI" -msgstr "Ð˜Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ñ‹" - -#: src/slic3r/GUI/Preferences.cpp:276 -msgid "Sequential slider applied only to top layer" -msgstr "Ползунок Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð¸Ð½Ñтрумента применÑетÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ к верхнему Ñлою" - -#: src/slic3r/GUI/Preferences.cpp:278 -======= "ЕÑли включено, диалоговое окно наÑтроек уÑтаревших уÑтройÑтв 3DConnexion " "будет доÑтупно при нажатии CTRL+M." @@ -12809,102 +7782,10 @@ msgid "Show sidebar collapse/expand button" msgstr "Показать кнопку ÑвертываниÑ/раÑÐºÑ€Ñ‹Ñ‚Ð¸Ñ Ð±Ð¾ÐºÐ¾Ð²Ð¾Ð¹ панели" #: src/slic3r/GUI/Preferences.cpp:377 ->>>>>>> master msgid "" -"If enabled, changes made using the sequential slider, in preview, apply only to " -"gcode top layer. If disabled, changes made using the sequential slider, in preview, " -"apply to the whole gcode." -msgstr "" -<<<<<<< HEAD -"ЕÑли включено, изменениÑ, Ñделанные Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ ползунка Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð¸Ð½Ñтрумента, в " -"окне предпроÑмотра нарезки, применÑÑŽÑ‚ÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ к верхнему Ñлою G-коду. ЕÑли " -"отключено, изменениÑ, Ñделанные Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ ползунка Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð¸Ð½Ñтрумента, в окне " -"предпроÑмотра нарезки, применÑÑŽÑ‚ÑÑ ÐºÐ¾ вÑему G-коду." - -#: src/slic3r/GUI/Preferences.cpp:285 -msgid "Show sidebar collapse/expand button" -msgstr "Показать кнопку ÑвертываниÑ/раÑÐºÑ€Ñ‹Ñ‚Ð¸Ñ Ð±Ð¾ÐºÐ¾Ð²Ð¾Ð¹ панели" - -#: src/slic3r/GUI/Preferences.cpp:287 -msgid "" -"If enabled, the button for the collapse sidebar will be appeared in top right " -"corner of the 3D Scene" -msgstr "" -"ЕÑли включено, в правом верхнем углу 3D-Ñцены поÑвитÑÑ ÐºÐ½Ð¾Ð¿ÐºÐ° ÑÐ²ÐµÑ€Ñ‚Ñ‹Ð²Ð°Ð½Ð¸Ñ Ð±Ð¾ÐºÐ¾Ð²Ð¾Ð¹ " -"панели." - -#: src/slic3r/GUI/Preferences.cpp:292 -msgid "Suppress to open hyperlink in browser" -msgstr "Запретить открытие гиперÑÑылок в браузере" - -#: src/slic3r/GUI/Preferences.cpp:294 -msgid "" -"If enabled, the descriptions of configuration parameters in settings tabs wouldn't " -"work as hyperlinks. If disabled, the descriptions of configuration parameters in " -"settings tabs will work as hyperlinks." -msgstr "" -"ЕÑли включено, то работа гиперÑÑылок опиÑаний параметров во вкладках наÑтроек будет " -"отключена." - -#: src/slic3r/GUI/Preferences.cpp:300 -msgid "Use custom size for toolbar icons" -msgstr "ИÑпользовать неÑтандартный размер значков панели инÑтрументов" - -#: src/slic3r/GUI/Preferences.cpp:302 -msgid "If enabled, you can change size of toolbar icons manually." -msgstr "ЕÑли включено, вы можете изменить размер значков панели инÑтрументов вручную." - -#: src/slic3r/GUI/Preferences.cpp:320 -msgid "Render" -msgstr "ВизуализациÑ" - -#: src/slic3r/GUI/Preferences.cpp:325 -msgid "Use environment map" -msgstr "ИÑпользовать карты окружениÑ" - -#: src/slic3r/GUI/Preferences.cpp:327 -msgid "If enabled, renders object using the environment map." -msgstr "ЕÑли включено, Ð²Ð¸Ð·ÑƒÐ°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð¼Ð¾Ð´ÐµÐ»ÐµÐ¹ выполнÑетÑÑ Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ карты окружениÑ." - -#: src/slic3r/GUI/Preferences.cpp:352 -#, c-format -msgid "You need to restart %s to make the changes effective." -msgstr "Ðеобходимо перезапуÑтить %s, чтобы Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð²Ñтупили в Ñилу." - -#: src/slic3r/GUI/Preferences.cpp:427 -msgid "Icon size in a respect to the default size" -msgstr "Размер значка отноÑительно размера по умолчанию" - -#: src/slic3r/GUI/Preferences.cpp:442 -msgid "Select toolbar icon size in respect to the default one." +"If enabled, the button for the collapse sidebar will be appeared in top " +"right corner of the 3D Scene" msgstr "" -"Выбор размера значка панели инÑтрументов по отношению к значению по умолчанию." - -#: src/slic3r/GUI/Preferences.cpp:473 -msgid "Old regular layout with the tab bar" -msgstr "Ð¡Ñ‚Ð°Ñ€Ð°Ñ Ð¾Ð±Ñ‹Ñ‡Ð½Ð°Ñ ÐºÐ¾Ð¼Ð¿Ð¾Ð½Ð¾Ð²ÐºÐ° Ñ Ð²ÐºÐ»Ð°Ð´ÐºÐ°Ð¼Ð¸ на Ñтоле" - -#: src/slic3r/GUI/Preferences.cpp:474 -msgid "New layout, access via settings button in the top menu" -msgstr "ÐÐ¾Ð²Ð°Ñ ÐºÐ¾Ð¼Ð¿Ð¾Ð½Ð¾Ð²ÐºÐ° Ñ ÐºÐ½Ð¾Ð¿ÐºÐ¾Ð¹ наÑтроек в верхнем меню" - -#: src/slic3r/GUI/Preferences.cpp:475 -msgid "Settings in non-modal window" -msgstr "ÐаÑтройки будут отображатьÑÑ Ð² отдельном окне" - -#: src/slic3r/GUI/Preferences.cpp:484 -msgid "Layout Options" -msgstr "ÐаÑтройка внешнего вида" - -#: src/slic3r/GUI/PresetComboBoxes.cpp:197 src/slic3r/GUI/PresetComboBoxes.cpp:235 -#: src/slic3r/GUI/PresetComboBoxes.cpp:761 src/slic3r/GUI/PresetComboBoxes.cpp:811 -#: src/slic3r/GUI/PresetComboBoxes.cpp:925 src/slic3r/GUI/PresetComboBoxes.cpp:969 -msgid "System presets" -msgstr "СиÑтемные профили" - -#: src/slic3r/GUI/PresetComboBoxes.cpp:239 src/slic3r/GUI/PresetComboBoxes.cpp:815 -#: src/slic3r/GUI/PresetComboBoxes.cpp:973 -======= "ЕÑли включено, в правом верхнем углу 3D-Ñцены поÑвитÑÑ ÐºÐ½Ð¾Ð¿ÐºÐ° ÑÐ²ÐµÑ€Ñ‚Ñ‹Ð²Ð°Ð½Ð¸Ñ " "боковой панели." @@ -13086,7 +7967,6 @@ msgstr "СиÑтемные профили" #: src/slic3r/GUI/PresetComboBoxes.cpp:291 #: src/slic3r/GUI/PresetComboBoxes.cpp:853 #: src/slic3r/GUI/PresetComboBoxes.cpp:1037 ->>>>>>> master msgid "User presets" msgstr "ПользовательÑкие профили" @@ -13107,14 +7987,6 @@ msgstr "Удалить физичеÑкий принтер" msgid "Click to edit preset" msgstr "Ðажмите, чтобы изменить профиль" -<<<<<<< HEAD -#: src/slic3r/GUI/PresetComboBoxes.cpp:680 src/slic3r/GUI/PresetComboBoxes.cpp:710 -msgid "Add/Remove presets" -msgstr "Добавить/удалить профиль" - -#: src/slic3r/GUI/PresetComboBoxes.cpp:685 src/slic3r/GUI/PresetComboBoxes.cpp:715 -#: src/slic3r/GUI/Tab.cpp:2990 -======= #: src/slic3r/GUI/PresetComboBoxes.cpp:697 #: src/slic3r/GUI/PresetComboBoxes.cpp:737 msgid "Add/Remove presets" @@ -13122,7 +7994,6 @@ msgstr "Добавить/удалить профиль" #: src/slic3r/GUI/PresetComboBoxes.cpp:702 #: src/slic3r/GUI/PresetComboBoxes.cpp:742 src/slic3r/GUI/Tab.cpp:3241 ->>>>>>> master msgid "Add physical printer" msgstr "Добавить физичеÑкий профиль" @@ -13130,15 +8001,11 @@ msgstr "Добавить физичеÑкий профиль" msgid "Edit preset" msgstr "Изменить профиль" -<<<<<<< HEAD -#: src/slic3r/GUI/PresetComboBoxes.cpp:703 src/slic3r/GUI/Tab.cpp:2990 -======= #: src/slic3r/GUI/PresetComboBoxes.cpp:722 msgid "Change extruder color" msgstr "Изменить цвет ÑкÑтрудера" #: src/slic3r/GUI/PresetComboBoxes.cpp:730 src/slic3r/GUI/Tab.cpp:3241 ->>>>>>> master msgid "Edit physical printer" msgstr "Изменить физичеÑкий профиль" @@ -13146,12 +8013,8 @@ msgstr "Изменить физичеÑкий профиль" msgid "Delete physical printer" msgstr "Удалить физичеÑкий принтер" -<<<<<<< HEAD -#: src/slic3r/GUI/PresetComboBoxes.cpp:826 src/slic3r/GUI/PresetComboBoxes.cpp:987 -======= #: src/slic3r/GUI/PresetComboBoxes.cpp:864 #: src/slic3r/GUI/PresetComboBoxes.cpp:1051 ->>>>>>> master msgid "Physical printers" msgstr "ФизичеÑкие принтеры" @@ -13163,32 +8026,18 @@ msgstr "Добавить/удалить пруток" msgid "Add/Remove materials" msgstr "Добавить/удалить материал" -<<<<<<< HEAD -#: src/slic3r/GUI/PresetComboBoxes.cpp:854 src/slic3r/GUI/PresetComboBoxes.cpp:1011 -======= #: src/slic3r/GUI/PresetComboBoxes.cpp:892 #: src/slic3r/GUI/PresetComboBoxes.cpp:1075 ->>>>>>> master msgid "Add/Remove printers" msgstr "Добавить/удалить принтер" #: src/slic3r/GUI/PresetHints.cpp:32 -<<<<<<< HEAD -======= #, boost-format ->>>>>>> master msgid "" -"If estimated layer time is below ~%1%s, fan will run at %2%%% and print speed will " -"be reduced so that no less than %3%s are spent on that layer (however, speed will " -"never be reduced below %4%mm/s)." +"If estimated layer time is below ~%1%s, fan will run at %2%%% and print " +"speed will be reduced so that no less than %3%s are spent on that layer " +"(however, speed will never be reduced below %4%mm/s)." msgstr "" -<<<<<<< HEAD -"ЕÑли раÑчётное Ð²Ñ€ÐµÐ¼Ñ Ð¿ÐµÑ‡Ð°Ñ‚Ð¸ ÑÐ»Ð¾Ñ Ð¼ÐµÐ½ÑŒÑˆÐµ ~%1% Ñек., вентилÑтор будет работать на %2%%" -"%, а ÑкороÑÑ‚ÑŒ печати будет уменьшена, так что на Ñтот Ñлой будет затрачено не менее " -"%3% Ñек. (однако ÑкороÑÑ‚ÑŒ никогда не будет уменьшена ниже %4%мм/Ñ)." - -#: src/slic3r/GUI/PresetHints.cpp:39 -======= "ЕÑли раÑчётное Ð²Ñ€ÐµÐ¼Ñ Ð¿ÐµÑ‡Ð°Ñ‚Ð¸ ÑÐ»Ð¾Ñ Ð¼ÐµÐ½ÑŒÑˆÐµ ~%1% Ñек., вентилÑтор будет работать " "на %2%%%, а ÑкороÑÑ‚ÑŒ печати будет уменьшена, так что на Ñтот Ñлой будет " "затрачено не менее %3% Ñек. (однако ÑкороÑÑ‚ÑŒ никогда не будет уменьшена ниже " @@ -13196,106 +8045,10 @@ msgstr "" #: src/slic3r/GUI/PresetHints.cpp:40 #, boost-format ->>>>>>> master msgid "" "If estimated layer time is greater, but still below ~%1%s, fan will run at a " "proportionally decreasing speed between %2%%% and %3%%%." msgstr "" -<<<<<<< HEAD -"ЕÑли раÑчётное Ð²Ñ€ÐµÐ¼Ñ Ð¿ÐµÑ‡Ð°Ñ‚Ð¸ ÑÐ»Ð¾Ñ Ð±Ð¾Ð»ÑŒÑˆÐ¾Ðµ, но вÑÑ‘ ещё ниже ~%1% Ñек., вентилÑтор " -"будет работать Ñ Ð¿Ð»Ð°Ð²Ð½Ð¾ падающей ÑкороÑтью между %2%%%-%3%%%." - -#: src/slic3r/GUI/PresetHints.cpp:49 -msgid "Fan speed will be ramped from zero at layer %1% to %2%%% at layer %3%." -msgstr "СкороÑÑ‚ÑŒ вентилÑтора будет увеличена Ñ Ð½ÑƒÐ»Ñ Ð½Ð° %1% Ñлое до %2%%% на %3% Ñлое." - -#: src/slic3r/GUI/PresetHints.cpp:51 -msgid "During the other layers, fan will always run at %1%%%" -msgstr "Во Ð²Ñ€ÐµÐ¼Ñ Ð¿ÐµÑ‡Ð°Ñ‚Ð¸ других Ñлоёв, вентилÑтор вÑегда будет работать на %1%%%\"" - -#: src/slic3r/GUI/PresetHints.cpp:51 -msgid "Fan will always run at %1%%%" -msgstr "ВентилÑтор вÑегда будет работать на %1%%%" - -#: src/slic3r/GUI/PresetHints.cpp:53 -msgid "except for the first %1% layers." -msgstr ", за иÑключением первых %1% Ñлоёв." - -#: src/slic3r/GUI/PresetHints.cpp:55 -msgid "except for the first layer." -msgstr ", за иÑключением первого ÑлоÑ." - -#: src/slic3r/GUI/PresetHints.cpp:58 -msgid "During the other layers, fan will be turned off." -msgstr "Во Ð²Ñ€ÐµÐ¼Ñ Ð¿ÐµÑ‡Ð°Ñ‚Ð¸ других Ñлоёв, вентилÑтор будет выключен." - -#: src/slic3r/GUI/PresetHints.cpp:58 -msgid "Fan will be turned off." -msgstr "ВентилÑтор будет выключен." - -#: src/slic3r/GUI/PresetHints.cpp:159 -msgid "external perimeters" -msgstr "внешних периметров" - -#: src/slic3r/GUI/PresetHints.cpp:168 -msgid "perimeters" -msgstr "периметры" - -#: src/slic3r/GUI/PresetHints.cpp:177 -msgid "infill" -msgstr "заполнениÑ" - -#: src/slic3r/GUI/PresetHints.cpp:187 -msgid "solid infill" -msgstr "Ñплошные Ñлои заполнениÑ" - -#: src/slic3r/GUI/PresetHints.cpp:195 -msgid "top solid infill" -msgstr "верхние Ñплошные Ñлои заполнениÑ" - -#: src/slic3r/GUI/PresetHints.cpp:206 -msgid "support" -msgstr "поддержки" - -#: src/slic3r/GUI/PresetHints.cpp:216 -msgid "support interface" -msgstr "ÑвÑÐ·ÑƒÑŽÑ‰Ð°Ñ Ñлой поддержки" - -#: src/slic3r/GUI/PresetHints.cpp:222 -msgid "First layer volumetric" -msgstr "Объёмный раÑход первого ÑлоÑ" - -#: src/slic3r/GUI/PresetHints.cpp:222 -msgid "Bridging volumetric" -msgstr "Объёмный раÑход моÑтов" - -#: src/slic3r/GUI/PresetHints.cpp:222 -msgid "Volumetric" -msgstr "Объёмный раÑход" - -#: src/slic3r/GUI/PresetHints.cpp:223 -msgid "flow rate is maximized" -msgstr "увеличиваетÑÑ" - -#: src/slic3r/GUI/PresetHints.cpp:226 -msgid "by the print profile maximum" -msgstr "по макÑимальному значению Ð´Ð»Ñ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»ÑŽ печати" - -#: src/slic3r/GUI/PresetHints.cpp:227 -msgid "when printing" -msgstr "при печати" - -#: src/slic3r/GUI/PresetHints.cpp:228 -msgid "with a volumetric rate" -msgstr "Ñ Ð¾Ð±ÑŠÑ‘Ð¼Ð½Ð¾Ð¹ ÑкороÑтью" - -#: src/slic3r/GUI/PresetHints.cpp:232 -#, c-format -msgid "%3.2f mm³/s at filament speed %3.2f mm/s." -msgstr "%3.2f мм³/Ñ Ð¿Ñ€Ð¸ ÑкороÑти прутка %3.2f мм/Ñ." - -#: src/slic3r/GUI/PresetHints.cpp:250 -======= "ЕÑли раÑчётное Ð²Ñ€ÐµÐ¼Ñ Ð¿ÐµÑ‡Ð°Ñ‚Ð¸ ÑÐ»Ð¾Ñ Ð±Ð¾Ð»ÑŒÑˆÐ¾Ðµ, но вÑÑ‘ ещё ниже ~%1% Ñек., " "вентилÑтор будет работать Ñ Ð¿Ð»Ð°Ð²Ð½Ð¾ падающей ÑкороÑтью между %2%%%-%3%%%." @@ -13405,26 +8158,10 @@ msgid "%3.2f mm³/s at filament speed %3.2f mm/s." msgstr "%3.2f мм³/Ñ Ð¿Ñ€Ð¸ ÑкороÑти прутка %3.2f мм/Ñ." #: src/slic3r/GUI/PresetHints.cpp:215 ->>>>>>> master msgid "" -"Recommended object thin wall thickness: Not available due to invalid layer height." +"Recommended object thin wall thickness: Not available due to invalid layer " +"height." msgstr "" -<<<<<<< HEAD -"Ð ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑƒÐµÐ¼Ð°Ñ Ñ‚Ð¾Ð»Ñ‰Ð¸Ð½Ð° тонких Ñтенок модели: недоÑтупно из-за недопуÑтимой выÑоты " -"ÑлоÑ." - -#: src/slic3r/GUI/PresetHints.cpp:266 -#, c-format -msgid "Recommended object thin wall thickness for layer height %.2f and" -msgstr "Ð ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑƒÐµÐ¼Ð°Ñ Ñ‚Ð¾Ð»Ñ‰Ð¸Ð½Ð° тонких Ñтенок модели при выÑоте ÑÐ»Ð¾Ñ %.2f мм и" - -#: src/slic3r/GUI/PresetHints.cpp:273 -#, c-format -msgid "%d lines: %.2f mm" -msgstr "%d линий периметра - %.2f мм" - -#: src/slic3r/GUI/PresetHints.cpp:277 -======= "Ð ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑƒÐµÐ¼Ð°Ñ Ñ‚Ð¾Ð»Ñ‰Ð¸Ð½Ð° тонких Ñтенок модели: недоÑтупно из-за недопуÑтимой " "выÑоты ÑлоÑ." @@ -13439,59 +8176,10 @@ msgid "%d lines: %.2f mm" msgstr "%d линий периметра - %.2f мм" #: src/slic3r/GUI/PresetHints.cpp:240 ->>>>>>> master msgid "" -"Recommended object thin wall thickness: Not available due to excessively small " -"extrusion width." -msgstr "" -<<<<<<< HEAD -"Ð ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑƒÐµÐ¼Ð°Ñ Ñ‚Ð¾Ð»Ñ‰Ð¸Ð½Ð° тонких Ñтенок модели: недоÑтупно из-за чрезмерно малой ширины " -"ÑкÑтрузии." - -#: src/slic3r/GUI/PresetHints.cpp:306 -msgid "Top / bottom shell thickness hint: Not available due to invalid layer height." +"Recommended object thin wall thickness: Not available due to excessively " +"small extrusion width." msgstr "" -"ПодÑказка о толщине верхней/нижней оболочки недоÑтупна из-за неправильной выÑоты " -"ÑлоÑ." - -#: src/slic3r/GUI/PresetHints.cpp:319 -msgid "Top shell is %1% mm thick for layer height %2% mm." -msgstr "ВерхнÑÑ Ð¾Ð±Ð¾Ð»Ð¾Ñ‡ÐºÐ° будет имеет толщину %1% мм при выÑоте ÑÐ»Ð¾Ñ %2% мм." - -#: src/slic3r/GUI/PresetHints.cpp:322 -msgid "Minimum top shell thickness is %1% mm." -msgstr "ÐœÐ¸Ð½Ð¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ Ñ‚Ð¾Ð»Ñ‰Ð¸Ð½Ð° оболочки Ñверху ÑоÑтавлÑет %1% мм." - -#: src/slic3r/GUI/PresetHints.cpp:325 -msgid "Top is open." -msgstr "Оболочки Ñверху (крыша) отÑутÑтвуют." - -#: src/slic3r/GUI/PresetHints.cpp:338 -msgid "Bottom shell is %1% mm thick for layer height %2% mm." -msgstr "ÐижнÑÑ Ð¾Ð±Ð¾Ð»Ð¾Ñ‡ÐºÐ° будет имеет толщину %1% мм при выÑоте ÑÐ»Ð¾Ñ %2% мм." - -#: src/slic3r/GUI/PresetHints.cpp:341 -msgid "Minimum bottom shell thickness is %1% mm." -msgstr "ÐœÐ¸Ð½Ð¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ Ñ‚Ð¾Ð»Ñ‰Ð¸Ð½Ð° оболочки Ñнизу ÑоÑтавлÑет %1% мм." - -#: src/slic3r/GUI/PresetHints.cpp:344 -msgid "Bottom is open." -msgstr "Оболочки Ñнизу (дно) отÑутÑтвуют." - -#: src/slic3r/GUI/PrintHostDialogs.cpp:35 -msgid "Send G-Code to printer host" -msgstr "Отправить G-кода на хоÑÑ‚ принтера" - -#: src/slic3r/GUI/PrintHostDialogs.cpp:35 -msgid "Upload to Printer Host with the following filename:" -msgstr "Загрузить на хоÑÑ‚ принтера Ñо Ñледующим именем:" - -#: src/slic3r/GUI/PrintHostDialogs.cpp:37 -msgid "Start printing after upload" -msgstr "Ðачать печать поÑле загрузки" - -#: src/slic3r/GUI/PrintHostDialogs.cpp:45 -======= "Ð ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑƒÐµÐ¼Ð°Ñ Ñ‚Ð¾Ð»Ñ‰Ð¸Ð½Ð° тонких Ñтенок модели: недоÑтупно из-за чрезмерно малой " "ширины ÑкÑтрузии." @@ -13539,62 +8227,11 @@ msgid "Upload to Printer Host with the following filename:" msgstr "Загрузить на хоÑÑ‚ принтера Ñо Ñледующим именем:" #: src/slic3r/GUI/PrintHostDialogs.cpp:50 ->>>>>>> master msgid "Use forward slashes ( / ) as a directory separator if needed." msgstr "" -"При необходимоÑти иÑпользуйте коÑую черту ( / ) в качеÑтве Ñ€Ð°Ð·Ð´ÐµÐ»Ð¸Ñ‚ÐµÐ»Ñ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ð¾Ð²." +"При необходимоÑти иÑпользуйте коÑую черту ( / ) в качеÑтве Ñ€Ð°Ð·Ð´ÐµÐ»Ð¸Ñ‚ÐµÐ»Ñ " +"каталогов." -<<<<<<< HEAD -#: src/slic3r/GUI/PrintHostDialogs.cpp:58 -msgid "Group" -msgstr "Группа" - -#: src/slic3r/GUI/PrintHostDialogs.cpp:176 -msgid "ID" -msgstr "ID" - -#: src/slic3r/GUI/PrintHostDialogs.cpp:177 -msgid "Progress" -msgstr "ПрогреÑÑ" - -#: src/slic3r/GUI/PrintHostDialogs.cpp:178 -msgid "Status" -msgstr "СтатуÑ" - -#: src/slic3r/GUI/PrintHostDialogs.cpp:179 -msgid "Host" -msgstr "ХоÑÑ‚" - -#: src/slic3r/GUI/PrintHostDialogs.cpp:180 -msgid "Filename" -msgstr "Ð˜Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð°" - -#: src/slic3r/GUI/PrintHostDialogs.cpp:181 -msgid "Error Message" -msgstr "Сообщение об ошибке" - -#: src/slic3r/GUI/PrintHostDialogs.cpp:184 -msgid "Cancel selected" -msgstr "Отменить выбранное" - -#: src/slic3r/GUI/PrintHostDialogs.cpp:186 -msgid "Show error message" -msgstr "Показать Ñообщение об ошибке" - -#: src/slic3r/GUI/PrintHostDialogs.cpp:228 src/slic3r/GUI/PrintHostDialogs.cpp:261 -msgid "Enqueued" -msgstr "ПоÑтавлено в очередь" - -#: src/slic3r/GUI/PrintHostDialogs.cpp:262 -msgid "Uploading" -msgstr "Отправка" - -#: src/slic3r/GUI/PrintHostDialogs.cpp:266 -msgid "Completed" -msgstr "Завершено" - -#: src/slic3r/GUI/PrintHostDialogs.cpp:304 -======= #: src/slic3r/GUI/PrintHostDialogs.cpp:59 msgid "Group" msgstr "Группа" @@ -13675,7 +8312,6 @@ msgid "Completed" msgstr "Завершено" #: src/slic3r/GUI/PrintHostDialogs.cpp:424 ->>>>>>> master msgid "Error uploading to print host:" msgstr "Ошибка при отправке на хоÑÑ‚ печати:" @@ -13683,15 +8319,6 @@ msgstr "Ошибка при отправке на хоÑÑ‚ печати:" msgid "NO RAMMING AT ALL" msgstr "ÐЕ ДОПУСКÐТЬ Ð ÐММИÐГ" -<<<<<<< HEAD -#: src/slic3r/GUI/RammingChart.cpp:76 src/slic3r/GUI/WipeTowerDialog.cpp:83 -#: src/libslic3r/PrintConfig.cpp:706 src/libslic3r/PrintConfig.cpp:750 -#: src/libslic3r/PrintConfig.cpp:765 src/libslic3r/PrintConfig.cpp:2636 -#: src/libslic3r/PrintConfig.cpp:2645 src/libslic3r/PrintConfig.cpp:2755 -#: src/libslic3r/PrintConfig.cpp:2763 src/libslic3r/PrintConfig.cpp:2771 -#: src/libslic3r/PrintConfig.cpp:2778 src/libslic3r/PrintConfig.cpp:2786 -#: src/libslic3r/PrintConfig.cpp:2794 -======= #: src/slic3r/GUI/RammingChart.cpp:90 src/slic3r/GUI/WipeTowerDialog.cpp:114 #: src/libslic3r/PrintConfig.cpp:929 src/libslic3r/PrintConfig.cpp:973 #: src/libslic3r/PrintConfig.cpp:988 src/libslic3r/PrintConfig.cpp:3160 @@ -13699,7 +8326,6 @@ msgstr "ÐЕ ДОПУСКÐТЬ Ð ÐММИÐГ" #: src/libslic3r/PrintConfig.cpp:3318 src/libslic3r/PrintConfig.cpp:3326 #: src/libslic3r/PrintConfig.cpp:3333 src/libslic3r/PrintConfig.cpp:3341 #: src/libslic3r/PrintConfig.cpp:3349 ->>>>>>> master msgid "s" msgstr "Ñ" @@ -13707,13 +8333,8 @@ msgstr "Ñ" msgid "Volumetric speed" msgstr "ÐžÐ±ÑŠÑ‘Ð¼Ð½Ð°Ñ ÑкороÑÑ‚ÑŒ подачи" -<<<<<<< HEAD -#: src/slic3r/GUI/RammingChart.cpp:81 src/libslic3r/PrintConfig.cpp:663 -#: src/libslic3r/PrintConfig.cpp:1458 -======= #: src/slic3r/GUI/RammingChart.cpp:95 src/libslic3r/PrintConfig.cpp:886 #: src/libslic3r/PrintConfig.cpp:1782 ->>>>>>> master msgid "mm³/s" msgstr "мм³/Ñ" @@ -13751,15 +8372,10 @@ msgstr "Профиль Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ \"%1%\" уже ÑущеÑтвует." #: src/slic3r/GUI/SavePresetDialog.cpp:136 #, boost-format msgid "" -<<<<<<< HEAD -"Preset with name \"%1%\" already exists and is incompatible with selected printer." -msgstr "Профиль Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ \"%1%\" уже ÑущеÑтвует и неÑовмеÑтим Ñ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ñ‹Ð¼ принтером." -======= "Preset with name \"%1%\" already exists and is incompatible with selected " "printer." msgstr "" "Профиль Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ \"%1%\" уже ÑущеÑтвует и неÑовмеÑтим Ñ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ñ‹Ð¼ принтером." ->>>>>>> master #: src/slic3r/GUI/SavePresetDialog.cpp:137 msgid "Note: This preset will be replaced after saving" @@ -13772,18 +8388,6 @@ msgstr "Данное Ð¸Ð¼Ñ Ð½Ðµ может быть пуÑтым." #: src/slic3r/GUI/SavePresetDialog.cpp:147 msgid "The name cannot start with space character." msgstr "Ð˜Ð¼Ñ Ð½Ðµ должно начитатьÑÑ Ñ Ð¿Ñ€Ð¾Ð±ÐµÐ»Ð°." -<<<<<<< HEAD - -#: src/slic3r/GUI/SavePresetDialog.cpp:152 -msgid "The name cannot end with space character." -msgstr "Ð˜Ð¼Ñ Ð½Ðµ должно заканчиватьÑÑ Ð¿Ñ€Ð¾Ð±ÐµÐ»Ð¾Ð¼." - -#: src/slic3r/GUI/SavePresetDialog.cpp:186 src/slic3r/GUI/SavePresetDialog.cpp:192 -msgid "Save preset" -msgstr "Сохранение профилÑ" - -#: src/slic3r/GUI/SavePresetDialog.cpp:215 -======= #: src/slic3r/GUI/SavePresetDialog.cpp:152 msgid "The name cannot end with space character." @@ -13799,17 +8403,12 @@ msgid "Save preset" msgstr "Сохранение профилÑ" #: src/slic3r/GUI/SavePresetDialog.cpp:221 ->>>>>>> master msgctxt "PresetName" msgid "Copy" msgstr "КопиÑ" -<<<<<<< HEAD -#: src/slic3r/GUI/SavePresetDialog.cpp:273 -======= #: src/slic3r/GUI/SavePresetDialog.cpp:283 #, boost-format ->>>>>>> master msgid "" "You have selected physical printer \"%1%\" \n" "with related printer preset \"%2%\"" @@ -13817,30 +8416,6 @@ msgstr "" "Выбран физичеÑкий принтер \"%1%\" Ñо \n" "ÑвÑзанным профилем принтера \"%2%\"" -<<<<<<< HEAD -#: src/slic3r/GUI/SavePresetDialog.cpp:306 -msgid "What would you like to do with \"%1%\" preset after saving?" -msgstr "Что вы хотите Ñделать Ñ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»ÐµÐ¼ \"%1%\" поÑле ÑохранениÑ?" - -#: src/slic3r/GUI/SavePresetDialog.cpp:309 -msgid "Change \"%1%\" to \"%2%\" for this physical printer \"%3%\"" -msgstr "Сменить \"%1%\" на \"%2%\" Ð´Ð»Ñ Ñтого физичеÑкого принтера \"%3%\"" - -#: src/slic3r/GUI/SavePresetDialog.cpp:310 -msgid "Add \"%1%\" as a next preset for the the physical printer \"%2%\"" -msgstr "" -"Добавить \"%1%\" в качеÑтве Ñледующего Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ Ð´Ð»Ñ Ñ„Ð¸Ð·Ð¸Ñ‡ÐµÑкого принтера \"%2%\"" - -#: src/slic3r/GUI/SavePresetDialog.cpp:311 -msgid "Just switch to \"%1%\" preset" -msgstr "ПроÑто переключитьÑÑ Ð½Ð° профиль \"%1%\"" - -#: src/slic3r/GUI/Search.cpp:77 src/slic3r/GUI/Tab.cpp:2421 -msgid "Stealth" -msgstr "Тихий режим" - -#: src/slic3r/GUI/Search.cpp:77 src/slic3r/GUI/Tab.cpp:2415 -======= #: src/slic3r/GUI/SavePresetDialog.cpp:322 #, boost-format msgid "What would you like to do with \"%1%\" preset after saving?" @@ -13870,7 +8445,6 @@ msgstr "Тихий режим" #: src/slic3r/GUI/Search.cpp:90 src/slic3r/GUI/Search.cpp:345 #: src/slic3r/GUI/Tab.cpp:2636 ->>>>>>> master msgid "Normal" msgstr "Ðормальный режим" @@ -13906,23 +8480,6 @@ msgstr "Выбор\\Добавление вÑего" msgid "Selection-Remove All" msgstr "Выбор\\Удаление вÑего" -<<<<<<< HEAD -#: src/slic3r/GUI/Selection.cpp:960 -msgid "Scale To Fit" -msgstr "ОтмаÑштабировать под облаÑÑ‚ÑŒ печати" - -#: src/slic3r/GUI/Selection.cpp:1487 -msgid "Set Printable Instance" -msgstr "ÐšÐ¾Ð¿Ð¸Ñ Ð´Ð»Ñ Ð¿ÐµÑ‡Ð°Ñ‚Ð¸" - -#: src/slic3r/GUI/Selection.cpp:1487 -msgid "Set Unprintable Instance" -msgstr "ÐšÐ¾Ð¿Ð¸Ñ Ð½Ðµ Ð´Ð»Ñ Ð¿ÐµÑ‡Ð°Ñ‚Ð¸" - -#: src/slic3r/GUI/SysInfoDialog.cpp:82 -msgid "System Information" -msgstr "СиÑÑ‚ÐµÐ¼Ð½Ð°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ" -======= #: src/slic3r/GUI/Selection.cpp:950 msgid "Scale To Fit" msgstr "ОтмаÑштабировать под облаÑÑ‚ÑŒ печати" @@ -14020,41 +8577,11 @@ msgstr "Библиотеки из черного ÑпиÑка загружены #: src/slic3r/GUI/SysInfoDialog.cpp:162 msgid "Eigen vectorization supported:" msgstr "ВнутреннÑÑ Ð²ÐµÐºÑ‚Ð¾Ñ€Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶Ð¸Ð²Ð°ÐµÑ‚ÑÑ:" ->>>>>>> master #: src/slic3r/GUI/SysInfoDialog.cpp:169 msgid "Copy to Clipboard" msgstr "Скопировать в буфер обмена" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:109 src/libslic3r/PrintConfig.cpp:321 -msgid "Compatible printers" -msgstr "СовмеÑтимые принтеры" - -#: src/slic3r/GUI/Tab.cpp:110 -msgid "Select the printers this profile is compatible with." -msgstr "Выберите принтеры, ÑовмеÑтимые Ñ Ð´Ð°Ð½Ð½Ñ‹Ð¼ профилем." - -#: src/slic3r/GUI/Tab.cpp:115 src/libslic3r/PrintConfig.cpp:336 -msgid "Compatible print profiles" -msgstr "СовмеÑтимые профили печати" - -#: src/slic3r/GUI/Tab.cpp:116 -msgid "Select the print profiles this profile is compatible with." -msgstr "Выберите профили печати, Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¼Ð¸ Ñтот профиль ÑовмеÑтим." - -#. TRN "Save current Settings" -#: src/slic3r/GUI/Tab.cpp:211 -#, c-format -msgid "Save current %s" -msgstr "Сохранить текущие %s" - -#: src/slic3r/GUI/Tab.cpp:212 -msgid "Delete this preset" -msgstr "Удалить Ñтот профиль" - -#: src/slic3r/GUI/Tab.cpp:216 -======= #: src/slic3r/GUI/Tab.cpp:114 src/libslic3r/PrintConfig.cpp:542 msgid "Compatible printers" msgstr "СовмеÑтимые принтеры" @@ -14086,25 +8613,13 @@ msgid "Delete this preset" msgstr "Удалить Ñтот профиль" #: src/slic3r/GUI/Tab.cpp:223 ->>>>>>> master msgid "" "Hover the cursor over buttons to find more information \n" "or click this button." msgstr "" -"Ðаведите курÑор на кнопки Ð´Ð»Ñ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ð¹ информации или нажмите Ñту " -"кнопку." - -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:220 -msgid "Search in settings [%1%]" -msgstr "ПоиÑк в наÑтройках [%1%]" - -#: src/slic3r/GUI/Tab.cpp:1237 -msgid "Detach from system preset" -msgstr "ОтÑоединить от ÑиÑтемного профилÑ" +"Ðаведите курÑор на кнопки Ð´Ð»Ñ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ð¹ информации или " +"нажмите Ñту кнопку." -#: src/slic3r/GUI/Tab.cpp:1250 -======= #: src/slic3r/GUI/Tab.cpp:227 #, boost-format msgid "Search in settings [%1%]" @@ -14115,60 +8630,13 @@ msgid "Detach from system preset" msgstr "ОтÑоединить от ÑиÑтемного профилÑ" #: src/slic3r/GUI/Tab.cpp:1315 ->>>>>>> master msgid "" -"A copy of the current system preset will be created, which will be detached from " -"the system preset." +"A copy of the current system preset will be created, which will be detached " +"from the system preset." msgstr "" "Будет Ñоздана ÐºÐ¾Ð¿Ð¸Ñ Ñ‚ÐµÐºÑƒÑ‰ÐµÐ³Ð¾ ÑиÑтемного профилÑ, который будет отÑоединён от " "ÑиÑтемного профилÑ." -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:1251 -msgid "The current custom preset will be detached from the parent system preset." -msgstr "" -"Текущий пользовательÑкий профиль будет отÑоединён от родительÑкого ÑиÑтемного " -"профилÑ." - -#: src/slic3r/GUI/Tab.cpp:1254 -msgid "Modifications to the current profile will be saved." -msgstr "Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð±ÑƒÐ´ÑƒÑ‚ Ñохранены в текущем профиле." - -#: src/slic3r/GUI/Tab.cpp:1257 -msgid "" -"This action is not revertable.\n" -"Do you want to proceed?" -msgstr "" -"Ðта Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ñ Ð½ÐµÐ¾Ð±Ñ€Ð°Ñ‚Ð¸Ð¼Ð°.\n" -"Хотите продолжить?" - -#: src/slic3r/GUI/Tab.cpp:1259 -msgid "Detach preset" -msgstr "ОтÑоединить профиль" - -#: src/slic3r/GUI/Tab.cpp:1285 -msgid "This is a default preset." -msgstr "Ðто профиль по умолчанию." - -#: src/slic3r/GUI/Tab.cpp:1287 -msgid "This is a system preset." -msgstr "Ðто ÑиÑтемный профиль." - -#: src/slic3r/GUI/Tab.cpp:1289 -msgid "Current preset is inherited from the default preset." -msgstr "Текущий профиль наÑледуетÑÑ Ð¾Ñ‚ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ Ð¿Ð¾ умолчанию." - -#: src/slic3r/GUI/Tab.cpp:1293 -msgid "Current preset is inherited from" -msgstr "Текущий профиль наÑледуетÑÑ Ð¾Ñ‚" - -#: src/slic3r/GUI/Tab.cpp:1297 -msgid "It can't be deleted or modified." -msgstr "Его Ð½ÐµÐ»ÑŒÐ·Ñ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ или изменить." - -#: src/slic3r/GUI/Tab.cpp:1298 -msgid "Any modifications should be saved as a new preset inherited from this one." -======= #: src/slic3r/GUI/Tab.cpp:1316 msgid "" "The current custom preset will be detached from the parent system preset." @@ -14207,195 +8675,10 @@ msgstr "Его Ð½ÐµÐ»ÑŒÐ·Ñ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ или изменить." #: src/slic3r/GUI/Tab.cpp:1364 msgid "" "Any modifications should be saved as a new preset inherited from this one." ->>>>>>> master msgstr "" -"Любые Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð´Ð¾Ð»Ð¶Ð½Ñ‹ быть Ñохранены как новый профиль, унаÑледованный от текущего." - -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:1299 -msgid "To do that please specify a new name for the preset." -msgstr "Ð”Ð»Ñ Ñтого укажите новое Ð¸Ð¼Ñ Ð´Ð»Ñ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ." - -#: src/slic3r/GUI/Tab.cpp:1303 -msgid "Additional information:" -msgstr "Ð”Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ:" - -#: src/slic3r/GUI/Tab.cpp:1309 -msgid "printer model" -msgstr "модель принтера" - -#: src/slic3r/GUI/Tab.cpp:1317 -msgid "default print profile" -msgstr "профиль печати по умолчанию" +"Любые Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð´Ð¾Ð»Ð¶Ð½Ñ‹ быть Ñохранены как новый профиль, унаÑледованный от " +"текущего." -#: src/slic3r/GUI/Tab.cpp:1320 -msgid "default filament profile" -msgstr "профиль прутка по умолчанию" - -#: src/slic3r/GUI/Tab.cpp:1334 -msgid "default SLA material profile" -msgstr "профиль SLA материала по умолчанию" - -#: src/slic3r/GUI/Tab.cpp:1338 -msgid "default SLA print profile" -msgstr "профиль SLA печати по умолчанию" - -#: src/slic3r/GUI/Tab.cpp:1346 -msgid "full profile name" -msgstr "полное Ð¸Ð¼Ñ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ" - -#: src/slic3r/GUI/Tab.cpp:1347 -msgid "symbolic profile name" -msgstr "ÑимволичеÑкое Ð¸Ð¼Ñ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ" - -#: src/slic3r/GUI/Tab.cpp:1385 src/slic3r/GUI/Tab.cpp:4042 -msgid "Layers and perimeters" -msgstr "Слои и периметры" - -#: src/slic3r/GUI/Tab.cpp:1391 -msgid "Vertical shells" -msgstr "Вертикальные оболочки" - -#: src/slic3r/GUI/Tab.cpp:1403 -msgid "Horizontal shells" -msgstr "Горизонтальные оболочки (Ñлои Ñверху и Ñнизу модели)" - -#: src/slic3r/GUI/Tab.cpp:1404 src/libslic3r/PrintConfig.cpp:1980 -msgid "Solid layers" -msgstr "Сплошных Ñлоёв" - -#: src/slic3r/GUI/Tab.cpp:1409 -msgid "Minimum shell thickness" -msgstr "ÐœÐ¸Ð½Ð¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ Ñ‚Ð¾Ð»Ñ‰Ð¸Ð½Ð° оболочки" - -#: src/slic3r/GUI/Tab.cpp:1420 -msgid "Quality (slower slicing)" -msgstr "КачеÑтво (замедлÑет нарезку)" - -#: src/slic3r/GUI/Tab.cpp:1448 -msgid "Reducing printing time" -msgstr "Сокращение времени печати" - -#: src/slic3r/GUI/Tab.cpp:1460 -msgid "Skirt and brim" -msgstr "Юбка и кайма" - -#: src/slic3r/GUI/Tab.cpp:1480 -msgid "Raft" -msgstr "Подложка" - -#: src/slic3r/GUI/Tab.cpp:1484 -msgid "Options for support material and raft" -msgstr "Опции Ð´Ð»Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ¸ и подложки" - -#: src/slic3r/GUI/Tab.cpp:1499 -msgid "Speed for print moves" -msgstr "СкороÑÑ‚ÑŒ Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¸ печати" - -#: src/slic3r/GUI/Tab.cpp:1512 -msgid "Speed for non-print moves" -msgstr "СкороÑÑ‚ÑŒ Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰ÐµÐ½Ð¸Ñ Ð±ÐµÐ· печати" - -#: src/slic3r/GUI/Tab.cpp:1515 -msgid "Modifiers" -msgstr "Модификаторы" - -#: src/slic3r/GUI/Tab.cpp:1518 -msgid "Acceleration control (advanced)" -msgstr "Управление уÑкорением (дополнительно)" - -#: src/slic3r/GUI/Tab.cpp:1525 -msgid "Autospeed (advanced)" -msgstr "ÐвтоматичеÑкое управление ÑкороÑтью (дополнительно)" - -#: src/slic3r/GUI/Tab.cpp:1533 -msgid "Multiple Extruders" -msgstr "ÐеÑколько ÑкÑтрудеров" - -#: src/slic3r/GUI/Tab.cpp:1541 -msgid "Ooze prevention" -msgstr "Предотвращение течи материала" - -#: src/slic3r/GUI/Tab.cpp:1559 -msgid "Extrusion width" -msgstr "Ширина ÑкÑтрузии" - -#: src/slic3r/GUI/Tab.cpp:1569 -msgid "Overlap" -msgstr "Перекрытие" - -#: src/slic3r/GUI/Tab.cpp:1572 -msgid "Flow" -msgstr "Поток" - -#: src/slic3r/GUI/Tab.cpp:1581 -msgid "Other" -msgstr "Прочее" - -#: src/slic3r/GUI/Tab.cpp:1584 src/slic3r/GUI/Tab.cpp:4118 -msgid "Output options" -msgstr "Выходные параметры" - -#: src/slic3r/GUI/Tab.cpp:1585 -msgid "Sequential printing" -msgstr "ПоÑÐ»ÐµÐ´Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð¿ÐµÑ‡Ð°Ñ‚ÑŒ" - -#: src/slic3r/GUI/Tab.cpp:1587 -msgid "Extruder clearance" -msgstr "Ð Ð°Ð´Ð¸ÑƒÑ Ð±ÐµÐ·Ð¾Ð¿Ð°Ñной зоны ÑкÑтрудера" - -#: src/slic3r/GUI/Tab.cpp:1592 src/slic3r/GUI/Tab.cpp:4119 -msgid "Output file" -msgstr "Выходной файл" - -#: src/slic3r/GUI/Tab.cpp:1599 src/libslic3r/PrintConfig.cpp:1662 -msgid "Post-processing scripts" -msgstr "Скрипты поÑтобработки" - -#: src/slic3r/GUI/Tab.cpp:1605 src/slic3r/GUI/Tab.cpp:1606 src/slic3r/GUI/Tab.cpp:1927 -#: src/slic3r/GUI/Tab.cpp:1928 src/slic3r/GUI/Tab.cpp:2266 src/slic3r/GUI/Tab.cpp:2267 -#: src/slic3r/GUI/Tab.cpp:2342 src/slic3r/GUI/Tab.cpp:2343 src/slic3r/GUI/Tab.cpp:3985 -#: src/slic3r/GUI/Tab.cpp:3986 -msgid "Notes" -msgstr "Заметки" - -#: src/slic3r/GUI/Tab.cpp:1612 src/slic3r/GUI/Tab.cpp:1935 src/slic3r/GUI/Tab.cpp:2273 -#: src/slic3r/GUI/Tab.cpp:2349 src/slic3r/GUI/Tab.cpp:3993 src/slic3r/GUI/Tab.cpp:4124 -msgid "Dependencies" -msgstr "ЗавиÑимоÑти" - -#: src/slic3r/GUI/Tab.cpp:1613 src/slic3r/GUI/Tab.cpp:1936 src/slic3r/GUI/Tab.cpp:2274 -#: src/slic3r/GUI/Tab.cpp:2350 src/slic3r/GUI/Tab.cpp:3994 src/slic3r/GUI/Tab.cpp:4125 -msgid "Profile dependencies" -msgstr "ЗавиÑимоÑти профилÑ" - -#: src/slic3r/GUI/Tab.cpp:1693 -msgid "Filament Overrides" -msgstr "Переопределение парам. прутка" - -#: src/slic3r/GUI/Tab.cpp:1815 -msgid "Temperature" -msgstr "Температура" - -#: src/slic3r/GUI/Tab.cpp:1816 -msgid "Nozzle" -msgstr "Сопло" - -#: src/slic3r/GUI/Tab.cpp:1821 -msgid "Bed" -msgstr "Стол" - -#: src/slic3r/GUI/Tab.cpp:1826 -msgid "Cooling" -msgstr "Охлаждение" - -#: src/slic3r/GUI/Tab.cpp:1828 src/libslic3r/PrintConfig.cpp:1565 -#: src/libslic3r/PrintConfig.cpp:2428 -msgid "Enable" -msgstr "Вкл." - -#: src/slic3r/GUI/Tab.cpp:1839 -======= #: src/slic3r/GUI/Tab.cpp:1365 msgid "To do that please specify a new name for the preset." msgstr "Ð”Ð»Ñ Ñтого укажите новое Ð¸Ð¼Ñ Ð´Ð»Ñ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ." @@ -14613,7 +8896,6 @@ msgid "Enable" msgstr "Вкл." #: src/slic3r/GUI/Tab.cpp:2007 ->>>>>>> master msgid "Fan settings" msgstr "ÐаÑтройки вентилÑтора" @@ -14635,31 +8917,13 @@ msgstr "Параметры черновой башни" #: src/slic3r/GUI/Tab.cpp:2044 msgid "Toolchange parameters with single extruder MM printers" -<<<<<<< HEAD -msgstr "Параметры Ñмены инÑтрумента в одноÑкÑтрудерных мультиматериальных принтерах" -======= msgstr "" "Параметры Ñмены инÑтрумента в одноÑкÑтрудерных мультиматериальных принтерах" ->>>>>>> master #: src/slic3r/GUI/Tab.cpp:2057 msgid "Ramming settings" msgstr "ÐаÑтройки Ñ€Ñмминга" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:1912 src/slic3r/GUI/Tab.cpp:2205 -#: src/libslic3r/PrintConfig.cpp:2063 -msgid "Custom G-code" -msgstr "ПользовательÑкий G-код" - -#: src/slic3r/GUI/Tab.cpp:1913 src/slic3r/GUI/Tab.cpp:2206 -#: src/libslic3r/PrintConfig.cpp:2013 src/libslic3r/PrintConfig.cpp:2028 -msgid "Start G-code" -msgstr "Стартовый G-код" - -#: src/slic3r/GUI/Tab.cpp:1920 src/slic3r/GUI/Tab.cpp:2213 -#: src/libslic3r/PrintConfig.cpp:441 src/libslic3r/PrintConfig.cpp:451 -======= #: src/slic3r/GUI/Tab.cpp:2081 src/slic3r/GUI/Tab.cpp:2401 #: src/slic3r/GUI/Tab.cpp:4208 src/libslic3r/GCode.cpp:733 #: src/libslic3r/PrintConfig.cpp:2450 @@ -14675,7 +8939,6 @@ msgstr "Стартовый G-код" #: src/slic3r/GUI/Tab.cpp:2092 src/slic3r/GUI/Tab.cpp:2412 #: src/libslic3r/GCode.cpp:708 src/libslic3r/PrintConfig.cpp:662 #: src/libslic3r/PrintConfig.cpp:672 ->>>>>>> master msgid "End G-code" msgstr "Завершающий G-код" @@ -14685,40 +8948,19 @@ msgstr "ПодÑказки об объёмном раÑходе недоÑтуп #: src/slic3r/GUI/Tab.cpp:2249 msgid "" -"Note: All parameters from this group are moved to the Physical Printer settings " -"(see changelog).\n" +"Note: All parameters from this group are moved to the Physical Printer " +"settings (see changelog).\n" "\n" -<<<<<<< HEAD -"A new Physical Printer profile is created by clicking on the \"cog\" icon right of " -"the Printer profiles combo box, by selecting the \"Add physical printer\" item in " -"the Printer combo box. The Physical Printer profile editor opens also when clicking " -"on the \"cog\" icon in the Printer settings tab. The Physical Printer profiles are " -"being stored into PrusaSlicer/physical_printer directory." -======= "A new Physical Printer profile is created by clicking on the \"cog\" icon " "right of the Printer profiles combo box, by selecting the \"Add physical " "printer\" item in the Printer combo box. The Physical Printer profile editor " "opens also when clicking on the \"cog\" icon in the Printer settings tab. " "The Physical Printer profiles are being stored into PrusaSlicer/" "physical_printer directory." ->>>>>>> master msgstr "" "Примечание: вÑе параметры из Ñтой группы перенеÑены в наÑтройки физичеÑкого " "принтера (Ñм. ÑпиÑок изменений).\n" "\n" -<<<<<<< HEAD -"Ðовый профиль физичеÑкого принтера ÑоздаётÑÑ Ð½Ð°Ð¶Ð°Ñ‚Ð¸ÐµÐ¼ по значку \"шеÑтеренка\" " -"Ñправа от Ð¿Ð¾Ð»Ñ Ñо ÑпиÑком профилей принтеров, выбрав \"Добавить физичеÑкий принтер" -"\". Редактор Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ Ñ„Ð¸Ð·Ð¸Ñ‡ÐµÑкого принтера открываетÑÑ Ñ‚Ð°ÐºÐ¶Ðµ при нажатии на значок " -"\"шеÑтеренка\" на вкладке наÑтройки принтера. Профили физичеÑкого принтера " -"ÑохранÑÑŽÑ‚ÑÑ Ð² папке PrusaSlicer/physical_printer." - -#: src/slic3r/GUI/Tab.cpp:2099 src/slic3r/GUI/Tab.cpp:2286 -msgid "Size and coordinates" -msgstr "Размер и координаты" - -#: src/slic3r/GUI/Tab.cpp:2108 src/slic3r/GUI/UnsavedChangesDialog.cpp:1080 -======= "Ðовый профиль физичеÑкого принтера ÑоздаётÑÑ Ð½Ð°Ð¶Ð°Ñ‚Ð¸ÐµÐ¼ по значку \"шеÑтеренка" "\" Ñправа от Ð¿Ð¾Ð»Ñ Ñо ÑпиÑком профилей принтеров, выбрав «Добавить физичеÑкий " "принтер». Редактор Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ Ñ„Ð¸Ð·Ð¸Ñ‡ÐµÑкого принтера открываетÑÑ Ñ‚Ð°ÐºÐ¶Ðµ при " @@ -14731,7 +8973,6 @@ msgstr "Размер и координаты" #: src/slic3r/GUI/Tab.cpp:2292 src/slic3r/GUI/UnsavedChangesDialog.cpp:1283 #: src/slic3r/GUI/UnsavedChangesDialog.cpp:1671 ->>>>>>> master msgid "Capabilities" msgstr "ХарактериÑтики принтера" @@ -14743,89 +8984,11 @@ msgstr "КоличеÑтво ÑкÑтрудеров у принтера." msgid "" "Single Extruder Multi Material is selected, \n" "and all extruders must have the same diameter.\n" -"Do you want to change the diameter for all extruders to first extruder nozzle " -"diameter value?" +"Do you want to change the diameter for all extruders to first extruder " +"nozzle diameter value?" msgstr "" "Выбран мультиматериальный одиночный ÑкÑтрудер, \n" "поÑтому вÑе ÑкÑтрудеры должны иметь одинаковый диаметр.\n" -<<<<<<< HEAD -"Изменить диаметр вÑех ÑкÑтрудеров на значение диаметра Ñопла первого ÑкÑтрудера?" - -#: src/slic3r/GUI/Tab.cpp:2144 src/slic3r/GUI/Tab.cpp:2552 -#: src/libslic3r/PrintConfig.cpp:1534 -msgid "Nozzle diameter" -msgstr "Диаметр Ñопла" - -#: src/slic3r/GUI/Tab.cpp:2220 src/libslic3r/PrintConfig.cpp:209 -msgid "Before layer change G-code" -msgstr "G-код, выполнÑемый перед Ñменой ÑлоÑ" - -#: src/slic3r/GUI/Tab.cpp:2227 src/libslic3r/PrintConfig.cpp:1273 -msgid "After layer change G-code" -msgstr "G-код выполнÑемый поÑле Ñмены ÑлоÑ" - -#: src/slic3r/GUI/Tab.cpp:2234 src/libslic3r/PrintConfig.cpp:2321 -msgid "Tool change G-code" -msgstr "G-код выполнÑемый при Ñмене инÑтрумента" - -#: src/slic3r/GUI/Tab.cpp:2241 -msgid "Between objects G-code (for sequential printing)" -msgstr "G-код выполнÑемый между моделÑми (Ð´Ð»Ñ Ð¿Ð¾Ñледовательной печати)" - -#: src/slic3r/GUI/Tab.cpp:2248 -msgid "Color Change G-code" -msgstr "G-код Ñмены цвета" - -#: src/slic3r/GUI/Tab.cpp:2254 src/libslic3r/PrintConfig.cpp:2054 -msgid "Pause Print G-code" -msgstr "G-код паузы печати" - -#: src/slic3r/GUI/Tab.cpp:2260 -msgid "Template Custom G-code" -msgstr "ПользовательÑкий шаблон G-кода" - -#: src/slic3r/GUI/Tab.cpp:2293 -msgid "Display" -msgstr "ДиÑплей" - -#: src/slic3r/GUI/Tab.cpp:2308 -msgid "Tilt" -msgstr "Ðаклон ванночки" - -#: src/slic3r/GUI/Tab.cpp:2309 -msgid "Tilt time" -msgstr "Ð’Ñ€ÐµÐ¼Ñ Ð½Ð°ÐºÐ»Ð¾Ð½Ð° ванночки" - -#: src/slic3r/GUI/Tab.cpp:2315 src/slic3r/GUI/Tab.cpp:3969 -msgid "Corrections" -msgstr "Корректировка" - -#: src/slic3r/GUI/Tab.cpp:2332 src/slic3r/GUI/Tab.cpp:3965 -msgid "Exposure" -msgstr "ÐкÑпозициÑ" - -#: src/slic3r/GUI/Tab.cpp:2391 src/slic3r/GUI/Tab.cpp:2485 -#: src/libslic3r/PrintConfig.cpp:1302 src/libslic3r/PrintConfig.cpp:1337 -#: src/libslic3r/PrintConfig.cpp:1354 src/libslic3r/PrintConfig.cpp:1371 -#: src/libslic3r/PrintConfig.cpp:1387 src/libslic3r/PrintConfig.cpp:1397 -#: src/libslic3r/PrintConfig.cpp:1407 src/libslic3r/PrintConfig.cpp:1417 -msgid "Machine limits" -msgstr "ÐžÐ³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¸Ð½Ñ‚ÐµÑ€Ð°" - -#: src/slic3r/GUI/Tab.cpp:2414 -msgid "Values in this column are for Normal mode" -msgstr "Ð—Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð² Ñтой колонке Ð´Ð»Ñ Ð½Ð¾Ñ€Ð¼Ð°Ð»ÑŒÐ½Ð¾Ð³Ð¾ режима" - -#: src/slic3r/GUI/Tab.cpp:2420 -msgid "Values in this column are for Stealth mode" -msgstr "Ð—Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð² Ñтой колонке Ð´Ð»Ñ Ñ‚Ð¸Ñ…Ð¾Ð³Ð¾ режима" - -#: src/slic3r/GUI/Tab.cpp:2429 -msgid "Maximum feedrates" -msgstr "МакÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ ÑкороÑÑ‚ÑŒ (#define DEFAULT_MAX_FEEDRATE {X, Y, Z, E})" - -#: src/slic3r/GUI/Tab.cpp:2434 -======= "Изменить диаметр вÑех ÑкÑтрудеров на значение диаметра Ñопла первого " "ÑкÑтрудера?" @@ -14908,74 +9071,35 @@ msgid "Maximum feedrates" msgstr "МакÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ ÑкороÑÑ‚ÑŒ (#define DEFAULT_MAX_FEEDRATE {X, Y, Z, E})" #: src/slic3r/GUI/Tab.cpp:2655 ->>>>>>> master msgid "Maximum accelerations" msgstr "" "МакÑимальное уÑкорение (#define DEFAULT_MAX_ACCELERATION {X,Y,Z,E}, #define " "DEFAULT_RETRACT_ACCELERATION, )" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:2441 -msgid "Jerk limits" -msgstr "Ограничение рывка (#define DEFAULT_{X,Y,Z,E}JERK)" - -#: src/slic3r/GUI/Tab.cpp:2446 -======= #: src/slic3r/GUI/Tab.cpp:2664 msgid "Jerk limits" msgstr "Ограничение рывка (#define DEFAULT_{X,Y,Z,E}JERK)" #: src/slic3r/GUI/Tab.cpp:2670 ->>>>>>> master msgid "Minimum feedrates" msgstr "" "ÐœÐ¸Ð½Ð¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ ÑкороÑÑ‚ÑŒ (#define DEFAULT_MINIMUMFEEDRATE и #define " "DEFAULT_MINTRAVELFEEDRATE)" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:2510 src/slic3r/GUI/Tab.cpp:2518 -msgid "Single extruder MM setup" -msgstr "ÐкÑтрудер в ММ принтере" - -#: src/slic3r/GUI/Tab.cpp:2519 -======= #: src/slic3r/GUI/Tab.cpp:2724 src/slic3r/GUI/Tab.cpp:2733 msgid "Single extruder MM setup" msgstr "ÐкÑтрудер в ММ принтере" #: src/slic3r/GUI/Tab.cpp:2734 ->>>>>>> master msgid "Single extruder multimaterial parameters" -msgstr "Параметры ÑкÑтрудера в одноÑкÑтрудерном мультиматериальном (ММ) принтере" +msgstr "" +"Параметры ÑкÑтрудера в одноÑкÑтрудерном мультиматериальном (ММ) принтере" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:2550 -======= #: src/slic3r/GUI/Tab.cpp:2769 ->>>>>>> master msgid "" -"This is a single extruder multimaterial printer, diameters of all extruders will be " -"set to the new value. Do you want to proceed?" +"This is a single extruder multimaterial printer, diameters of all extruders " +"will be set to the new value. Do you want to proceed?" msgstr "" -<<<<<<< HEAD -"Ðто одноÑкÑтрудерный мультиматериальный принтер, диаметры вÑех ÑкÑтрудеров будут " -"уÑтановлены на новое значение. Ð’Ñ‹ хотите продолжить?" - -#: src/slic3r/GUI/Tab.cpp:2574 -msgid "Layer height limits" -msgstr "Ограничение выÑоты ÑлоÑ" - -#: src/slic3r/GUI/Tab.cpp:2579 -msgid "Position (for multi-extruder printers)" -msgstr "ÐŸÐ¾Ð·Ð¸Ñ†Ð¸Ñ ÑкÑтрудера (Ð´Ð»Ñ Ð¼Ð½Ð¾Ð³Ð¾ÑкÑтрудерных принтеров)" - -#: src/slic3r/GUI/Tab.cpp:2585 -msgid "Only lift Z" -msgstr "Приподнимать Ñопло только" - -#: src/slic3r/GUI/Tab.cpp:2598 -msgid "Retraction when tool is disabled (advanced settings for multi-extruder setups)" -======= "Ðто одноÑкÑтрудерный мультиматериальный принтер, диаметры вÑех ÑкÑтрудеров " "будут уÑтановлены на новое значение. Ð’Ñ‹ хотите продолжить?" @@ -14995,24 +9119,15 @@ msgstr "Приподнимать Ñопло только" msgid "" "Retraction when tool is disabled (advanced settings for multi-extruder " "setups)" ->>>>>>> master msgstr "" -"Ретракт, при отключении Ñопла (дополнительные наÑтройки Ð´Ð»Ñ Ð¼Ð½Ð¾Ð³Ð¾ÑкÑтрудерных " -"принтеров)" +"Ретракт, при отключении Ñопла (дополнительные наÑтройки Ð´Ð»Ñ " +"многоÑкÑтрудерных принтеров)" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:2605 -msgid "Reset to Filament Color" -msgstr "Ð¡Ð±Ñ€Ð¾Ñ Ð² цвет прутка" - -#: src/slic3r/GUI/Tab.cpp:2783 -======= #: src/slic3r/GUI/Tab.cpp:2825 msgid "Reset to Filament Color" msgstr "Ð¡Ð±Ñ€Ð¾Ñ Ð² цвет прутка" #: src/slic3r/GUI/Tab.cpp:3005 ->>>>>>> master msgid "" "The Wipe option is not available when using the Firmware Retraction mode.\n" "\n" @@ -15022,29 +9137,6 @@ msgstr "" "\n" "Отключить его Ð´Ð»Ñ Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ñ€ÐµÑ‚Ñ€Ð°ÐºÑ‚Ð° из прошивки?" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:2785 -msgid "Firmware Retraction" -msgstr "Ретракт из прошивки" - -#: src/slic3r/GUI/Tab.cpp:3376 -msgid "Detached" -msgstr "ОтÑоединён" - -#: src/slic3r/GUI/Tab.cpp:3439 -msgid "remove" -msgstr "убрать" - -#: src/slic3r/GUI/Tab.cpp:3439 -msgid "delete" -msgstr "удалить" - -#: src/slic3r/GUI/Tab.cpp:3448 -msgid "It's a last preset for this physical printer." -msgstr "Ðто поÑледний профиль Ð´Ð»Ñ Ñтого физичеÑкого принтера." - -#: src/slic3r/GUI/Tab.cpp:3453 -======= #: src/slic3r/GUI/Tab.cpp:3007 msgid "Firmware Retraction" msgstr "Ретракт из прошивки" @@ -15071,39 +9163,10 @@ msgstr "Ðто поÑледний профиль Ð´Ð»Ñ Ñтого Ñ„Ð¸Ð·Ð¸Ñ‡ÐµÑ #: src/slic3r/GUI/Tab.cpp:3699 #, boost-format ->>>>>>> master -msgid "" -"Are you sure you want to delete \"%1%\" preset from the physical printer \"%2%\"?" -msgstr "" -<<<<<<< HEAD -"Ð’Ñ‹ дейÑтвительно хотите удалить профиль \"%1%\" из физичеÑкого принтера \"%2%\"?" - -#: src/slic3r/GUI/Tab.cpp:3465 -msgid "The physical printer(s) below is based on the preset, you are going to delete." -msgstr "" -"ФизичеÑкие принтеры, указанные ниже, оÑнованы на профиле, которые вы ÑобираетеÑÑŒ " -"удалить." - -#: src/slic3r/GUI/Tab.cpp:3469 -msgid "Note, that selected preset will be deleted from this/those printer(s) too." -msgstr "Обратите внимание, выбранный профиль будет удалён из Ñтого принтера тоже." - -#: src/slic3r/GUI/Tab.cpp:3473 -msgid "" -"The physical printer(s) below is based only on the preset, you are going to delete." -msgstr "" -"ФизичеÑкие принтеры, указанные ниже, оÑнованы только на профиле, которые вы " -"ÑобираетеÑÑŒ удалить." - -#: src/slic3r/GUI/Tab.cpp:3477 msgid "" -"Note, that this/those printer(s) will be deleted after deleting of the selected " -"preset." +"Are you sure you want to delete \"%1%\" preset from the physical printer " +"\"%2%\"?" msgstr "" -"Обратите внимание, Ñтот принтер(-Ñ‹) будет удалён поÑле ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ð¾Ð³Ð¾ профилÑ." - -#: src/slic3r/GUI/Tab.cpp:3481 -======= "Ð’Ñ‹ дейÑтвительно хотите удалить профиль \"%1%\" из физичеÑкого принтера \"%2%" "\"?" @@ -15167,28 +9230,10 @@ msgstr[2] "" #: src/slic3r/GUI/Tab.cpp:3731 #, boost-format ->>>>>>> master msgid "Are you sure you want to %1% the selected preset?" msgstr "Ð’Ñ‹ уверены, что хотите %1% выбранный профиль?" #. TRN Remove/Delete -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3486 -msgid "%1% Preset" -msgstr "Профиль %1%" - -#: src/slic3r/GUI/Tab.cpp:3567 src/slic3r/GUI/Tab.cpp:3639 -msgid "Set" -msgstr "Выбор" - -#: src/slic3r/GUI/Tab.cpp:3703 -msgid "Machine limits will be emitted to G-code and used to estimate print time." -msgstr "" -"ÐžÐ³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¸Ð½Ñ‚ÐµÑ€Ð° будут передаватьÑÑ Ð² G-код и иÑпользоватьÑÑ Ð´Ð»Ñ Ð¾Ñ†ÐµÐ½ÐºÐ¸ времени " -"печати." - -#: src/slic3r/GUI/Tab.cpp:3706 -======= #: src/slic3r/GUI/Tab.cpp:3736 #, boost-format msgid "%1% Preset" @@ -15230,100 +9275,59 @@ msgstr "" "времени печати." #: src/slic3r/GUI/Tab.cpp:4239 ->>>>>>> master msgid "" -"Machine limits will NOT be emitted to G-code, however they will be used to estimate " -"print time, which may therefore not be accurate as the printer may apply a " -"different set of machine limits." +"Machine limits will NOT be emitted to G-code, however they will be used to " +"estimate print time, which may therefore not be accurate as the printer may " +"apply a different set of machine limits." msgstr "" "ÐžÐ³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¸Ð½Ñ‚ÐµÑ€Ð° не будут передаватьÑÑ Ð² G-код, тем не менее они будут " -<<<<<<< HEAD -"иÑпользуютÑÑ Ð´Ð»Ñ Ð¾Ñ†ÐµÐ½ÐºÐ¸ времени печати, которое может быть неточным, поÑкольку " -"принтер может применÑÑ‚ÑŒ другой набор ограничений Ð´Ð»Ñ Ð¿Ñ€Ð¸Ð½Ñ‚ÐµÑ€Ð°." - -#: src/slic3r/GUI/Tab.cpp:3710 -======= "иÑпользуютÑÑ Ð´Ð»Ñ Ð¾Ñ†ÐµÐ½ÐºÐ¸ времени печати, которое может быть неточным, " "поÑкольку принтер может применÑÑ‚ÑŒ другой набор ограничений Ð´Ð»Ñ Ð¿Ñ€Ð¸Ð½Ñ‚ÐµÑ€Ð°." #: src/slic3r/GUI/Tab.cpp:4243 ->>>>>>> master msgid "" -"Machine limits are not set, therefore the print time estimate may not be accurate." +"Machine limits are not set, therefore the print time estimate may not be " +"accurate." msgstr "" -<<<<<<< HEAD -"ÐžÐ³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¸Ð½Ñ‚ÐµÑ€Ð° не заданы, поÑтому оценка времени печати может быть неточной." - -#: src/slic3r/GUI/Tab.cpp:3732 -======= "ÐžÐ³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¸Ð½Ñ‚ÐµÑ€Ð° не заданы, поÑтому оценка времени печати может быть " "неточной." #: src/slic3r/GUI/Tab.cpp:4265 ->>>>>>> master msgid "LOCKED LOCK" msgstr "ЗÐКРЫТЫЙ ЗÐМОЧЕК" #. TRN Description for "LOCKED LOCK" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3734 -======= #: src/slic3r/GUI/Tab.cpp:4267 ->>>>>>> master msgid "" -"indicates that the settings are the same as the system (or default) values for the " -"current option group" +"indicates that the settings are the same as the system (or default) values " +"for the current option group" msgstr "" -<<<<<<< HEAD -"указывает, что наÑтройки Ñовпадают Ñ ÑиÑтемными значениÑми (или значениÑми по " -"умолчанию) Ð´Ð»Ñ Ñ‚ÐµÐºÑƒÑ‰ÐµÐ¹ группы." - -#: src/slic3r/GUI/Tab.cpp:3736 -======= "указывает, что наÑтройки Ñовпадают Ñ ÑиÑтемными значениÑми (или значениÑми " "по умолчанию) Ð´Ð»Ñ Ñ‚ÐµÐºÑƒÑ‰ÐµÐ¹ группы." #: src/slic3r/GUI/Tab.cpp:4269 ->>>>>>> master msgid "UNLOCKED LOCK" msgstr "ОТКРЫТЫЙ ЗÐМОЧЕК" #. TRN Description for "UNLOCKED LOCK" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3738 -======= #: src/slic3r/GUI/Tab.cpp:4271 ->>>>>>> master msgid "" -"indicates that some settings were changed and are not equal to the system (or " -"default) values for the current option group.\n" -"Click the UNLOCKED LOCK icon to reset all settings for current option group to the " -"system (or default) values." +"indicates that some settings were changed and are not equal to the system " +"(or default) values for the current option group.\n" +"Click the UNLOCKED LOCK icon to reset all settings for current option group " +"to the system (or default) values." msgstr "" -<<<<<<< HEAD -"указывает, что некоторые наÑтройки были изменены и не равны ÑиÑтемным значениÑм " -"(или значениÑм по умолчанию) Ð´Ð»Ñ Ñ‚ÐµÐºÑƒÑ‰ÐµÐ¹ группы.\n" -"Ðажмите, чтобы ÑброÑить вÑе наÑтройки текущей группы до ÑиÑтемных значений (или " -"значений по умолчанию)." - -#: src/slic3r/GUI/Tab.cpp:3743 -======= "указывает, что некоторые наÑтройки были изменены и не равны ÑиÑтемным " "значениÑм (или значениÑм по умолчанию) Ð´Ð»Ñ Ñ‚ÐµÐºÑƒÑ‰ÐµÐ¹ группы.\n" "Ðажмите, чтобы ÑброÑить вÑе наÑтройки текущей группы до ÑиÑтемных значений " "(или значений по умолчанию)." #: src/slic3r/GUI/Tab.cpp:4276 ->>>>>>> master msgid "WHITE BULLET" msgstr "БЕЛЫЙ ÐœÐРКЕР" #. TRN Description for "WHITE BULLET" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3745 -======= #: src/slic3r/GUI/Tab.cpp:4278 ->>>>>>> master msgid "" "for the left button: indicates a non-system (or non-default) preset,\n" "for the right button: indicates that the settings hasn't been modified." @@ -15331,35 +9335,18 @@ msgstr "" "Ñлева: указывает на не ÑиÑтемный профиль (или профиль не по умолчанию),\n" "Ñправа: указывает, что параметры не были изменены." -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3748 -======= #: src/slic3r/GUI/Tab.cpp:4281 ->>>>>>> master msgid "BACK ARROW" msgstr "ЗÐÐЧОК СО СТРЕЛКОЙ" #. TRN Description for "BACK ARROW" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3750 -======= #: src/slic3r/GUI/Tab.cpp:4283 ->>>>>>> master -msgid "" -"indicates that the settings were changed and are not equal to the last saved preset " -"for the current option group.\n" -"Click the BACK ARROW icon to reset all settings for the current option group to the " -"last saved preset." -msgstr "" -<<<<<<< HEAD -"указывает, что наÑтройки были изменены и не Ñовпадают Ñ Ð½Ð°Ñтройками в поÑледнем " -"Ñохранённом профиле\n" -"Ð´Ð»Ñ Ñ‚ÐµÐºÑƒÑ‰ÐµÐ¹ группы. Ðажмите на значок Ñо Ñтрелкой, чтобы ÑброÑить вÑе наÑтройки Ð´Ð»Ñ " -"текущей группы до поÑледнего\n" -"Ñохранённого Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ." - -#: src/slic3r/GUI/Tab.cpp:3760 -======= +msgid "" +"indicates that the settings were changed and are not equal to the last saved " +"preset for the current option group.\n" +"Click the BACK ARROW icon to reset all settings for the current option group " +"to the last saved preset." +msgstr "" "указывает, что наÑтройки были изменены и не Ñовпадают Ñ Ð½Ð°Ñтройками в " "поÑледнем Ñохранённом профиле\n" "Ð´Ð»Ñ Ñ‚ÐµÐºÑƒÑ‰ÐµÐ¹ группы. Ðажмите на значок Ñо Ñтрелкой, чтобы ÑброÑить вÑе " @@ -15367,40 +9354,22 @@ msgstr "" "Ñохранённого Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ." #: src/slic3r/GUI/Tab.cpp:4293 ->>>>>>> master msgid "" "LOCKED LOCK icon indicates that the settings are the same as the system (or " "default) values for the current option group" msgstr "" -<<<<<<< HEAD -"ЗÐКРЫТЫЙ ЗÐМОЧЕК указывает, что наÑтройки Ñовпадают Ñ ÑиÑтемными значениÑми (или " -"значениÑми по умолчанию) Ð´Ð»Ñ Ñ‚ÐµÐºÑƒÑ‰ÐµÐ¹ группы." - -#: src/slic3r/GUI/Tab.cpp:3762 -======= "ЗÐКРЫТЫЙ ЗÐМОЧЕК указывает, что наÑтройки Ñовпадают Ñ ÑиÑтемными значениÑми " "(или значениÑми по умолчанию) Ð´Ð»Ñ Ñ‚ÐµÐºÑƒÑ‰ÐµÐ¹ группы." #: src/slic3r/GUI/Tab.cpp:4295 ->>>>>>> master msgid "" -"UNLOCKED LOCK icon indicates that some settings were changed and are not equal to " -"the system (or default) values for the current option group.\n" -"Click to reset all settings for current option group to the system (or default) " -"values." +"UNLOCKED LOCK icon indicates that some settings were changed and are not " +"equal to the system (or default) values for the current option group.\n" +"Click to reset all settings for current option group to the system (or " +"default) values." msgstr "" "ОТКРЫТЫЙ ЗÐМОЧЕК указывает, что некоторые наÑтройки были изменены и не равны " "ÑиÑтемным значениÑм (или значениÑм по умолчанию) Ð´Ð»Ñ Ñ‚ÐµÐºÑƒÑ‰ÐµÐ¹ группы.\n" -<<<<<<< HEAD -"Ðажмите, чтобы ÑброÑить вÑе наÑтройки текущей группы до ÑиÑтемных значений (или " -"значений по умолчанию)." - -#: src/slic3r/GUI/Tab.cpp:3765 -msgid "WHITE BULLET icon indicates a non system (or non default) preset." -msgstr "БЕЛЫЙ ÐœÐРКЕРуказывает на не ÑиÑтемный профиль (или профиль не по умолчанию)." - -#: src/slic3r/GUI/Tab.cpp:3768 -======= "Ðажмите, чтобы ÑброÑить вÑе наÑтройки текущей группы до ÑиÑтемных значений " "(или значений по умолчанию)." @@ -15410,113 +9379,62 @@ msgstr "" "БЕЛЫЙ ÐœÐРКЕРуказывает на не ÑиÑтемный профиль (или профиль не по умолчанию)." #: src/slic3r/GUI/Tab.cpp:4301 ->>>>>>> master msgid "" -"WHITE BULLET icon indicates that the settings are the same as in the last saved " -"preset for the current option group." +"WHITE BULLET icon indicates that the settings are the same as in the last " +"saved preset for the current option group." msgstr "" "БЕЛЫЙ ÐœÐРКЕРозначает, что наÑтройки Ñовпадают Ñ Ð½Ð°Ñтройками в поÑледнем " "Ñохранённом профиле Ð´Ð»Ñ Ñ‚ÐµÐºÑƒÑ‰ÐµÐ¹ группы." -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3770 -======= #: src/slic3r/GUI/Tab.cpp:4303 ->>>>>>> master msgid "" -"BACK ARROW icon indicates that the settings were changed and are not equal to the " -"last saved preset for the current option group.\n" -"Click to reset all settings for the current option group to the last saved preset." +"BACK ARROW icon indicates that the settings were changed and are not equal " +"to the last saved preset for the current option group.\n" +"Click to reset all settings for the current option group to the last saved " +"preset." msgstr "" "ЗÐÐЧОК СО СТРЕЛКОЙ указывает, что наÑтройки были изменены и не Ñовпадают Ñ " "наÑтройками в поÑледнем Ñохранённом профиле Ð´Ð»Ñ Ñ‚ÐµÐºÑƒÑ‰ÐµÐ¹ группы.\n" -"Ðажмите, чтобы ÑброÑить вÑе наÑтройки Ð´Ð»Ñ Ñ‚ÐµÐºÑƒÑ‰ÐµÐ¹ группы до поÑледнего Ñохранённого " -"Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ." +"Ðажмите, чтобы ÑброÑить вÑе наÑтройки Ð´Ð»Ñ Ñ‚ÐµÐºÑƒÑ‰ÐµÐ¹ группы до поÑледнего " +"Ñохранённого Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ." -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3776 -======= #: src/slic3r/GUI/Tab.cpp:4309 ->>>>>>> master msgid "" -"LOCKED LOCK icon indicates that the value is the same as the system (or default) " -"value." +"LOCKED LOCK icon indicates that the value is the same as the system (or " +"default) value." msgstr "" -<<<<<<< HEAD -"ЗÐКРЫТЫЙ ЗÐМОЧЕК указывает, что значение Ñовпадает Ñ ÑиÑтемным значением (или " -"значение по умолчанию)." - -#: src/slic3r/GUI/Tab.cpp:3777 -======= "ЗÐКРЫТЫЙ ЗÐМОЧЕК указывает, что значение Ñовпадает Ñ ÑиÑтемным значением " "(или значение по умолчанию)." #: src/slic3r/GUI/Tab.cpp:4310 ->>>>>>> master msgid "" -"UNLOCKED LOCK icon indicates that the value was changed and is not equal to the " -"system (or default) value.\n" +"UNLOCKED LOCK icon indicates that the value was changed and is not equal to " +"the system (or default) value.\n" "Click to reset current value to the system (or default) value." msgstr "" "ОТКРЫТЫЙ ЗÐМОЧЕК указывает, что значение было изменено и не равно ÑиÑтемному " "значению (или значению по умолчанию).\n" -<<<<<<< HEAD -"Ðажмите, чтобы ÑброÑить текущее значение к ÑиÑтемному значению (или значению по " -"умолчанию)." - -#: src/slic3r/GUI/Tab.cpp:3783 -======= "Ðажмите, чтобы ÑброÑить текущее значение к ÑиÑтемному значению (или значению " "по умолчанию)." #: src/slic3r/GUI/Tab.cpp:4316 ->>>>>>> master msgid "" -"WHITE BULLET icon indicates that the value is the same as in the last saved preset." +"WHITE BULLET icon indicates that the value is the same as in the last saved " +"preset." msgstr "" -<<<<<<< HEAD -"БЕЛЫЙ ÐœÐРКЕРуказывает, что значение Ñовпадает Ñо значением в поÑледнем Ñохранённом " -"профиле." - -#: src/slic3r/GUI/Tab.cpp:3784 -======= "БЕЛЫЙ ÐœÐРКЕРуказывает, что значение Ñовпадает Ñо значением в поÑледнем " "Ñохранённом профиле." #: src/slic3r/GUI/Tab.cpp:4317 ->>>>>>> master msgid "" -"BACK ARROW icon indicates that the value was changed and is not equal to the last " -"saved preset.\n" +"BACK ARROW icon indicates that the value was changed and is not equal to the " +"last saved preset.\n" "Click to reset current value to the last saved preset." msgstr "" "ЗÐÐЧОК СО СТРЕЛКОЙ указывает, что значение было изменено и не Ñовпадает Ñо " "значением в поÑледнем Ñохранённом профиле Ð´Ð»Ñ Ñ‚ÐµÐºÑƒÑ‰ÐµÐ¹ группы.\n" "Ðажмите, чтобы ÑброÑить значение до поÑледнего Ñохранённого Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ." -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3928 src/slic3r/GUI/Tab.cpp:3930 -msgid "Material" -msgstr "Материал" - -#: src/slic3r/GUI/Tab.cpp:4052 -msgid "Support head" -msgstr "ÐоÑик поддержки" - -#: src/slic3r/GUI/Tab.cpp:4057 -msgid "Support pillar" -msgstr "Тело поддержки" - -#: src/slic3r/GUI/Tab.cpp:4080 -msgid "Connection of the support sticks and junctions" -msgstr "Ð¡Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð¾Ð¿Ð¾Ñ€ поддержки Ñо ÑвÑзующим узлом" - -#: src/slic3r/GUI/Tab.cpp:4085 -msgid "Automatic generation" -msgstr "ÐвтоматичеÑÐºÐ°Ñ Ð³ÐµÐ½ÐµÑ€Ð°Ñ†Ð¸Ñ" - -#: src/slic3r/GUI/Tab.cpp:4159 -======= #: src/slic3r/GUI/Tab.cpp:4471 src/slic3r/GUI/Tab.cpp:4473 msgid "Material" msgstr "Материал" @@ -15543,7 +9461,6 @@ msgstr "ÐвтоматичеÑÐºÐ°Ñ Ð³ÐµÐ½ÐµÑ€Ð°Ñ†Ð¸Ñ" #: src/slic3r/GUI/Tab.cpp:4719 #, boost-format ->>>>>>> master msgid "" "\"%1%\" is disabled because \"%2%\" is on in \"%3%\" category.\n" "To enable \"%1%\", please switch off \"%2%\"" @@ -15551,73 +9468,6 @@ msgstr "" "\"%1%\" отключена, так как \"%2%\" находитÑÑ Ð² категории \"%3%\".\n" "Чтобы включить \"%1%\", отключите \"%2%\"" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:4161 src/libslic3r/PrintConfig.cpp:3002 -msgid "Object elevation" -msgstr "Ð’Ñ‹Ñота подъёма модели" - -#: src/slic3r/GUI/Tab.cpp:4161 src/libslic3r/PrintConfig.cpp:3104 -msgid "Pad around object" -msgstr "Подложка вокруг модели" - -#: src/slic3r/GUI/Tab.hpp:370 src/slic3r/GUI/Tab.hpp:492 -msgid "Print Settings" -msgstr "ÐаÑтройки печати" - -#: src/slic3r/GUI/Tab.hpp:401 -msgid "Filament Settings" -msgstr "ÐаÑтройки прутка" - -#: src/slic3r/GUI/Tab.hpp:442 -msgid "Printer Settings" -msgstr "ÐаÑтройки принтера" - -#: src/slic3r/GUI/Tab.hpp:476 -msgid "Material Settings" -msgstr "ÐаÑтройка материала" - -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:149 -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:158 -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:857 -msgid "Undef" -msgstr "Ðе задано" - -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:537 -msgid "PrusaSlicer is closing: Unsaved Changes" -msgstr "Закрытие PrusaSlicer: неÑохраненные изменениÑ" - -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:554 -msgid "Switching Presets: Unsaved Changes" -msgstr "Смена профилей: неÑохраненные изменениÑ" - -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:620 -msgid "Old Value" -msgstr "Старое значение" - -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:621 -msgid "New Value" -msgstr "Ðовое значение" - -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:652 -msgid "Transfer" -msgstr "ПеренеÑти" - -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:653 -msgid "Discard" -msgstr "Ðе ÑохранÑÑ‚ÑŒ" - -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:654 -msgid "Save" -msgstr "Сохранить" - -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:674 -msgid "PrusaSlicer will remember your action." -msgstr "PrusaSlicer запомнит ваш выбор." - -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:676 -msgid "" -"You will not be asked about the unsaved changes the next time you close PrusaSlicer." -======= #: src/slic3r/GUI/Tab.cpp:4721 src/libslic3r/PrintConfig.cpp:3578 msgid "Object elevation" msgstr "Ð’Ñ‹Ñота подъёма модели" @@ -15683,84 +9533,26 @@ msgstr "" msgid "" "You will not be asked about the unsaved changes in presets the next time you " "switch a preset" ->>>>>>> master msgstr "" -"Ð—Ð°Ð¿Ñ€Ð¾Ñ Ð¾ неÑохраненных изменениÑÑ… не будет поÑвлÑÑ‚ÑŒÑÑ Ð¿Ñ€Ð¸ закрытии PrusaSlicer." -<<<<<<< HEAD -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:677 -msgid "" -"You will not be asked about the unsaved changes the next time you switch a preset." -======= #: src/slic3r/GUI/UnsavedChangesDialog.cpp:899 msgid "" "You will not be asked about the unsaved changes in presets the next time " "you: \n" "- Closing PrusaSlicer while some presets are modified,\n" "- Loading a new project while some presets are modified" ->>>>>>> master msgstr "" -"Ð—Ð°Ð¿Ñ€Ð¾Ñ Ð¾ неÑохраненных изменениÑÑ… не будет поÑвлÑÑ‚ÑŒÑÑ Ð¿Ñ€Ð¸ Ñледующем переключении " -"профилÑ." -<<<<<<< HEAD -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:678 -======= #: src/slic3r/GUI/UnsavedChangesDialog.cpp:902 msgid "PrusaSlicer will remember your action." msgstr "PrusaSlicer запомнит ваш выбор." #: src/slic3r/GUI/UnsavedChangesDialog.cpp:903 #, boost-format ->>>>>>> master msgid "" "Visit \"Preferences\" and check \"%1%\"\n" "to be asked about unsaved changes again." msgstr "" -<<<<<<< HEAD -"Зайдите в \"ÐаÑтройки приложениÑ\" и уÑтановите флажок \"%1%\",\n" -"чтобы вернуть Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð¾ неÑохраненных изменениÑÑ…." - -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:680 -msgid "PrusaSlicer: Don't ask me again" -msgstr "PrusaSlicer: Ðе Ñпрашивать Ñнова" - -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:747 -msgid "Some fields are too long to fit. Right mouse click reveals the full text." -msgstr "" -"Ðекоторые Ð¿Ð¾Ð»Ñ Ñлишком длинные. Щёлкните правой кнопкой мыши, чтобы показать полный " -"текÑÑ‚." - -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:749 -msgid "All settings changes will be discarded." -msgstr "Ð’Ñе изменённые параметры будут потерÑны." - -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:752 -msgid "Save the selected options." -msgstr "Сохранить выбранные параметры." - -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:752 -msgid "Transfer the selected settings to the newly selected preset." -msgstr "ПеренеÑти выбранные параметры во вновь выбранный профиль." - -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:756 -msgid "Save the selected options to preset \"%1%\"." -msgstr "Сохранить выбранные параметры в профиле \"%1%\"." - -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:757 -msgid "Transfer the selected options to the newly selected preset \"%1%\"." -msgstr "ПеренеÑти выбранные параметры во вновь выбранный профиль \"%1%\"." - -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:1019 -msgid "The following presets were modified:" -msgstr "Следующие профили были изменены:" - -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:1024 -msgid "Preset \"%1%\" has the following unsaved changes:" -msgstr "Профиль \"%1%\" имеет Ñледующие неÑохранённые изменениÑ:" - -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:1028 -======= "Зайдите в наÑтройки Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð¸ уÑтановите флажок \"%1%\",\n" "чтобы вернуть Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð¾ неÑохранённых изменениÑÑ…." @@ -15815,43 +9607,20 @@ msgstr "Профиль \"%1%\" имеет Ñледующие неÑохранёР#: src/slic3r/GUI/UnsavedChangesDialog.cpp:1232 #, boost-format ->>>>>>> master msgid "" "Preset \"%1%\" is not compatible with the new printer profile and it has the " "following unsaved changes:" msgstr "" -<<<<<<< HEAD -"Профиль \"%1%\" неÑовмеÑтим Ñ Ð½Ð¾Ð²Ñ‹Ð¼ профилем принтера, и в нём еÑÑ‚ÑŒ Ñледующие " -"неÑохраненные изменениÑ:" - -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:1029 -======= "Профиль \"%1%\" неÑовмеÑтим Ñ Ð½Ð¾Ð²Ñ‹Ð¼ профилем принтера, и в нём еÑÑ‚ÑŒ " "Ñледующие неÑохранённые изменениÑ:" #: src/slic3r/GUI/UnsavedChangesDialog.cpp:1233 #, boost-format ->>>>>>> master msgid "" "Preset \"%1%\" is not compatible with the new print profile and it has the " "following unsaved changes:" msgstr "" "Профиль \"%1%\" неÑовмеÑтим Ñ Ð½Ð¾Ð²Ñ‹Ð¼ профилем печати, и имеет Ñледующие " -<<<<<<< HEAD -"неÑохраненные изменениÑ:" - -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:1075 -msgid "Extruders count" -msgstr "КоличеÑтво ÑкÑтрудеров" - -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:1197 -msgid "Old value" -msgstr "Старое значение" - -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:1198 -msgid "New value" -msgstr "Ðовое значение" -======= "неÑохранённые изменениÑ:" #: src/slic3r/GUI/UnsavedChangesDialog.cpp:1279 @@ -15898,7 +9667,6 @@ msgstr "" #: src/slic3r/GUI/UnsavedChangesDialog.cpp:1681 msgid "Undef category" msgstr "ÐÐµÐ¾Ð¿Ñ€ÐµÐ´ÐµÐ»Ñ‘Ð½Ð½Ð°Ñ ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ" ->>>>>>> master #: src/slic3r/GUI/UnsavedChangesDialog.cpp:1681 msgid "Undef group" @@ -15921,15 +9689,9 @@ msgstr "Ð¢ÐµÐºÑƒÑ‰Ð°Ñ Ð²ÐµÑ€ÑиÑ:" msgid "New version:" msgstr "ÐÐ¾Ð²Ð°Ñ Ð²ÐµÑ€ÑиÑ:" -<<<<<<< HEAD -#: src/slic3r/GUI/UpdateDialogs.cpp:53 -msgid "Changelog && Download" -msgstr "ИÑÑ‚Ð¾Ñ€Ð¸Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹ && Скачать" -======= #: src/slic3r/GUI/UpdateDialogs.cpp:52 msgid "Changelog & Download" msgstr "Журнал изменений и загрузка" ->>>>>>> master #: src/slic3r/GUI/UpdateDialogs.cpp:59 src/slic3r/GUI/UpdateDialogs.cpp:133 #: src/slic3r/GUI/UpdateDialogs.cpp:191 @@ -15970,15 +9732,15 @@ msgstr "ДоÑтупно обновление конфигурации" msgid "" "Would you like to install it?\n" "\n" -"Note that a full configuration snapshot will be created first. It can then be " -"restored at any time should there be a problem with the new version.\n" +"Note that a full configuration snapshot will be created first. It can then " +"be restored at any time should there be a problem with the new version.\n" "\n" "Updated configuration bundles:" msgstr "" "Ð’Ñ‹ хотите уÑтановить её?\n" "\n" -"Обратите внимание, что Ñначала будет Ñоздан Ñнапшот. Он может быть воÑÑтановлен в " -"любое времÑ, еÑли возникнет проблема Ñ Ð½Ð¾Ð²Ð¾Ð¹ верÑией.\n" +"Обратите внимание, что Ñначала будет Ñоздан Ñнапшот. Он может быть " +"воÑÑтановлен в любое времÑ, еÑли возникнет проблема Ñ Ð½Ð¾Ð²Ð¾Ð¹ верÑией.\n" "\n" "Обновлённые пакеты конфигурации:" @@ -16008,20 +9770,15 @@ msgstr "Ðеобходимо уÑтановить обновление конфРmsgid "" "%s will now start updates. Otherwise it won't be able to start.\n" "\n" -"Note that a full configuration snapshot will be created first. It can then be " -"restored at any time should there be a problem with the new version.\n" +"Note that a full configuration snapshot will be created first. It can then " +"be restored at any time should there be a problem with the new version.\n" "\n" "Updated configuration bundles:" msgstr "" "Теперь %s запуÑтит обновление. Иначе он не Ñможет начать работу.\n" "\n" -<<<<<<< HEAD -"Обратите внимание, что Ñначала будет Ñоздан Ñнапшот. Он может быть воÑÑтановлен в " -"любое времÑ, еÑли возникнет проблема Ñ Ð½Ð¾Ð²Ð¾Ð¹ верÑией.\n" -======= "Обратите внимание, что Ñначала будет Ñоздан Ñнапшот. Он может быть " "воÑÑтановлен в любое времÑ, еÑли возникнет проблема Ñ Ð½Ð¾Ð²Ð¾Ð¹ верÑией.\n" ->>>>>>> master "\n" "Обновлённые пакеты конфигурации:" @@ -16040,25 +9797,20 @@ msgstr "ÐеÑовмеÑÑ‚Ð¸Ð¼Ð°Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ %s" msgid "" "This version of %s is not compatible with currently installed configuration " "bundles.\n" -"This probably happened as a result of running an older %s after using a newer one.\n" +"This probably happened as a result of running an older %s after using a " +"newer one.\n" "\n" -"You may either exit %s and try again with a newer version, or you may re-run the " -"initial configuration. Doing so will create a backup snapshot of the existing " -"configuration before installing files compatible with this %s." +"You may either exit %s and try again with a newer version, or you may re-run " +"the initial configuration. Doing so will create a backup snapshot of the " +"existing configuration before installing files compatible with this %s." msgstr "" "Ðта верÑÐ¸Ñ %s не ÑовмеÑтима Ñ ÑƒÑтановленными пакетами конфигурации.\n" "ВероÑтно, Ñто произошло в результате запуÑка более Ñтарой верÑии %s поÑле " "иÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Ð±Ð¾Ð»ÐµÐµ новой.\n" "\n" -<<<<<<< HEAD -"Ð’Ñ‹ можете выйти из %s и повторить попытку Ñ Ð½Ð¾Ð²Ð¾Ð¹ верÑией, либо повторно запуÑтить " -"начальную конфигурацию. Ðто ÑоздаÑÑ‚ резервную копию ÑущеÑтвующей конфигурации перед " -"уÑтановкой файлов, ÑовмеÑтимых Ñ Ñтой верÑией %s." -======= "Ð’Ñ‹ можете выйти из %s и повторить попытку Ñ Ð½Ð¾Ð²Ð¾Ð¹ верÑией, либо повторно " "запуÑтить начальную конфигурацию. Ðто ÑоздаÑÑ‚ резервную копию ÑущеÑтвующей " "конфигурации перед уÑтановкой файлов, ÑовмеÑтимых Ñ Ñтой верÑией %s." ->>>>>>> master #: src/slic3r/GUI/UpdateDialogs.cpp:225 #, c-format, boost-format @@ -16078,22 +9830,22 @@ msgstr "ПеренаÑтроить" msgid "" "%s now uses an updated configuration structure.\n" "\n" -"So called 'System presets' have been introduced, which hold the built-in default " -"settings for various printers. These System presets cannot be modified, instead, " -"users now may create their own presets inheriting settings from one of the System " -"presets.\n" -"An inheriting preset may either inherit a particular value from its parent or " -"override it with a customized value.\n" +"So called 'System presets' have been introduced, which hold the built-in " +"default settings for various printers. These System presets cannot be " +"modified, instead, users now may create their own presets inheriting " +"settings from one of the System presets.\n" +"An inheriting preset may either inherit a particular value from its parent " +"or override it with a customized value.\n" "\n" -"Please proceed with the %s that follows to set up the new presets and to choose " -"whether to enable automatic preset updates." +"Please proceed with the %s that follows to set up the new presets and to " +"choose whether to enable automatic preset updates." msgstr "" "Теперь %s иÑпользует обновлённую Ñтруктуру конфигурации.\n" "\n" "Были введены так называемые 'ÑиÑтемные профили', которые Ñодержат вÑтроенные " -"наÑтройки по умолчанию Ð´Ð»Ñ Ñ€Ð°Ð·Ð½Ñ‹Ñ… принтеров. Ðти ÑиÑтемные профили не могут быть " -"изменены. ВмеÑто Ñтого пользователи теперь могут Ñоздавать ÑобÑтвенные профили, " -"наÑледующие наÑтройки от одного из ÑиÑтемных профилей.\n" +"наÑтройки по умолчанию Ð´Ð»Ñ Ñ€Ð°Ð·Ð½Ñ‹Ñ… принтеров. Ðти ÑиÑтемные профили не могут " +"быть изменены. ВмеÑто Ñтого пользователи теперь могут Ñоздавать ÑобÑтвенные " +"профили, наÑледующие наÑтройки от одного из ÑиÑтемных профилей.\n" "ÐаÑледующий профиль может либо наÑледовать определённое значение от Ñвоего " "родителÑ, либо переопределить его Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ наÑтроенного значениÑ.\n" "\n" @@ -16123,32 +9875,23 @@ msgstr "ÐаÑтройки Ñ€Ñмминга" #: src/slic3r/GUI/WipeTowerDialog.cpp:54 msgid "" -"Ramming denotes the rapid extrusion just before a tool change in a single-extruder " -"MM printer. Its purpose is to properly shape the end of the unloaded filament so it " -"does not prevent insertion of the new filament and can itself be reinserted later. " -"This phase is important and different materials can require different extrusion " -"speeds to get the good shape. For this reason, the extrusion rates during ramming " -"are adjustable.\n" +"Ramming denotes the rapid extrusion just before a tool change in a single-" +"extruder MM printer. Its purpose is to properly shape the end of the " +"unloaded filament so it does not prevent insertion of the new filament and " +"can itself be reinserted later. This phase is important and different " +"materials can require different extrusion speeds to get the good shape. For " +"this reason, the extrusion rates during ramming are adjustable.\n" "\n" -"This is an expert-level setting, incorrect adjustment will likely lead to jams, " -"extruder wheel grinding into filament etc." +"This is an expert-level setting, incorrect adjustment will likely lead to " +"jams, extruder wheel grinding into filament etc." msgstr "" "Ð Ñмминг (ramming) означает быÑтрое ÑкÑтрудирование непоÑредÑтвенно перед " -<<<<<<< HEAD -"Ñменой инÑтрумента в одноÑкÑтрудерном мультиматериальном принтере. Его цель ÑоÑтоит в том, " -"чтобы правильно Ñформировать конец незагруженного прутка, чтобы он не препÑÑ‚Ñтвовал " -"вÑтавке нового прутка или Ñтого же прутка, вÑтавленного позже. Ðта фаза важна " -"и разные материалы могут потребовать разных ÑкороÑтей ÑкÑтрузии, чтобы " -"получить хорошую форму. По Ñтой причине ÑкороÑÑ‚ÑŒ ÑкÑтрузии во Ð²Ñ€ÐµÐ¼Ñ Ñ€Ñмминга " -"регулируетÑÑ.\n" -======= "Ñменой инÑтрумента в одноÑкÑтрудерном мультиматериальном принтере. Его цель " "ÑоÑтоит в том, чтобы правильно Ñформировать конец незагруженного прутка, " "чтобы он не препÑÑ‚Ñтвовал вÑтавке нового прутка или Ñтого же прутка, " "вÑтавленного позже. Ðта фаза важна и разные материалы могут потребовать " "разных ÑкороÑтей ÑкÑтрузии, чтобы получить хорошую форму. По Ñтой причине " "ÑкороÑÑ‚ÑŒ ÑкÑтрузии во Ð²Ñ€ÐµÐ¼Ñ Ñ€Ñмминга регулируетÑÑ.\n" ->>>>>>> master "\n" "Ðта Ð¾Ð¿Ñ†Ð¸Ñ Ð´Ð»Ñ Ð¾Ð¿Ñ‹Ñ‚Ð½Ñ‹Ñ… пользователей, Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°Ñ Ð½Ð°Ñтройка может привеÑти к " "замÑтию, протиранию прутка приводом ÑкÑтрудера и Ñ‚.д." @@ -16173,15 +9916,10 @@ msgstr "РаÑÑтоÑние между линиÑми при Ñ€Ñмминге" msgid "Wipe tower - Purging volume adjustment" msgstr "Ð§ÐµÑ€Ð½Ð¾Ð²Ð°Ñ Ð±Ð°ÑˆÐ½Ñ - регулировка объёма ÑброÑа плаÑтика" -<<<<<<< HEAD -#: src/slic3r/GUI/WipeTowerDialog.cpp:254 -msgid "Here you can adjust required purging volume (mm³) for any given pair of tools." -======= #: src/slic3r/GUI/WipeTowerDialog.cpp:299 msgid "" "Here you can adjust required purging volume (mm³) for any given pair of " "tools." ->>>>>>> master msgstr "" "ЗдеÑÑŒ вы можете отрегулировать требуемый объём очиÑтки (мм³) Ð´Ð»Ñ Ð»ÑŽÐ±Ð¾Ð¹ пары " "инÑтрументов." @@ -16204,16 +9942,11 @@ msgstr "ИнÑтрумент #" #: src/slic3r/GUI/WipeTowerDialog.cpp:361 msgid "" -"Total purging volume is calculated by summing two values below, depending on which " -"tools are loaded/unloaded." +"Total purging volume is calculated by summing two values below, depending on " +"which tools are loaded/unloaded." msgstr "" -<<<<<<< HEAD -"Общий объём прочиÑтки вычиÑлÑетÑÑ Ð¿ÑƒÑ‚Ñ‘Ð¼ ÑÑƒÐ¼Ð¼Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð´Ð²ÑƒÑ… нижеуказанных значений, в " -"завиÑимоÑти от того, какие инÑтрументы предзагружены/выгружены." -======= "Общий объём прочиÑтки вычиÑлÑетÑÑ Ð¿ÑƒÑ‚Ñ‘Ð¼ ÑÑƒÐ¼Ð¼Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð´Ð²ÑƒÑ… нижеуказанных " "значений, в завиÑимоÑти от того, какие инÑтрументы предзагружены/выгружены." ->>>>>>> master #: src/slic3r/GUI/WipeTowerDialog.cpp:362 msgid "Volume to purge (mm³) when the filament is being" @@ -16225,12 +9958,13 @@ msgstr "Из" #: src/slic3r/GUI/WipeTowerDialog.cpp:442 msgid "" -"Switching to simple settings will discard changes done in the advanced mode!\n" +"Switching to simple settings will discard changes done in the advanced " +"mode!\n" "\n" "Do you want to proceed?" msgstr "" -"Переключение на упрощённые наÑтройки отменит изменениÑ, Ñделанные в раÑширенном " -"режиме!\n" +"Переключение на упрощённые наÑтройки отменит изменениÑ, Ñделанные в " +"раÑширенном режиме!\n" "\n" "Хотите продолжить?" @@ -16242,15 +9976,6 @@ msgstr "Показать упрощённые наÑтройки" msgid "Show advanced settings" msgstr "Показать раÑширенные наÑтройки" -<<<<<<< HEAD -#: src/slic3r/GUI/wxExtensions.cpp:627 -#, c-format -msgid "Switch to the %s mode" -msgstr "ПереключитьÑÑ Ð² режим %s" - -#: src/slic3r/GUI/wxExtensions.cpp:628 -#, c-format -======= #: src/slic3r/GUI/wxExtensions.cpp:644 #, c-format, boost-format msgid "Switch to the %s mode" @@ -16258,7 +9983,6 @@ msgstr "ПереключитьÑÑ Ð² режим %s" #: src/slic3r/GUI/wxExtensions.cpp:645 #, c-format, boost-format ->>>>>>> master msgid "Current mode is %s" msgstr "Текущий режим %s" @@ -16302,12 +10026,8 @@ msgstr "Ðеправильный пароль" msgid "Could not get resources to create a new connection" msgstr "Ðе удалоÑÑŒ получить реÑурÑÑ‹ Ð´Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ подключениÑ" -<<<<<<< HEAD -#: src/slic3r/Utils/FixModelByWin10.cpp:219 src/slic3r/Utils/FixModelByWin10.cpp:359 -======= #: src/slic3r/Utils/FixModelByWin10.cpp:221 #: src/slic3r/Utils/FixModelByWin10.cpp:362 ->>>>>>> master msgid "Exporting source model" msgstr "ÐкÑпорт иÑходной модели" @@ -16323,24 +10043,6 @@ msgstr "Ремонт модели Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ ÑервиÑа Netfabb" msgid "Mesh repair failed." msgstr "Ошибка воÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ñетки." -<<<<<<< HEAD -#: src/slic3r/Utils/FixModelByWin10.cpp:251 src/slic3r/Utils/FixModelByWin10.cpp:378 -msgid "Loading repaired model" -msgstr "Загрузка отремонтированной модели" - -#: src/slic3r/Utils/FixModelByWin10.cpp:263 src/slic3r/Utils/FixModelByWin10.cpp:270 -#: src/slic3r/Utils/FixModelByWin10.cpp:302 -msgid "Saving mesh into the 3MF container failed." -msgstr "Ðе удалоÑÑŒ Ñохранить Ñетку в 3MF контейнер." - -#: src/slic3r/Utils/FixModelByWin10.cpp:340 -msgid "Model fixing" -msgstr "Починка модели" - -#: src/slic3r/Utils/FixModelByWin10.cpp:341 -msgid "Exporting model" -msgstr "ÐкÑпорт модели" -======= #: src/slic3r/Utils/FixModelByWin10.cpp:253 #: src/slic3r/Utils/FixModelByWin10.cpp:389 msgid "Loading repaired model" @@ -16351,7 +10053,6 @@ msgstr "Загрузка отремонтированной модели" #: src/slic3r/Utils/FixModelByWin10.cpp:303 msgid "Saving mesh into the 3MF container failed." msgstr "Ðе удалоÑÑŒ Ñохранить Ñетку в 3MF контейнер." ->>>>>>> master #: src/slic3r/Utils/FixModelByWin10.cpp:379 msgid "Export of a temporary 3mf file failed" @@ -16384,21 +10085,6 @@ msgstr "Ремонт модели закончен" #: src/slic3r/Utils/FixModelByWin10.cpp:419 msgid "Model repair canceled" msgstr "Ремонт модели отменён" -<<<<<<< HEAD - -#: src/slic3r/Utils/FixModelByWin10.cpp:423 -msgid "Model repaired successfully" -msgstr "Модель уÑпешно отремонтирована" - -#: src/slic3r/Utils/FixModelByWin10.cpp:423 src/slic3r/Utils/FixModelByWin10.cpp:426 -msgid "Model Repair by the Netfabb service" -msgstr "Ремонт модели Ñлужбой Netfabb" - -#: src/slic3r/Utils/FixModelByWin10.cpp:426 -msgid "Model repair failed:" -msgstr "Ошибка починки модели:" -======= ->>>>>>> master #: src/slic3r/Utils/FlashAir.cpp:58 msgid "Upload not enabled on FlashAir card." @@ -16414,16 +10100,11 @@ msgstr "Ðе удаётÑÑ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒÑÑ Ðº FlashAir" #: src/slic3r/Utils/FlashAir.cpp:76 msgid "" -"Note: FlashAir with firmware 2.00.02 or newer and activated upload function is " -"required." +"Note: FlashAir with firmware 2.00.02 or newer and activated upload function " +"is required." msgstr "" -<<<<<<< HEAD -"Примечание: Ð´Ð»Ñ Ð°ÐºÑ‚Ð¸Ð²Ð°Ñ†Ð¸Ð¸ функцией загрузки, требуетÑÑ FlashAir Ñ Ð¿Ñ€Ð¾ÑˆÐ¸Ð²ÐºÐ¾Ð¹ 2.00.02 " -"и выше." -======= "Примечание: Ð´Ð»Ñ Ð°ÐºÑ‚Ð¸Ð²Ð°Ñ†Ð¸Ð¸ функцией загрузки, требуетÑÑ FlashAir Ñ Ð¿Ñ€Ð¾ÑˆÐ¸Ð²ÐºÐ¾Ð¹ " "2.00.02 и выше." ->>>>>>> master #: src/slic3r/Utils/OctoPrint.cpp:164 msgid "Connection to OctoPrint works correctly." @@ -16495,13 +10176,8 @@ msgid "" "Could not detect system SSL certificate store. PrusaSlicer will be unable to " "establish secure network connections." msgstr "" -<<<<<<< HEAD -"Ðе удалоÑÑŒ обнаружить ÑиÑтемное хранилище SSL-Ñертификатов. PrusaSlicer не Ñможет " -"уÑтанавливать безопаÑные Ñетевые ÑоединениÑ." -======= "Ðе удалоÑÑŒ обнаружить ÑиÑтемное хранилище SSL-Ñертификатов. PrusaSlicer не " "Ñможет уÑтанавливать безопаÑные Ñетевые ÑоединениÑ." ->>>>>>> master #: src/slic3r/Utils/Http.cpp:78 #, boost-format @@ -16511,74 +10187,24 @@ msgstr "PrusaSlicer обнаружил хранилище ÑиÑтемных SSL #: src/slic3r/Utils/Http.cpp:82 #, boost-format msgid "" -"To specify the system certificate store manually, please set the %1% environment " -"variable to the correct CA bundle and restart the application." +"To specify the system certificate store manually, please set the %1% " +"environment variable to the correct CA bundle and restart the application." msgstr "" -<<<<<<< HEAD -"Чтобы вручную указать хранилище ÑиÑтемных Ñертификатов, задайте Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð¾Ð¹ " -"Ñреды %1% правильный пакет CA и перезапуÑтите приложение." -======= "Чтобы вручную указать хранилище ÑиÑтемных Ñертификатов, задайте Ð´Ð»Ñ " "переменной Ñреды %1% правильный пакет CA и перезапуÑтите приложение." ->>>>>>> master #: src/slic3r/Utils/Http.cpp:91 msgid "" -"CURL init has failed. PrusaSlicer will be unable to establish network connections. " -"See logs for additional details." +"CURL init has failed. PrusaSlicer will be unable to establish network " +"connections. See logs for additional details." msgstr "" -<<<<<<< HEAD -"Ошибка инициализации URL-адреÑа клиента. PrusaSlicer не Ñможет уÑтановить Ñетевые " -"подключениÑ. Смотрите журнал Ð´Ð»Ñ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ðµ информации." -======= "Ошибка инициализации URL-адреÑа клиента. PrusaSlicer не Ñможет уÑтановить " "Ñетевые подключениÑ. Смотрите журнал Ð´Ð»Ñ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ðµ информации." ->>>>>>> master #: src/slic3r/Utils/Process.cpp:157 msgid "Open G-code file:" msgstr "Выберите G-код файл:" -<<<<<<< HEAD -#: src/libslic3r/GCode.cpp:518 -msgid "There is an object with no extrusions on the first layer." -msgstr "Ðа первом Ñлое у модели отÑутÑтвует Ñлой Ð´Ð»Ñ ÑкÑтрузии." - -#: src/libslic3r/GCode.cpp:536 -msgid "Empty layers detected, the output would not be printable." -msgstr "Обнаружены пуÑтые Ñлои, печать невозможна." - -#: src/libslic3r/GCode.cpp:537 -msgid "Print z" -msgstr "Печать на выÑоте" - -#: src/libslic3r/GCode.cpp:538 -msgid "" -"This is usually caused by negligibly small extrusions or by a faulty model. Try to " -"repair the model or change its orientation on the bed." -msgstr "" -"Обычно Ñто проиÑходит из-за ничтожно малой ÑкÑтрузии или из-за повреждённой " -"модели. \n" -"Попробуйте отремонтировать модель или изменить её ориентацию на Ñтоле." - -#: src/libslic3r/GCode.cpp:1261 -msgid "" -"Your print is very close to the priming regions. Make sure there is no collision." -msgstr "" -"Модель(-и) находитÑÑ Ð¾Ñ‡ÐµÐ½ÑŒ близко к облаÑти предзарÑдки (облаÑÑ‚ÑŒ подготовки " -"ÑкÑтрудера). УбедитеÑÑŒ, что не произойдёт ÑтолкновениÑ." - -#: src/libslic3r/ExtrusionEntity.cpp:324 src/libslic3r/ExtrusionEntity.cpp:360 -msgid "Mixed" -msgstr "Смешанный" - -#: src/libslic3r/Flow.cpp:61 -msgid "Cannot calculate extrusion width for %1%: Variable \"%2%\" not accessible." -msgstr "" -"Ðе удаётÑÑ Ñ€Ð°ÑÑчитать ширину ÑкÑтрузии Ð´Ð»Ñ %1%: ÐŸÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ \"%2%\" недоÑтупна." - -#: src/libslic3r/Format/3mf.cpp:1668 -======= #: src/slic3r/Utils/Repetier.cpp:84 msgid "Connection to Repetier works correctly." msgstr "Подключение к Repetier уÑтановлено." @@ -16613,7 +10239,6 @@ msgstr "" #: src/slic3r/Utils/Repetier.cpp:266 #, boost-format ->>>>>>> master msgid "" "Enumeration of host printers failed.\n" "Message body: \"%1%\"\n" @@ -16626,20 +10251,12 @@ msgstr "" #: src/slic3r/Config/Snapshot.cpp:584 msgid "Taking a configuration snapshot failed." msgstr "" -"Выбранный 3mf файл не ÑовмеÑтим, так как был Ñохранён в более новой верÑии %1%." -<<<<<<< HEAD -#: src/libslic3r/Format/AMF.cpp:958 -======= #: src/slic3r/Config/Snapshot.cpp:598 ->>>>>>> master msgid "" "PrusaSlicer has encountered an error while taking a configuration snapshot." msgstr "" -"Выбранный amf файл не ÑовмеÑтим, так как был Ñохранён в более новой верÑии %1%." -<<<<<<< HEAD -======= #: src/slic3r/Config/Snapshot.cpp:599 msgid "PrusaSlicer error" msgstr "" @@ -16784,7 +10401,6 @@ msgstr "" "меÑте, и обратитеÑÑŒ к руководÑтву, чтобы узнать как при желании " "переименовать файл G-кода поÑле поÑтобработки.\n" ->>>>>>> master #: src/libslic3r/miniz_extension.cpp:91 msgid "undefined error" msgstr "Ð½ÐµÐ¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°" @@ -16823,11 +10439,7 @@ msgstr "неверный заголовок или архив поврежден #: src/libslic3r/miniz_extension.cpp:109 msgid "unsupported multidisk archive" -<<<<<<< HEAD -msgstr "неподдерживаемый многофайловый архив" -======= msgstr "неподдерживаемый многотомный архив" ->>>>>>> master #: src/libslic3r/miniz_extension.cpp:111 msgid "decompression failed or archive is corrupted" @@ -16912,22 +10524,6 @@ msgstr "ошибка проверки" #: src/libslic3r/miniz_extension.cpp:151 msgid "write calledback failed" msgstr "ошибка запиÑи обратного вызова" -<<<<<<< HEAD - -#: src/libslic3r/Preset.cpp:1299 -msgid "filament" -msgstr "пруток" - -#: src/libslic3r/Print.cpp:1251 -msgid "All objects are outside of the print volume." -msgstr "Ð’Ñе модели находÑÑ‚ÑÑ Ð·Ð° пределами облаÑти печати." - -#: src/libslic3r/Print.cpp:1254 -msgid "The supplied settings will cause an empty print." -msgstr "Заданные наÑтройки приведут к пуÑтой печати." - -#: src/libslic3r/Print.cpp:1258 -======= #: src/libslic3r/Print.cpp:449 msgid "All objects are outside of the print volume." @@ -16938,32 +10534,11 @@ msgid "The supplied settings will cause an empty print." msgstr "Заданные наÑтройки приведут к пуÑтой печати." #: src/libslic3r/Print.cpp:456 ->>>>>>> master msgid "Some objects are too close; your extruder will collide with them." msgstr "" "Ðекоторые модели находÑÑ‚ÑÑ Ñлишком близко друг к другу. ÐкÑтрудер при печати " "ÑтолкнётÑÑ Ñ Ð½Ð¸Ð¼Ð¸." -<<<<<<< HEAD -#: src/libslic3r/Print.cpp:1260 -msgid "Some objects are too tall and cannot be printed without extruder collisions." -msgstr "Ðекоторые модели Ñлишком выÑокие и при печати ÑкÑтрудер ÑтолкнётÑÑ Ñ Ð½Ð¸Ð¼Ð¸." - -#: src/libslic3r/Print.cpp:1269 -msgid "" -"Only a single object may be printed at a time in Spiral Vase mode. Either remove " -"all but the last object, or enable sequential mode by \"complete_objects\"." -msgstr "" -"Режим \"Ð¡Ð¿Ð¸Ñ€Ð°Ð»ÑŒÐ½Ð°Ñ Ð²Ð°Ð·Ð°\" может иÑпользоватьÑÑ Ð´Ð»Ñ Ð¿ÐµÑ‡Ð°Ñ‚Ð¸ только одной модели. Либо " -"оÑтавьте на Ñтоле одну модель или включите поÑледовательную печать Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ " -"\"complete_objects\"." - -#: src/libslic3r/Print.cpp:1277 -msgid "The Spiral Vase option can only be used when printing single material objects." -msgstr "Ð’ режиме \"Ð¡Ð¿Ð¸Ñ€Ð°Ð»ÑŒÐ½Ð°Ñ Ð²Ð°Ð·Ð°\" можно печатать только одним материалом." - -#: src/libslic3r/Print.cpp:1290 -======= #: src/libslic3r/Print.cpp:458 msgid "" "Some objects are too tall and cannot be printed without extruder collisions." @@ -16987,51 +10562,26 @@ msgid "" msgstr "Ð’ режиме Â«Ð¡Ð¿Ð¸Ñ€Ð°Ð»ÑŒÐ½Ð°Ñ Ð²Ð°Ð·Ð°Â» можно печатать только одним материалом." #: src/libslic3r/Print.cpp:484 ->>>>>>> master msgid "" -"The wipe tower is only supported if all extruders have the same nozzle diameter and " -"use filaments of the same diameter." +"The wipe tower is only supported if all extruders have the same nozzle " +"diameter and use filaments of the same diameter." msgstr "" "Режим черновой башни применим только в том Ñлучае, еÑли вÑе ÑкÑтрудеры имеют " "одинаковый диаметр Ñопла и иÑпользуетÑÑ Ð¿Ñ€ÑƒÑ‚Ð¾Ðº одного диаметра." -<<<<<<< HEAD -#: src/libslic3r/Print.cpp:1296 -======= #: src/libslic3r/Print.cpp:490 ->>>>>>> master msgid "" "The Wipe Tower is currently only supported for the Marlin, RepRap/Sprinter, " "RepRapFirmware and Repetier G-code flavors." msgstr "" -<<<<<<< HEAD -"Ð’ наÑтоÑщее Ð²Ñ€ÐµÐ¼Ñ Ñ€ÐµÐ¶Ð¸Ð¼ черновой башни поддерживаетÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ñледующими типами G-" -"кода: Marlin, RepRap/Sprinter, RepRapFirmware, Repetier." - -#: src/libslic3r/Print.cpp:1298 -======= "Ð’ наÑтоÑщее Ð²Ñ€ÐµÐ¼Ñ Ñ€ÐµÐ¶Ð¸Ð¼ черновой башни поддерживаетÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ñледующими " "типами G-кода: Marlin, RepRap/Sprinter, RepRapFirmware, Repetier." #: src/libslic3r/Print.cpp:492 ->>>>>>> master msgid "" -"The Wipe Tower is currently only supported with the relative extruder addressing " -"(use_relative_e_distances=1)." +"The Wipe Tower is currently only supported with the relative extruder " +"addressing (use_relative_e_distances=1)." msgstr "" -<<<<<<< HEAD -"Ð’ наÑтоÑщее Ð²Ñ€ÐµÐ¼Ñ Ð´Ð»Ñ Ñ€ÐµÐ¶Ð¸Ð¼Ð° черновой башни поддерживаетÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ отноÑÐ¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ " -"адреÑÐ°Ñ†Ð¸Ñ ÑкÑтрудера (use_relative_e_distances=1)." - -#: src/libslic3r/Print.cpp:1300 -msgid "Ooze prevention is currently not supported with the wipe tower enabled." -msgstr "" -"\"Предотвращение течи материала\" в наÑтоÑщее Ð²Ñ€ÐµÐ¼Ñ Ð½Ðµ поддерживаетÑÑ Ð¿Ñ€Ð¸ " -"включённой черновой башне." - -#: src/libslic3r/Print.cpp:1302 -msgid "The Wipe Tower currently does not support volumetric E (use_volumetric_e=0)." -======= "Ð’ наÑтоÑщее Ð²Ñ€ÐµÐ¼Ñ Ð´Ð»Ñ Ñ€ÐµÐ¶Ð¸Ð¼Ð° черновой башни поддерживаетÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ " "отноÑÐ¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð°Ð´Ñ€ÐµÑÐ°Ñ†Ð¸Ñ ÑкÑтрудера (use_relative_e_distances=1)." @@ -17044,20 +10594,10 @@ msgstr "" #: src/libslic3r/Print.cpp:496 msgid "" "The Wipe Tower currently does not support volumetric E (use_volumetric_e=0)." ->>>>>>> master msgstr "" "Ð§ÐµÑ€Ð½Ð¾Ð²Ð°Ñ Ð±Ð°ÑˆÐ½Ñ Ð² наÑтоÑщее Ð²Ñ€ÐµÐ¼Ñ Ð½Ðµ поддерживает объёмные Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ E " "(use_volumetric_e=0)." -<<<<<<< HEAD -#: src/libslic3r/Print.cpp:1304 -msgid "The Wipe Tower is currently not supported for multimaterial sequential prints." -msgstr "" -"Ð’ наÑтоÑщее Ð²Ñ€ÐµÐ¼Ñ Ñ€ÐµÐ¶Ð¸Ð¼ черновой башни не поддерживает поÑледовательную печать Ð´Ð»Ñ " -"мультиматериальных принтеров." - -#: src/libslic3r/Print.cpp:1325 -======= #: src/libslic3r/Print.cpp:498 msgid "" "The Wipe Tower is currently not supported for multimaterial sequential " @@ -17067,100 +10607,53 @@ msgstr "" "печать Ð´Ð»Ñ Ð¼ÑƒÐ»ÑŒÑ‚Ð¸Ð¼Ð°Ñ‚ÐµÑ€Ð¸Ð°Ð»ÑŒÐ½Ñ‹Ñ… принтеров." #: src/libslic3r/Print.cpp:519 ->>>>>>> master msgid "" -"The Wipe Tower is only supported for multiple objects if they have equal layer " -"heights" +"The Wipe Tower is only supported for multiple objects if they have equal " +"layer heights" msgstr "" -<<<<<<< HEAD -"Режим черновой башни применим Ð´Ð»Ñ Ð½ÐµÑкольких моделей только в том Ñлучае, еÑли они " -"имеют одинаковую выÑоту ÑлоÑ." - -#: src/libslic3r/Print.cpp:1327 -======= "Режим черновой башни применим Ð´Ð»Ñ Ð½ÐµÑкольких моделей только в том Ñлучае, " "еÑли они имеют одинаковую выÑоту ÑлоÑ." #: src/libslic3r/Print.cpp:521 ->>>>>>> master msgid "" -"The Wipe Tower is only supported for multiple objects if they are printed over an " -"equal number of raft layers" +"The Wipe Tower is only supported for multiple objects if they are printed " +"over an equal number of raft layers" msgstr "" -<<<<<<< HEAD -"Режим черновой башни применим Ð´Ð»Ñ Ð½ÐµÑкольких моделей только в том Ñлучае, еÑли они " -"имеют одинаковое чиÑло Ñлоёв подложки." - -#: src/libslic3r/Print.cpp:1329 -======= "Режим черновой башни применим Ð´Ð»Ñ Ð½ÐµÑкольких моделей только в том Ñлучае, " "еÑли они имеют одинаковое чиÑло Ñлоёв подложки." #: src/libslic3r/Print.cpp:524 ->>>>>>> master msgid "" -"The Wipe Tower is only supported for multiple objects if they are printed with the " -"same support_material_contact_distance" +"The Wipe Tower is only supported for multiple objects if they are printed " +"with the same support_material_contact_distance" msgstr "" -<<<<<<< HEAD -"Режим черновой башни применим Ð´Ð»Ñ Ð½ÐµÑкольких моделей только в том Ñлучае, еÑли они " -"печатаютÑÑ Ñ Ð¾Ð´Ð¸Ð½Ð°ÐºÐ¾Ð²Ñ‹Ð¼ support_material_contact_distance (раÑÑтоÑние от поддержки " -"до модели по вертикали)." - -#: src/libslic3r/Print.cpp:1331 -======= "Режим черновой башни применим Ð´Ð»Ñ Ð½ÐµÑкольких моделей только в том Ñлучае, " "еÑли они печатаютÑÑ Ñ Ð¾Ð´Ð¸Ð½Ð°ÐºÐ¾Ð²Ñ‹Ð¼ support_material_contact_distance " "(раÑÑтоÑние от поддержки до модели по вертикали)." #: src/libslic3r/Print.cpp:526 ->>>>>>> master msgid "" -"The Wipe Tower is only supported for multiple objects if they are sliced equally." +"The Wipe Tower is only supported for multiple objects if they are sliced " +"equally." msgstr "" -<<<<<<< HEAD -"Режим черновой башни применим Ð´Ð»Ñ Ð½ÐµÑкольких моделей только в том Ñлучае, еÑли они " -"нарезаны одинаково." - -#: src/libslic3r/Print.cpp:1373 -======= "Режим черновой башни применим Ð´Ð»Ñ Ð½ÐµÑкольких моделей только в том Ñлучае, " "еÑли они нарезаны одинаково." #: src/libslic3r/Print.cpp:539 ->>>>>>> master msgid "" -"The Wipe tower is only supported if all objects have the same variable layer height" +"The Wipe tower is only supported if all objects have the same variable layer " +"height" msgstr "" -<<<<<<< HEAD -"Режим черновой башни применим только в том Ñлучае, еÑли вÑе модели имеют одну и " -"туже переменную выÑоту ÑлоÑ." - -#: src/libslic3r/Print.cpp:1399 -msgid "One or more object were assigned an extruder that the printer does not have." -======= "Режим черновой башни применим только в том Ñлучае, еÑли вÑе модели имеют " "одну и туже переменную выÑоту ÑлоÑ." #: src/libslic3r/Print.cpp:561 msgid "" "One or more object were assigned an extruder that the printer does not have." ->>>>>>> master msgstr "" "Ð”Ð»Ñ Ð¾Ð´Ð½Ð¾Ð³Ð¾ или неÑкольких моделей был назначен ÑкÑтрудер, который у принтера " "отÑутÑтвует." -<<<<<<< HEAD -#: src/libslic3r/Print.cpp:1408 -msgid "%1%=%2% mm is too low to be printable at a layer height %3% mm" -msgstr "Значение параметра %1%=%2% мм Ñлишком мало Ð´Ð»Ñ Ð¿ÐµÑ‡Ð°Ñ‚Ð¸ при выÑоте ÑÐ»Ð¾Ñ %3% мм" - -#: src/libslic3r/Print.cpp:1411 -msgid "Excessive %1%=%2% mm to be printable with a nozzle diameter %3% mm" -msgstr "Чрезмерное значение параметра %1%=%2% мм Ð´Ð»Ñ Ð¿ÐµÑ‡Ð°Ñ‚Ð¸ при диаметре Ñопла %3% мм" - -#: src/libslic3r/Print.cpp:1422 -======= #: src/libslic3r/Print.cpp:574 #, boost-format msgid "%1%=%2% mm is too low to be printable at a layer height %3% mm" @@ -17174,74 +10667,32 @@ msgstr "" "Чрезмерное значение параметра %1%=%2% мм Ð´Ð»Ñ Ð¿ÐµÑ‡Ð°Ñ‚Ð¸ при диаметре Ñопла %3% мм" #: src/libslic3r/Print.cpp:588 ->>>>>>> master msgid "" -"Printing with multiple extruders of differing nozzle diameters. If support is to be " -"printed with the current extruder (support_material_extruder == 0 or " -"support_material_interface_extruder == 0), all nozzles have to be of the same " -"diameter." +"Printing with multiple extruders of differing nozzle diameters. If support " +"is to be printed with the current extruder (support_material_extruder == 0 " +"or support_material_interface_extruder == 0), all nozzles have to be of the " +"same diameter." msgstr "" -"Печать неÑколькими ÑкÑтрудерами Ñ Ñоплами различного диаметра. ЕÑли поддержка " -"должна быть напечатана текущим ÑкÑтрудером (support_material_extruder == 0 или " -"support_material_interface_extruder == 0), вÑе Ñопла должны иметь одинаковый " -"диаметр." +"Печать неÑколькими ÑкÑтрудерами Ñ Ñоплами различного диаметра. ЕÑли " +"поддержка должна быть напечатана текущим ÑкÑтрудером " +"(support_material_extruder == 0 или support_material_interface_extruder == " +"0), вÑе Ñопла должны иметь одинаковый диаметр." -<<<<<<< HEAD -#: src/libslic3r/Print.cpp:1430 -======= #: src/libslic3r/Print.cpp:596 ->>>>>>> master msgid "" -"For the Wipe Tower to work with the soluble supports, the support layers need to be " -"synchronized with the object layers." +"For the Wipe Tower to work with the soluble supports, the support layers " +"need to be synchronized with the object layers." msgstr "" "Ð”Ð»Ñ Ñ‚Ð¾Ð³Ð¾, чтобы режим черновой башни работал Ñ Ñ€Ð°Ñтворимой поддержкой, Ñлои " "поддержки должны быть Ñинхронизированы Ñо ÑлоÑми модели." -<<<<<<< HEAD -#: src/libslic3r/Print.cpp:1434 -======= #: src/libslic3r/Print.cpp:600 ->>>>>>> master msgid "" -"The Wipe Tower currently supports the non-soluble supports only if they are printed " -"with the current extruder without triggering a tool change. (both " -"support_material_extruder and support_material_interface_extruder need to be set to " -"0)." +"The Wipe Tower currently supports the non-soluble supports only if they are " +"printed with the current extruder without triggering a tool change. (both " +"support_material_extruder and support_material_interface_extruder need to be " +"set to 0)." msgstr "" -<<<<<<< HEAD -"Ð’ наÑтоÑщее Ð²Ñ€ÐµÐ¼Ñ Ñ€ÐµÐ¶Ð¸Ð¼ черновой башни поддерживает нераÑтворимую поддержку только " -"в том Ñлучае, еÑли они печатаютÑÑ Ñ‚ÐµÐºÑƒÑ‰Ð¸Ð¼ ÑкÑтрудером, без запуÑка Ñмены " -"инÑтрумента. (Ð—Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ \"ÐкÑтрудер, печатающий поддержки/подложки/юбки\" и " -"\"ÐкÑтрудер, печатающий ÑвÑзующий Ñлой поддержки/подложки\" должны быть уÑтановлены " -"в 0)." - -#: src/libslic3r/Print.cpp:1456 -msgid "First layer height can't be greater than nozzle diameter" -msgstr "Ð’Ñ‹Ñота первого ÑÐ»Ð¾Ñ Ð½Ðµ может быть больше диаметра Ñопла." - -#: src/libslic3r/Print.cpp:1461 -msgid "Layer height can't be greater than nozzle diameter" -msgstr "Ð’Ñ‹Ñота ÑÐ»Ð¾Ñ Ð½Ðµ может быть больше диаметра Ñопла" - -#: src/libslic3r/Print.cpp:1620 -msgid "Infilling layers" -msgstr "Заполнение Ñлоёв" - -#: src/libslic3r/Print.cpp:1646 -msgid "Generating skirt" -msgstr "Ð“ÐµÐ½ÐµÑ€Ð°Ñ†Ð¸Ñ ÑŽÐ±ÐºÐ¸" - -#: src/libslic3r/Print.cpp:1655 -msgid "Generating brim" -msgstr "Ð“ÐµÐ½ÐµÑ€Ð°Ñ†Ð¸Ñ ÐºÐ°Ð¹Ð¼Ñ‹" - -#: src/libslic3r/Print.cpp:1678 -msgid "Exporting G-code" -msgstr "ÐкÑпорт в G-код" - -#: src/libslic3r/Print.cpp:1682 -======= "Ð’ наÑтоÑщее Ð²Ñ€ÐµÐ¼Ñ Ñ€ÐµÐ¶Ð¸Ð¼ черновой башни поддерживает нераÑтворимую поддержку " "только в том Ñлучае, еÑли они печатаютÑÑ Ñ‚ÐµÐºÑƒÑ‰Ð¸Ð¼ ÑкÑтрудером, без запуÑка " "Ñмены инÑтрумента. (Ð—Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Â«ÐкÑтрудер, печатающий поддержки/подложки/юбки» " @@ -17269,7 +10720,6 @@ msgid "Exporting G-code" msgstr "ÐкÑпорт в G-код" #: src/libslic3r/Print.cpp:869 ->>>>>>> master msgid "Generating G-code" msgstr "Ð“ÐµÐ½ÐµÑ€Ð°Ñ†Ð¸Ñ G-кода" @@ -17277,57 +10727,41 @@ msgstr "Ð“ÐµÐ½ÐµÑ€Ð°Ñ†Ð¸Ñ G-кода" msgid "Pad brim size is too small for the current configuration." msgstr "Размер каймы подложки Ñлишком мал Ð´Ð»Ñ Ñ‚ÐµÐºÑƒÑ‰Ð¸Ñ… наÑтроек." -#: src/libslic3r/SLAPrint.cpp:630 +#: src/libslic3r/SLAPrint.cpp:628 msgid "" "Cannot proceed without support points! Add support points or disable support " "generation." msgstr "" -<<<<<<< HEAD -"Ðевозможно продолжить без точек поддержки! Добавьте точки поддержки или отключите " -"генерацию поддержки." -======= "Ðевозможно продолжить без точек поддержки! Добавьте точки поддержки или " "отключите генерацию поддержки." ->>>>>>> master -#: src/libslic3r/SLAPrint.cpp:642 +#: src/libslic3r/SLAPrint.cpp:640 msgid "" -"Elevation is too low for object. Use the \"Pad around object\" feature to print the " -"object without elevation." +"Elevation is too low for object. Use the \"Pad around object\" feature to " +"print the object without elevation." msgstr "" -<<<<<<< HEAD -"Ð’Ñ‹Ñота подъёма Ñлишком Ð½Ð¸Ð·ÐºÐ°Ñ Ð´Ð»Ñ Ð¼Ð¾Ð´ÐµÐ»Ð¸. ИÑпользуйте \"Подложка вокруг модели\", " -"чтобы напечатать модель без подъёма." -======= "Ð’Ñ‹Ñота подъёма Ñлишком Ð½Ð¸Ð·ÐºÐ°Ñ Ð´Ð»Ñ Ð¼Ð¾Ð´ÐµÐ»Ð¸. ИÑпользуйте «Подложка вокруг " "модели», чтобы напечатать модель без подъёма." ->>>>>>> master -#: src/libslic3r/SLAPrint.cpp:648 +#: src/libslic3r/SLAPrint.cpp:646 msgid "" -"The endings of the support pillars will be deployed on the gap between the object " -"and the pad. 'Support base safety distance' has to be greater than the 'Pad object " -"gap' parameter to avoid this." +"The endings of the support pillars will be deployed on the gap between the " +"object and the pad. 'Support base safety distance' has to be greater than " +"the 'Pad object gap' parameter to avoid this." msgstr "" -<<<<<<< HEAD -"Концы тела поддержки будут размещены в зазоре между моделью и подложкой. Чтобы " -"избежать Ñтого, \"БезопаÑное раÑÑтоÑние оÑÐ½Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ¸\" должно быть больше, " -"чем параметр \"Зазор между дном модели и подложкой\"." -======= "Концы тела поддержки будут размещены в зазоре между моделью и подложкой. " "Чтобы избежать Ñтого, «БезопаÑное раÑÑтоÑние оÑÐ½Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ¸Â» должно " "быть больше, чем параметр «Зазор между дном модели и подложкой»." ->>>>>>> master -#: src/libslic3r/SLAPrint.cpp:663 +#: src/libslic3r/SLAPrint.cpp:661 msgid "Exposition time is out of printer profile bounds." msgstr "Ð’Ñ€ÐµÐ¼Ñ Ð·Ð°Ñветки оÑновных Ñлоёв выходит за пределы Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ Ð¿Ñ€Ð¸Ð½Ñ‚ÐµÑ€Ð°." -#: src/libslic3r/SLAPrint.cpp:670 +#: src/libslic3r/SLAPrint.cpp:668 msgid "Initial exposition time is out of printer profile bounds." msgstr "Ð’Ñ€ÐµÐ¼Ñ Ð·Ð°Ñветки начальных Ñлоёв выходит за пределы Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ Ð¿Ñ€Ð¸Ð½Ñ‚ÐµÑ€Ð°." -#: src/libslic3r/SLAPrint.cpp:786 +#: src/libslic3r/SLAPrint.cpp:784 msgid "Slicing done" msgstr "Ðарезка завершена" @@ -17370,8 +10804,6 @@ msgstr "РаÑтрирование Ñлоёв" #: src/libslic3r/SLAPrintSteps.cpp:426 msgid "Too many overlapping holes." msgstr "Слишком много переÑекающихÑÑ Ð¾Ñ‚Ð²ÐµÑ€Ñтий." -<<<<<<< HEAD -======= #: src/libslic3r/SLAPrintSteps.cpp:433 msgid "" @@ -17379,7 +10811,6 @@ msgid "" msgstr "" "Сетка, Ð´Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¿Ð¾Ð»Ð¾Ñти, не подходит Ð´Ð»Ñ Ñтого (она не ограничивает " "объём)." ->>>>>>> master #: src/libslic3r/SLAPrintSteps.cpp:441 msgid "Unable to drill the current configuration of holes into the model." @@ -17387,18 +10818,9 @@ msgstr "Ðевозможно проÑверлить отверÑÑ‚Ð¸Ñ Ð² мод #: src/libslic3r/SLAPrintSteps.cpp:461 msgid "" -"Drilling holes into the mesh failed. This is usually caused by broken model. Try to " -"fix it first." +"Drilling holes into the mesh failed. This is usually caused by broken model. " +"Try to fix it first." msgstr "" -<<<<<<< HEAD -"Ðе удалоÑÑŒ проделать отверÑÑ‚Ð¸Ñ Ð² Ñетке модели. Обычно Ñто ÑвÑзано Ñ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ð¾Ð¹ в " -"Ñамой модели. Попробуйте Ñначала починить её." - -#: src/libslic3r/SLAPrintSteps.cpp:247 -msgid "Slicing had to be stopped due to an internal error: Inconsistent slice index." -msgstr "" -"Ðарезку пришлоÑÑŒ оÑтановить из-за внутренней ошибки: неÑоответÑтвие индекÑа Ñреза." -======= "Ðе удалоÑÑŒ проделать отверÑÑ‚Ð¸Ñ Ð² Ñетке модели. Обычно Ñто ÑвÑзано Ñ " "проблемой в Ñамой модели. Попробуйте Ñначала починить её." @@ -17412,7 +10834,6 @@ msgid "" msgstr "" "Ðарезку пришлоÑÑŒ оÑтановить из-за внутренней ошибки: неÑоответÑтвие индекÑа " "Ñреза." ->>>>>>> master #: src/libslic3r/SLAPrintSteps.cpp:682 src/libslic3r/SLAPrintSteps.cpp:691 #: src/libslic3r/SLAPrintSteps.cpp:729 @@ -17425,16 +10846,11 @@ msgstr "Ð”Ð»Ñ Ñтой модели Ñ Ñ‚ÐµÐºÑƒÑ‰Ð¸Ð¼Ð¸ наÑтройками #: src/libslic3r/SLAPrintSteps.cpp:845 msgid "" -"There are unprintable objects. Try to adjust support settings to make the objects " -"printable." +"There are unprintable objects. Try to adjust support settings to make the " +"objects printable." msgstr "" -<<<<<<< HEAD -"ИмеютÑÑ Ð½ÐµÐ¿ÐµÑ‡Ð°Ñ‚Ð°ÐµÐ¼Ñ‹Ðµ модели. Попробуйте наÑтроить параметры поддержки так, чтобы " -"Ñделать их доÑтупными Ð´Ð»Ñ Ð¿ÐµÑ‡Ð°Ñ‚Ð¸." -======= "ИмеютÑÑ Ð½ÐµÐ¿ÐµÑ‡Ð°Ñ‚Ð°ÐµÐ¼Ñ‹Ðµ модели. Попробуйте наÑтроить параметры поддержки так, " "чтобы Ñделать их доÑтупными Ð´Ð»Ñ Ð¿ÐµÑ‡Ð°Ñ‚Ð¸." ->>>>>>> master #: src/libslic3r/PrintBase.cpp:84 msgid "Failed processing of the output_filename_format template." @@ -17455,21 +10871,6 @@ msgstr "ПользовательÑÐºÐ°Ñ Ñ‚ÐµÐºÑтура Ñтола" #: src/libslic3r/PrintConfig.cpp:241 msgid "Bed custom model" msgstr "ПользовательÑÐºÐ°Ñ Ð¼Ð¾Ð´ÐµÐ»ÑŒ Ñтола" -<<<<<<< HEAD - -#: src/libslic3r/PrintConfig.cpp:66 -msgid "G-code thumbnails" -msgstr "ÐÑкизы G-код" - -#: src/libslic3r/PrintConfig.cpp:67 -msgid "" -"Picture sizes to be stored into a .gcode and .sl1 files, in the following format: " -"\"XxY, XxY, ...\"" -msgstr "" -"Размеры изображений, ÑохранÑемых в .gcode и .sl1 файлах (формат: \"XxY, XxY, ...\")" - -#: src/libslic3r/PrintConfig.cpp:75 -======= #: src/libslic3r/PrintConfig.cpp:246 msgid "Elephant foot compensation" @@ -17497,71 +10898,24 @@ msgstr "" "Ñледующем формате: \"XxY, XxY, ...\"" #: src/libslic3r/PrintConfig.cpp:265 ->>>>>>> master msgid "" -"This setting controls the height (and thus the total number) of the slices/layers. " -"Thinner layers give better accuracy but take more time to print." +"This setting controls the height (and thus the total number) of the slices/" +"layers. Thinner layers give better accuracy but take more time to print." msgstr "" -"Ðтот параметр определÑет выÑоту ÑлоÑ. Чем выше значение, тем быÑтрее печать, но " -"более низкое разрешение, и наоборот. Ðтот параметр не может превышать диаметр " -"иÑпользуемого Ñопла (желательно Ñтавить не больше ¾ от Ñтого диаметра)." +"Ðтот параметр определÑет выÑоту ÑлоÑ. Чем выше значение, тем быÑтрее печать, " +"но более низкое разрешение, и наоборот. Ðтот параметр не может превышать " +"диаметр иÑпользуемого Ñопла (желательно Ñтавить не больше ¾ от Ñтого " +"диаметра)." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:82 -msgid "Max print height" -msgstr "МакÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ Ð²Ñ‹Ñота печати" - -#: src/libslic3r/PrintConfig.cpp:83 -======= #: src/libslic3r/PrintConfig.cpp:272 msgid "Max print height" msgstr "МакÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ Ð²Ñ‹Ñота печати" #: src/libslic3r/PrintConfig.cpp:273 ->>>>>>> master -msgid "" -"Set this to the maximum height that can be reached by your extruder while printing." -msgstr "" -<<<<<<< HEAD -"ЗадаётÑÑ Ð¼Ð°ÐºÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ Ð²Ñ‹Ñота, которую может доÑтичь ваш ÑкÑтрудер во Ð²Ñ€ÐµÐ¼Ñ Ð¿ÐµÑ‡Ð°Ñ‚Ð¸." - -#: src/libslic3r/PrintConfig.cpp:91 -msgid "Slice gap closing radius" -msgstr "Ð Ð°Ð´Ð¸ÑƒÑ Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ð¸Ñ Ð¿Ñ€Ð¾Ð±ÐµÐ»Ð¾Ð² при нарезке" - -#: src/libslic3r/PrintConfig.cpp:93 msgid "" -"Cracks smaller than 2x gap closing radius are being filled during the triangle mesh " -"slicing. The gap closing operation may reduce the final print resolution, therefore " -"it is advisable to keep the value reasonably low." +"Set this to the maximum height that can be reached by your extruder while " +"printing." msgstr "" -"Трещины, меньше чем 2-кратный Ñ€Ð°Ð´Ð¸ÑƒÑ Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ð¸Ñ Ð¿Ñ€Ð¾Ð±ÐµÐ»Ð¾Ð², будут заполнÑÑ‚ÑŒÑÑ Ð²Ð¾ Ð²Ñ€ÐµÐ¼Ñ " -"нарезки треугольной Ñетки. ÐžÐ¿ÐµÑ€Ð°Ñ†Ð¸Ñ Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ð¸Ñ Ð¿Ñ€Ð¾Ð±ÐµÐ»Ð¾Ð² может уменьшить окончательное " -"разрешение печати, поÑтому рекомендуетÑÑ Ð²Ñ‹ÑтавлÑÑ‚ÑŒ Ñто значение доÑтаточно низким." - -#: src/libslic3r/PrintConfig.cpp:101 -msgid "Hostname, IP or URL" -msgstr "Ð˜Ð¼Ñ Ñ…Ð¾Ñта, IP или URL" - -#: src/libslic3r/PrintConfig.cpp:102 -msgid "" -"Slic3r can upload G-code files to a printer host. This field should contain the " -"hostname, IP address or URL of the printer host instance. Print host behind HAProxy " -"with basic auth enabled can be accessed by putting the user name and password into " -"the URL in the following format: https://username:password@your-octopi-address/" -msgstr "" -"PrusaSlicer может загружать G-код файлы на хоÑÑ‚ принтера. Ð’ Ñтом поле нужно указать " -"Ð¸Ð¼Ñ Ñ…Ð¾Ñта, IP-Ð°Ð´Ñ€ÐµÑ Ð¸Ð»Ð¸ URL-Ð°Ð´Ñ€ÐµÑ Ñ…Ð¾ÑÑ‚-ÑкземплÑра печати. ДоÑтуп к узлу печати на " -"оÑнове HAProxy Ñ Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ð¾Ð¹ базовой аутентификацией можно получить, указав Ð¸Ð¼Ñ " -"Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸ пароль в поле URL-Ð°Ð´Ñ€ÐµÑ Ð² Ñледующем формате: https://username:" -"password@your-octopi-address" - -#: src/libslic3r/PrintConfig.cpp:110 -msgid "API Key / Password" -msgstr "API-ключ / Пароль" - -#: src/libslic3r/PrintConfig.cpp:111 -======= "ЗадаётÑÑ Ð¼Ð°ÐºÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ Ð²Ñ‹Ñота, которую может доÑтичь ваш ÑкÑтрудер во Ð²Ñ€ÐµÐ¼Ñ " "печати." @@ -17588,21 +10942,10 @@ msgid "API Key / Password" msgstr "API-ключ / Пароль" #: src/libslic3r/PrintConfig.cpp:292 ->>>>>>> master msgid "" -"Slic3r can upload G-code files to a printer host. This field should contain the API " -"Key or the password required for authentication." +"Slic3r can upload G-code files to a printer host. This field should contain " +"the API Key or the password required for authentication." msgstr "" -<<<<<<< HEAD -"PrusaSlicer может загружать G-код файлы на хоÑÑ‚ принтера. Ðто поле должно Ñодержать " -"API ключ или пароль, необходимые Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐºÐ¸ подлинноÑти." - -#: src/libslic3r/PrintConfig.cpp:118 -msgid "Name of the printer" -msgstr "Ðазвание принтера" - -#: src/libslic3r/PrintConfig.cpp:125 -======= "PrusaSlicer может загружать G-код файлы на хоÑÑ‚ принтера. Ðто поле должно " "Ñодержать API ключ или пароль, необходимые Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐºÐ¸ подлинноÑти." @@ -17611,58 +10954,11 @@ msgid "Name of the printer" msgstr "Ðазвание принтера" #: src/libslic3r/PrintConfig.cpp:308 ->>>>>>> master -msgid "" -"Custom CA certificate file can be specified for HTTPS OctoPrint connections, in crt/" -"pem format. If left blank, the default OS CA certificate repository is used." -msgstr "" -<<<<<<< HEAD -"ПользовательÑкий файл Ñертификата CA может быть указан Ð´Ð»Ñ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð¿Ð¾ HTTPS к " -"OctoPrint в формате crt/pem. ЕÑли оÑтавить поле пуÑтым, будет иÑпользоватьÑÑ " -"хранилище Ñертификатов ОС по умолчанию." - -#: src/libslic3r/PrintConfig.cpp:131 -msgid "Elephant foot compensation" -msgstr "КомпенÑÐ°Ñ†Ð¸Ñ Ñ€Ð°ÑÑˆÐ¸Ñ€ÐµÐ½Ð¸Ñ Ð¿ÐµÑ€Ð²Ð¾Ð³Ð¾ ÑлоÑ" - -#: src/libslic3r/PrintConfig.cpp:133 msgid "" -"The first layer will be shrunk in the XY plane by the configured value to " -"compensate for the 1st layer squish aka an Elephant Foot effect." +"Custom CA certificate file can be specified for HTTPS OctoPrint connections, " +"in crt/pem format. If left blank, the default OS CA certificate repository " +"is used." msgstr "" -"Первый Ñлой будет уменьшен в плоÑкоÑти XY на заданное значение, чтобы " -"компенÑировать Ñффект \"хлюпанье\" первого ÑлоÑ, извеÑтное как \"ÑÐ»Ð¾Ð½Ð¾Ð²ÑŒÑ Ð½Ð¾Ð³Ð°\"." - -#: src/libslic3r/PrintConfig.cpp:149 -msgid "Password" -msgstr "Пароль" - -#: src/libslic3r/PrintConfig.cpp:155 -msgid "Printer preset name" -msgstr "Ð˜Ð¼Ñ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ Ð¿Ñ€Ð¸Ð½Ñ‚ÐµÑ€Ð°" - -#: src/libslic3r/PrintConfig.cpp:156 -msgid "Related printer preset name" -msgstr "Ð˜Ð¼Ñ ÑвÑзанного Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ Ð¿Ñ€Ð¸Ð½Ñ‚ÐµÑ€Ð°" - -#: src/libslic3r/PrintConfig.cpp:161 -msgid "Authorization Type" -msgstr "Тип авторизации" - -#: src/libslic3r/PrintConfig.cpp:166 -msgid "API key" -msgstr "API-ключ" - -#: src/libslic3r/PrintConfig.cpp:167 -msgid "HTTP digest" -msgstr "HTTP digest-авторизациÑ" - -#: src/libslic3r/PrintConfig.cpp:180 -msgid "Avoid crossing perimeters" -msgstr "Избегать переÑÐµÑ‡ÐµÐ½Ð¸Ñ Ð¿ÐµÑ€Ð¸Ð¼ÐµÑ‚Ñ€Ð¾Ð²" - -#: src/libslic3r/PrintConfig.cpp:181 -======= "ПользовательÑкий файл Ñертификата CA может быть указан Ð´Ð»Ñ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð¿Ð¾ " "HTTPS к OctoPrint в формате crt/pem. ЕÑли оÑтавить поле пуÑтым, будет " "иÑпользоватьÑÑ Ñ…Ñ€Ð°Ð½Ð¸Ð»Ð¸Ñ‰Ðµ Ñертификатов ОС по умолчанию." @@ -17710,24 +11006,17 @@ msgid "Avoid crossing perimeters" msgstr "Избегать переÑÐµÑ‡ÐµÐ½Ð¸Ñ Ð¿ÐµÑ€Ð¸Ð¼ÐµÑ‚Ñ€Ð¾Ð²" #: src/libslic3r/PrintConfig.cpp:373 ->>>>>>> master msgid "" -"Optimize travel moves in order to minimize the crossing of perimeters. This is " -"mostly useful with Bowden extruders which suffer from oozing. This feature slows " -"down both the print and the G-code generation." +"Optimize travel moves in order to minimize the crossing of perimeters. This " +"is mostly useful with Bowden extruders which suffer from oozing. This " +"feature slows down both the print and the G-code generation." msgstr "" -"Ðтот параметр призван оптимизировать маршрут Ð´Ð²Ð¸Ð¶ÐµÐ½Ð¸Ñ Ð¿ÐµÑ‡Ð°Ñ‚Ð°ÑŽÑ‰ÐµÐ¹ головки, чтобы " -"ÑвеÑти к минимуму переÑечение Ñтенок при движении. Полезно иÑпользовать Ñ " -"ÑкÑтрудерами Боудена, которые Ñтрадают от проÑачивание раÑплавленного материала. " -"Ðта Ñ„ÑƒÐ½ÐºÑ†Ð¸Ñ Ð·Ð°Ð¼ÐµÐ´Ð»Ñет как печать, так и генерацию G-кода." +"Ðтот параметр призван оптимизировать маршрут Ð´Ð²Ð¸Ð¶ÐµÐ½Ð¸Ñ Ð¿ÐµÑ‡Ð°Ñ‚Ð°ÑŽÑ‰ÐµÐ¹ головки, " +"чтобы ÑвеÑти к минимуму переÑечение Ñтенок при движении. Полезно " +"иÑпользовать Ñ ÑкÑтрудерами Боудена, которые Ñтрадают от проÑачивание " +"раÑплавленного материала. Ðта Ñ„ÑƒÐ½ÐºÑ†Ð¸Ñ Ð·Ð°Ð¼ÐµÐ´Ð»Ñет как печать, так и генерацию " +"G-кода." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:188 -msgid "Avoid crossing perimeters - Max detour length" -msgstr "Избегать переÑÐµÑ‡ÐµÐ½Ð¸Ñ Ð¿ÐµÑ€Ð¸Ð¼ÐµÑ‚Ñ€Ð¾Ð² - МакÑ. длина обхода" - -#: src/libslic3r/PrintConfig.cpp:190 -======= #: src/libslic3r/PrintConfig.cpp:380 msgid "Avoid crossing perimeters - Max detour length" msgstr "Избегать переÑÐµÑ‡ÐµÐ½Ð¸Ñ Ð¿ÐµÑ€Ð¸Ð¼ÐµÑ‚Ñ€Ð¾Ð² - МакÑ. длина обхода" @@ -17754,29 +11043,10 @@ msgid "Other layers" msgstr "ПоÑледующие Ñлои" #: src/libslic3r/PrintConfig.cpp:393 ->>>>>>> master msgid "" -"The maximum detour length for avoid crossing perimeters. If the detour is longer " -"than this value, avoid crossing perimeters is not applied for this travel path. " -"Detour length could be specified either as an absolute value or as percentage (for " -"example 50%) of a direct travel path." +"Bed temperature for layers after the first one. Set this to zero to disable " +"bed temperature control commands in the output." msgstr "" -<<<<<<< HEAD -"МакÑимальное раÑÑтоÑние обхода Ñопла от модели во избежание переÑÐµÑ‡ÐµÐ½Ð¸Ñ Ð¿ÐµÑ€Ð¸Ð¼ÐµÑ‚Ñ€Ð¾Ð² " -"при движении. ЕÑли раÑÑтоÑние обхода превышает Ñто значение, то Ð´Ð»Ñ Ð´Ð°Ð½Ð½Ð¾Ð³Ð¾ " -"маршрута Ñта Ð¾Ð¿Ñ†Ð¸Ñ Ð½Ðµ применÑетÑÑ. Длина обхода может быть указана как абÑолютном " -"значении, так и в процентах (например, 50%) от траектории перемещениÑ. ???" - -#: src/libslic3r/PrintConfig.cpp:193 -msgid "mm or % (zero to disable)" -msgstr "мм или % (0 - отключено)" - -#: src/libslic3r/PrintConfig.cpp:199 src/libslic3r/PrintConfig.cpp:2291 -msgid "Other layers" -msgstr "ПоÑледующие Ñлои" - -#: src/libslic3r/PrintConfig.cpp:200 -======= "Температура подогреваемого Ñтола Ð´Ð»Ñ Ñлоёв поÑле первого. УÑтановите 0, " "чтобы отключить команды ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ñ‚ÐµÐ¼Ð¿ÐµÑ€Ð°Ñ‚ÑƒÑ€Ð¾Ð¹ Ñтола на выходе." @@ -17785,21 +11055,11 @@ msgid "Bed temperature" msgstr "Температура Ñтола" #: src/libslic3r/PrintConfig.cpp:403 ->>>>>>> master msgid "" -"Bed temperature for layers after the first one. Set this to zero to disable bed " -"temperature control commands in the output." +"This custom code is inserted at every layer change, right before the Z move. " +"Note that you can use placeholder variables for all Slic3r settings as well " +"as [layer_num] and [layer_z]." msgstr "" -<<<<<<< HEAD -"Температура подогреваемого Ñтола Ð´Ð»Ñ Ñлоёв поÑле первого. УÑтановите 0, чтобы " -"отключить команды ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ñ‚ÐµÐ¼Ð¿ÐµÑ€Ð°Ñ‚ÑƒÑ€Ð¾Ð¹ Ñтола на выходе." - -#: src/libslic3r/PrintConfig.cpp:203 -msgid "Bed temperature" -msgstr "Температура Ñтола" - -#: src/libslic3r/PrintConfig.cpp:210 -======= "Ðтот пользовательÑкий код вÑтавлÑетÑÑ Ð¿Ñ€Ð¸ каждой Ñмене ÑлоÑ, непоÑредÑтвенно " "перед Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰ÐµÐ½Ð¸Ñ Ð¾Ñи Z. Обратите внимание, что вы можете иÑпользовать " "шаблонные переменные Ð´Ð»Ñ Ð²Ñех параметров PrusaSlicer, в том чиÑле " @@ -17810,48 +11070,14 @@ msgid "Between objects G-code" msgstr "G-код между моделÑми" #: src/libslic3r/PrintConfig.cpp:414 ->>>>>>> master msgid "" -"This custom code is inserted at every layer change, right before the Z move. Note " -"that you can use placeholder variables for all Slic3r settings as well as " -"[layer_num] and [layer_z]." -msgstr "" -<<<<<<< HEAD -"Ðтот пользовательÑкий код вÑтавлÑетÑÑ Ð¿Ñ€Ð¸ каждой Ñмене ÑлоÑ, непоÑредÑтвенно перед " -"Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰ÐµÐ½Ð¸Ñ Ð¾Ñи Z. Обратите внимание, что вы можете иÑпользовать шаблонные " -"переменные Ð´Ð»Ñ Ð²Ñех параметров PrusaSlicer, в том чиÑле [layer_num] и [layer_z]." - -#: src/libslic3r/PrintConfig.cpp:220 -msgid "Between objects G-code" -msgstr "G-код между моделÑми" - -#: src/libslic3r/PrintConfig.cpp:221 -msgid "" -"This code is inserted between objects when using sequential printing. By default " -"extruder and bed temperature are reset using non-wait command; however if M104, " -"M109, M140 or M190 are detected in this custom code, Slic3r will not add " -"temperature commands. Note that you can use placeholder variables for all Slic3r " -"settings, so you can put a \"M109 S[first_layer_temperature]\" command wherever you " -"want." +"This code is inserted between objects when using sequential printing. By " +"default extruder and bed temperature are reset using non-wait command; " +"however if M104, M109, M140 or M190 are detected in this custom code, Slic3r " +"will not add temperature commands. Note that you can use placeholder " +"variables for all Slic3r settings, so you can put a \"M109 " +"S[first_layer_temperature]\" command wherever you want." msgstr "" -"Ðтот код вÑтавлÑетÑÑ Ð¼ÐµÐ¶Ð´Ñƒ моделÑми при включении поÑледовательной печати. По " -"умолчанию ÑкÑтрудер и температура Ñтола ÑбраÑываютÑÑ Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ команды без " -"ожиданиÑ; однако, еÑли в Ñтом пользовательÑком коде обнаруживаютÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ‹ M104, " -"M109, M140 или M190, то PrusaSlicer не добавит команды температуры. Обратите " -"внимание, что вы можете иÑпользовать шаблонные переменные Ð´Ð»Ñ Ð²Ñех параметров " -"PrusaSlicer, поÑтому вы можете вÑтавить команду \"M109 S[first_layer_temperature]\" " -"где угодно." - -#: src/libslic3r/PrintConfig.cpp:232 -msgid "Number of solid layers to generate on bottom surfaces." -msgstr "КоличеÑтво Ñплошных Ñлоёв при печати нижней поверхноÑти модели." - -#: src/libslic3r/PrintConfig.cpp:233 -msgid "Bottom solid layers" -msgstr "Ðижних Ñплошных Ñлоёв" - -#: src/libslic3r/PrintConfig.cpp:241 -======= "Ðтот код вÑтавлÑетÑÑ Ð¼ÐµÐ¶Ð´Ñƒ моделÑми при включении поÑледовательной печати. " "По умолчанию ÑкÑтрудер и температура Ñтола ÑбраÑываютÑÑ Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ команды " "без ожиданиÑ; однако, еÑли в Ñтом пользовательÑком коде обнаруживаютÑÑ " @@ -17869,26 +11095,10 @@ msgid "Bottom solid layers" msgstr "Ðижних Ñплошных Ñлоёв" #: src/libslic3r/PrintConfig.cpp:434 ->>>>>>> master msgid "" "The number of bottom solid layers is increased above bottom_solid_layers if " "necessary to satisfy minimum thickness of bottom shell." msgstr "" -<<<<<<< HEAD -"При необходимоÑти количеÑтво нижних Ñплошных Ñлоёв увеличиваетÑÑ Ð²Ñ‹ÑˆÐµ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ " -"bottom_solid_layers (\"Сплошных Ñлоёв Ñнизу\") Ð´Ð»Ñ ÑƒÐ´Ð¾Ð²Ð»ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð¸Ñ Ð¼Ð¸Ð½Ð¸Ð¼Ð°Ð»ÑŒÐ½Ð¾Ð¹ " -"толщины оболочки Ñнизу." - -#: src/libslic3r/PrintConfig.cpp:243 -msgid "Minimum bottom shell thickness" -msgstr "ÐœÐ¸Ð½Ð¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ Ñ‚Ð¾Ð»Ñ‰Ð¸Ð½Ð° оболочки Ñнизу" - -#: src/libslic3r/PrintConfig.cpp:249 -msgid "Bridge" -msgstr "МоÑÑ‚Ñ‹" - -#: src/libslic3r/PrintConfig.cpp:250 -======= "При необходимоÑти количеÑтво нижних Ñплошных Ñлоёв увеличиваетÑÑ Ð²Ñ‹ÑˆÐµ " "Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ bottom_solid_layers («Сплошных Ñлоёв Ñнизу») Ð´Ð»Ñ ÑƒÐ´Ð¾Ð²Ð»ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð¸Ñ " "минимальной толщины оболочки Ñнизу." @@ -17902,28 +11112,13 @@ msgid "Bridge" msgstr "МоÑÑ‚Ñ‹" #: src/libslic3r/PrintConfig.cpp:443 ->>>>>>> master msgid "" -"This is the acceleration your printer will use for bridges. Set zero to disable " -"acceleration control for bridges." +"This is the acceleration your printer will use for bridges. Set zero to " +"disable acceleration control for bridges." msgstr "" -"УÑкорение, которое принтер будет иÑпользовать Ð´Ð»Ñ Ð¿ÐµÑ‡Ð°Ñ‚Ð¸ моÑтов. УÑтановить 0, " -"чтобы отключить управление уÑкорением Ð´Ð»Ñ Ð¼Ð¾Ñтов." - -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:252 src/libslic3r/PrintConfig.cpp:395 -#: src/libslic3r/PrintConfig.cpp:940 src/libslic3r/PrintConfig.cpp:1079 -#: src/libslic3r/PrintConfig.cpp:1360 src/libslic3r/PrintConfig.cpp:1409 -#: src/libslic3r/PrintConfig.cpp:1419 src/libslic3r/PrintConfig.cpp:1612 -msgid "mm/s²" -msgstr "мм/Ѳ" - -#: src/libslic3r/PrintConfig.cpp:258 -msgid "Bridging angle" -msgstr "Угол (направление) печати моÑтов" +"УÑкорение, которое принтер будет иÑпользовать Ð´Ð»Ñ Ð¿ÐµÑ‡Ð°Ñ‚Ð¸ моÑтов. УÑтановить " +"0, чтобы отключить управление уÑкорением Ð´Ð»Ñ Ð¼Ð¾Ñтов." -#: src/libslic3r/PrintConfig.cpp:260 -======= #: src/libslic3r/PrintConfig.cpp:445 src/libslic3r/PrintConfig.cpp:616 #: src/libslic3r/PrintConfig.cpp:1169 src/libslic3r/PrintConfig.cpp:1178 #: src/libslic3r/PrintConfig.cpp:1378 src/libslic3r/PrintConfig.cpp:1671 @@ -17937,31 +11132,15 @@ msgid "Bridging angle" msgstr "Угол (направление) печати моÑтов" #: src/libslic3r/PrintConfig.cpp:453 ->>>>>>> master -msgid "" -"Bridging angle override. If left to zero, the bridging angle will be calculated " -"automatically. Otherwise the provided angle will be used for all bridges. Use 180° " -"for zero angle." -msgstr "" -"ÐŸÑ€Ð¸Ð½ÑƒÐ´Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð¿ÐµÑ‡Ð°Ñ‚ÑŒ моÑтов в одном, заданном направлении. ЕÑли задано 0, угол " -"печати моÑтов раÑÑчитываетÑÑ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑки. Ð’ противном Ñлучае заданный угол будет " -"иÑпользоватьÑÑ Ð´Ð»Ñ Ð²Ñех моÑтов. Ð”Ð»Ñ Ð½ÑƒÐ»ÐµÐ²Ð¾Ð³Ð¾ угла уÑтановите 180°." - -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:263 src/libslic3r/PrintConfig.cpp:852 -#: src/libslic3r/PrintConfig.cpp:1853 src/libslic3r/PrintConfig.cpp:1863 -#: src/libslic3r/PrintConfig.cpp:2121 src/libslic3r/PrintConfig.cpp:2276 -#: src/libslic3r/PrintConfig.cpp:2475 src/libslic3r/PrintConfig.cpp:2976 -#: src/libslic3r/PrintConfig.cpp:3097 -msgid "°" -msgstr "°" - -#: src/libslic3r/PrintConfig.cpp:269 -msgid "Bridges fan speed" -msgstr "СкороÑÑ‚ÑŒ вентилÑтора при печати моÑтов" +msgid "" +"Bridging angle override. If left to zero, the bridging angle will be " +"calculated automatically. Otherwise the provided angle will be used for all " +"bridges. Use 180° for zero angle." +msgstr "" +"ÐŸÑ€Ð¸Ð½ÑƒÐ´Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð¿ÐµÑ‡Ð°Ñ‚ÑŒ моÑтов в одном, заданном направлении. ЕÑли задано 0, " +"угол печати моÑтов раÑÑчитываетÑÑ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑки. Ð’ противном Ñлучае заданный " +"угол будет иÑпользоватьÑÑ Ð´Ð»Ñ Ð²Ñех моÑтов. Ð”Ð»Ñ Ð½ÑƒÐ»ÐµÐ²Ð¾Ð³Ð¾ угла уÑтановите 180°." -#: src/libslic3r/PrintConfig.cpp:270 -======= #: src/libslic3r/PrintConfig.cpp:456 src/libslic3r/PrintConfig.cpp:1075 #: src/libslic3r/PrintConfig.cpp:2232 src/libslic3r/PrintConfig.cpp:2242 #: src/libslic3r/PrintConfig.cpp:2533 src/libslic3r/PrintConfig.cpp:2774 @@ -17975,79 +11154,10 @@ msgid "Bridges fan speed" msgstr "СкороÑÑ‚ÑŒ вентилÑтора при печати моÑтов" #: src/libslic3r/PrintConfig.cpp:463 ->>>>>>> master msgid "This fan speed is enforced during all bridges and overhangs." -msgstr "СкороÑÑ‚ÑŒ Ð²Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ð²ÐµÐ½Ñ‚Ð¸Ð»Ñтора при печати моÑтов и навиÑающих чаÑтей модели." - -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:271 src/libslic3r/PrintConfig.cpp:864 -#: src/libslic3r/PrintConfig.cpp:1248 src/libslic3r/PrintConfig.cpp:1427 -#: src/libslic3r/PrintConfig.cpp:1490 src/libslic3r/PrintConfig.cpp:1745 -#: src/libslic3r/PrintConfig.cpp:2653 src/libslic3r/PrintConfig.cpp:2890 -#: src/libslic3r/PrintConfig.cpp:3016 -msgid "%" -msgstr "%" - -#: src/libslic3r/PrintConfig.cpp:278 -msgid "Bridge flow ratio" -msgstr "КоÑффициент подачи плаÑтика при печати моÑтов" - -#: src/libslic3r/PrintConfig.cpp:280 -msgid "" -"This factor affects the amount of plastic for bridging. You can decrease it " -"slightly to pull the extrudates and prevent sagging, although default settings are " -"usually good and you should experiment with cooling (use a fan) before tweaking " -"this." -msgstr "" -"Ðтот параметр задаёт количеÑтво плаÑтика, затрачивающегоÑÑ Ð½Ð° поÑтроение моÑтов. Ð’ " -"большинÑтве Ñлучаев наÑтроек по умолчанию (1) доÑтаточно, тем не менее, при печати " -"некоторых моделей уменьшение параметра может Ñократить провиÑание плаÑтика при " -"печати моÑтов. ЕÑли при печати моÑтов протÑгиваемый пруток рвётÑÑ, параметр нужно " -"увеличить (например, до 1.1). Перед редактированием Ñтого параметра не забывайте, " -"что регулировать качеÑтво натÑжки моÑтов можно и при помощи обдува модели." - -#: src/libslic3r/PrintConfig.cpp:290 -msgid "Bridges" -msgstr "МоÑÑ‚Ñ‹" - -#: src/libslic3r/PrintConfig.cpp:292 -msgid "Speed for printing bridges." -msgstr "СкороÑÑ‚ÑŒ печати моÑтов." - -#: src/libslic3r/PrintConfig.cpp:293 src/libslic3r/PrintConfig.cpp:671 -#: src/libslic3r/PrintConfig.cpp:679 src/libslic3r/PrintConfig.cpp:688 -#: src/libslic3r/PrintConfig.cpp:696 src/libslic3r/PrintConfig.cpp:723 -#: src/libslic3r/PrintConfig.cpp:742 src/libslic3r/PrintConfig.cpp:1015 -#: src/libslic3r/PrintConfig.cpp:1194 src/libslic3r/PrintConfig.cpp:1267 -#: src/libslic3r/PrintConfig.cpp:1343 src/libslic3r/PrintConfig.cpp:1377 -#: src/libslic3r/PrintConfig.cpp:1389 src/libslic3r/PrintConfig.cpp:1399 -#: src/libslic3r/PrintConfig.cpp:1449 src/libslic3r/PrintConfig.cpp:1508 -#: src/libslic3r/PrintConfig.cpp:1642 src/libslic3r/PrintConfig.cpp:1820 -#: src/libslic3r/PrintConfig.cpp:1829 src/libslic3r/PrintConfig.cpp:2255 -#: src/libslic3r/PrintConfig.cpp:2382 -msgid "mm/s" -msgstr "мм/Ñ" - -#: src/libslic3r/PrintConfig.cpp:300 -msgid "Brim width" -msgstr "Ширина каймы" - -#: src/libslic3r/PrintConfig.cpp:301 -msgid "" -"Horizontal width of the brim that will be printed around each object on the first " -"layer." msgstr "" -"РаÑÑтоÑние от модели до Ñамой дальней линии каймы. Ð¨Ð¸Ñ€Ð¾ÐºÐ°Ñ ÐºÐ°Ð¹Ð¼Ð° повышает адгезию к " -"Ñтолу, но уменьшает полезную площадь печати. Увеличение Ñтого параметра очень важно " -"Ð´Ð»Ñ Ð¼Ð¾Ð´ÐµÐ»ÐµÐ¹ Ñ Ð¼Ð°Ð»ÐµÐ½ÑŒÐºÐ¾Ð¹ площадью контакта Ñо Ñтолом и оÑобенно важно при печати ABS " -"плаÑтиком." +"СкороÑÑ‚ÑŒ Ð²Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ð²ÐµÐ½Ñ‚Ð¸Ð»Ñтора при печати моÑтов и навиÑающих чаÑтей модели." -#: src/libslic3r/PrintConfig.cpp:308 -msgid "Clip multi-part objects" -msgstr "Обрезать ÑоÑтавные модели (ÑоÑтоÑщие из неÑкольких чаÑтей)" - -#: src/libslic3r/PrintConfig.cpp:309 -======= #: src/libslic3r/PrintConfig.cpp:464 src/libslic3r/PrintConfig.cpp:1087 #: src/libslic3r/PrintConfig.cpp:1559 src/libslic3r/PrintConfig.cpp:1751 #: src/libslic3r/PrintConfig.cpp:1814 src/libslic3r/PrintConfig.cpp:2065 @@ -18154,31 +11264,11 @@ msgid "Clip multi-part objects" msgstr "Обрезать ÑоÑтавные модели (ÑоÑтоÑщие из неÑкольких чаÑтей)" #: src/libslic3r/PrintConfig.cpp:530 ->>>>>>> master msgid "" -"When printing multi-material objects, this settings will make Slic3r to clip the " -"overlapping object parts one by the other (2nd part will be clipped by the 1st, 3rd " -"part will be clipped by the 1st and 2nd etc)." +"When printing multi-material objects, this settings will make Slic3r to clip " +"the overlapping object parts one by the other (2nd part will be clipped by " +"the 1st, 3rd part will be clipped by the 1st and 2nd etc)." msgstr "" -<<<<<<< HEAD -"При печати моделей неÑколькими материалами Ñта наÑтройка заÑтавлÑет PrusaSlicer " -"обрезать чаÑти, которые перекрываютÑÑ Ð´Ñ€ÑƒÐ³ другом (Ð²Ñ‚Ð¾Ñ€Ð°Ñ Ñ‡Ð°ÑÑ‚ÑŒ будет обрезана " -"первой, Ñ‚Ñ€ÐµÑ‚ÑŒÑ - первой и второй и Ñ‚.д.)." - -#: src/libslic3r/PrintConfig.cpp:316 -msgid "Colorprint height" -msgstr "Ð’Ñ‹Ñота Ñмены цвета" - -#: src/libslic3r/PrintConfig.cpp:317 -msgid "Heights at which a filament change is to occur." -msgstr "Ð’Ñ‹Ñота, на которой должна проиÑходить Ñмена прутка." - -#: src/libslic3r/PrintConfig.cpp:327 -msgid "Compatible printers condition" -msgstr "УÑÐ»Ð¾Ð²Ð¸Ñ ÑовмеÑтимоÑти Ñ Ð¿Ñ€Ð¸Ð½Ñ‚ÐµÑ€Ð¾Ð¼" - -#: src/libslic3r/PrintConfig.cpp:328 -======= "При печати моделей неÑколькими материалами Ñта наÑтройка заÑтавлÑет " "PrusaSlicer обрезать чаÑти, которые перекрываютÑÑ Ð´Ñ€ÑƒÐ³ другом (Ð²Ñ‚Ð¾Ñ€Ð°Ñ Ñ‡Ð°ÑÑ‚ÑŒ " "будет обрезана первой, Ñ‚Ñ€ÐµÑ‚ÑŒÑ - первой и второй и Ñ‚.д.)." @@ -18196,45 +11286,25 @@ msgid "Compatible printers condition" msgstr "УÑÐ»Ð¾Ð²Ð¸Ñ ÑовмеÑтимоÑти Ñ Ð¿Ñ€Ð¸Ð½Ñ‚ÐµÑ€Ð¾Ð¼" #: src/libslic3r/PrintConfig.cpp:549 ->>>>>>> master msgid "" -"A boolean expression using the configuration values of an active printer profile. " -"If this expression evaluates to true, this profile is considered compatible with " -"the active printer profile." +"A boolean expression using the configuration values of an active printer " +"profile. If this expression evaluates to true, this profile is considered " +"compatible with the active printer profile." msgstr "" "ЛогичеÑкое выражение, иÑпользующее Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¸ активного Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ " "принтера. ЕÑли Ñто выражение имеет значение true, Ñтот профиль ÑчитаетÑÑ " "ÑовмеÑтимым Ñ Ð°ÐºÑ‚Ð¸Ð²Ð½Ñ‹Ð¼ профилем принтера." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:342 -msgid "Compatible print profiles condition" -msgstr "УÑÐ»Ð¾Ð²Ð¸Ñ ÑовмеÑтимоÑти профилей печати" - -#: src/libslic3r/PrintConfig.cpp:343 -======= #: src/libslic3r/PrintConfig.cpp:563 msgid "Compatible print profiles condition" msgstr "УÑÐ»Ð¾Ð²Ð¸Ñ ÑовмеÑтимоÑти профилей печати" #: src/libslic3r/PrintConfig.cpp:564 ->>>>>>> master msgid "" -"A boolean expression using the configuration values of an active print profile. If " -"this expression evaluates to true, this profile is considered compatible with the " -"active print profile." +"A boolean expression using the configuration values of an active print " +"profile. If this expression evaluates to true, this profile is considered " +"compatible with the active print profile." msgstr "" -<<<<<<< HEAD -"ЛогичеÑкое выражение, иÑпользующее Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¸ активного Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ Ð¿ÐµÑ‡Ð°Ñ‚Ð¸. " -"ЕÑли Ñто выражение имеет значение true, Ñтот профиль ÑчитаетÑÑ ÑовмеÑтимым Ñ " -"активным профилем принтера." - -#: src/libslic3r/PrintConfig.cpp:360 -msgid "Complete individual objects" -msgstr "Печатать модели по очереди" - -#: src/libslic3r/PrintConfig.cpp:361 -======= "ЛогичеÑкое выражение, иÑпользующее Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¸ активного Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ " "печати. ЕÑли Ñто выражение имеет значение true, Ñтот профиль ÑчитаетÑÑ " "ÑовмеÑтимым Ñ Ð°ÐºÑ‚Ð¸Ð²Ð½Ñ‹Ð¼ профилем принтера." @@ -18244,25 +11314,13 @@ msgid "Complete individual objects" msgstr "Печатать модели по очереди" #: src/libslic3r/PrintConfig.cpp:582 ->>>>>>> master msgid "" -"When printing multiple objects or copies, this feature will complete each object " -"before moving onto next one (and starting it from its bottom layer). This feature " -"is useful to avoid the risk of ruined prints. Slic3r should warn and prevent you " -"from extruder collisions, but beware." +"When printing multiple objects or copies, this feature will complete each " +"object before moving onto next one (and starting it from its bottom layer). " +"This feature is useful to avoid the risk of ruined prints. Slic3r should " +"warn and prevent you from extruder collisions, but beware." msgstr "" "Когда на печатающем Ñтоле размещено неÑколько моделей, Ñта Ñ„ÑƒÐ½ÐºÑ†Ð¸Ñ Ð¿Ð¾Ð·Ð²Ð¾Ð»Ñет " -<<<<<<< HEAD -"печатать их по очереди - Ñначала будет напечатана одна модель, потом втораÑ. Ðтот " -"режим может быть иÑпользован только в том Ñлучае, когда вÑе модели разнеÑены таким " -"образом, что вÑÑ Ð¿ÐµÑ‡Ð°Ñ‚Ð°ÑŽÑ‰Ð°Ñ Ð³Ð¾Ð»Ð¾Ð²ÐºÐ° может перемещатьÑÑ Ð¼ÐµÐ¶Ð´Ñƒ ними." - -#: src/libslic3r/PrintConfig.cpp:369 -msgid "Enable auto cooling" -msgstr "ÐвтоматичеÑкое управление охлаждением" - -#: src/libslic3r/PrintConfig.cpp:370 -======= "печатать их по очереди - Ñначала будет напечатана одна модель, потом втораÑ. " "Ðтот режим может быть иÑпользован только в том Ñлучае, когда вÑе модели " "разнеÑены таким образом, что вÑÑ Ð¿ÐµÑ‡Ð°Ñ‚Ð°ÑŽÑ‰Ð°Ñ Ð³Ð¾Ð»Ð¾Ð²ÐºÐ° может перемещатьÑÑ Ð¼ÐµÐ¶Ð´Ñƒ " @@ -18273,130 +11331,78 @@ msgid "Enable auto cooling" msgstr "ÐвтоматичеÑкое управление охлаждением" #: src/libslic3r/PrintConfig.cpp:591 ->>>>>>> master msgid "" -"This flag enables the automatic cooling logic that adjusts print speed and fan " -"speed according to layer printing time." +"This flag enables the automatic cooling logic that adjusts print speed and " +"fan speed according to layer printing time." msgstr "" "Программа задейÑтвует алгоритм автоматичеÑкого Ð¾Ñ…Ð»Ð°Ð¶Ð´ÐµÐ½Ð¸Ñ Ð¸ Ñама регулирует " "ÑкороÑÑ‚ÑŒ печати и ÑкороÑÑ‚ÑŒ вентилÑтора в завиÑимоÑти от времени печати ÑлоÑ." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:375 -msgid "Cooling tube position" -msgstr "ÐŸÐ¾Ð·Ð¸Ñ†Ð¸Ñ Ð¾Ñ…Ð»Ð°Ð¶Ð´Ð°ÑŽÑ‰ÐµÐ¹ трубки" - -#: src/libslic3r/PrintConfig.cpp:376 -======= #: src/libslic3r/PrintConfig.cpp:596 msgid "Cooling tube position" msgstr "ÐŸÐ¾Ð·Ð¸Ñ†Ð¸Ñ Ð¾Ñ…Ð»Ð°Ð¶Ð´Ð°ÑŽÑ‰ÐµÐ¹ трубки" #: src/libslic3r/PrintConfig.cpp:597 ->>>>>>> master msgid "Distance of the center-point of the cooling tube from the extruder tip." -msgstr "РаÑÑтоÑние между центральной точкой охлаждающей трубки и кончиком ÑкÑтрудера." - -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:383 -msgid "Cooling tube length" -msgstr "Длина охлаждающей трубки" +msgstr "" +"РаÑÑтоÑние между центральной точкой охлаждающей трубки и кончиком ÑкÑтрудера." -#: src/libslic3r/PrintConfig.cpp:384 -======= #: src/libslic3r/PrintConfig.cpp:604 msgid "Cooling tube length" msgstr "Длина охлаждающей трубки" #: src/libslic3r/PrintConfig.cpp:605 ->>>>>>> master msgid "Length of the cooling tube to limit space for cooling moves inside it." msgstr "" -"Длина трубки Ð¾Ñ…Ð»Ð°Ð¶Ð´ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð¾Ð³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÐ½Ð¸Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¸ охлаждающих движениÑÑ…." +"Длина трубки Ð¾Ñ…Ð»Ð°Ð¶Ð´ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð¾Ð³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÐ½Ð¸Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¸ охлаждающих " +"движениÑÑ…." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:392 -======= #: src/libslic3r/PrintConfig.cpp:613 ->>>>>>> master msgid "" -"This is the acceleration your printer will be reset to after the role-specific " -"acceleration values are used (perimeter/infill). Set zero to prevent resetting " -"acceleration at all." +"This is the acceleration your printer will be reset to after the role-" +"specific acceleration values are used (perimeter/infill). Set zero to " +"prevent resetting acceleration at all." msgstr "" -"Ðто уÑкорение, на которое переключитÑÑ Ð¿Ñ€Ð¸Ð½Ñ‚ÐµÑ€ поÑле иÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»Ñ‘Ð½Ð½Ñ‹Ñ… " -"наÑтроек уÑкорениÑ, например уÑтановленных Ð´Ð»Ñ Ð¿ÐµÑ‡Ð°Ñ‚Ð¸ периметра/заполнениÑ. " -"УÑтановите 0, чтобы предотвратить ÑÐ±Ñ€Ð¾Ñ ÑƒÑÐºÐ¾Ñ€ÐµÐ½Ð¸Ñ Ð²Ð¾Ð¾Ð±Ñ‰Ðµ." - -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:401 -msgid "Default filament profile" -msgstr "Профиль прутка по умолчанию" +"Ðто уÑкорение, на которое переключитÑÑ Ð¿Ñ€Ð¸Ð½Ñ‚ÐµÑ€ поÑле иÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ " +"определённых наÑтроек уÑкорениÑ, например уÑтановленных Ð´Ð»Ñ Ð¿ÐµÑ‡Ð°Ñ‚Ð¸ периметра/" +"заполнениÑ. УÑтановите 0, чтобы предотвратить ÑÐ±Ñ€Ð¾Ñ ÑƒÑÐºÐ¾Ñ€ÐµÐ½Ð¸Ñ Ð²Ð¾Ð¾Ð±Ñ‰Ðµ." -#: src/libslic3r/PrintConfig.cpp:402 -======= #: src/libslic3r/PrintConfig.cpp:622 msgid "Default filament profile" msgstr "Профиль прутка по умолчанию" #: src/libslic3r/PrintConfig.cpp:623 ->>>>>>> master msgid "" -"Default filament profile associated with the current printer profile. On selection " -"of the current printer profile, this filament profile will be activated." +"Default filament profile associated with the current printer profile. On " +"selection of the current printer profile, this filament profile will be " +"activated." msgstr "" -"Профиль прутка по умолчанию, ÑвÑзанный Ñ Ñ‚ÐµÐºÑƒÑ‰Ð¸Ð¼ профилем принтера. При выборе " -"текущего Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ Ð¿Ñ€Ð¸Ð½Ñ‚ÐµÑ€Ð°, будет активирован Ñтот профиль прутка." +"Профиль прутка по умолчанию, ÑвÑзанный Ñ Ñ‚ÐµÐºÑƒÑ‰Ð¸Ð¼ профилем принтера. При " +"выборе текущего Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ Ð¿Ñ€Ð¸Ð½Ñ‚ÐµÑ€Ð°, будет активирован Ñтот профиль прутка." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:408 -msgid "Default print profile" -msgstr "Профиль печати по умолчанию" - -#: src/libslic3r/PrintConfig.cpp:409 src/libslic3r/PrintConfig.cpp:2820 -#: src/libslic3r/PrintConfig.cpp:2831 -======= #: src/libslic3r/PrintConfig.cpp:629 msgid "Default print profile" msgstr "Профиль печати по умолчанию" #: src/libslic3r/PrintConfig.cpp:630 src/libslic3r/PrintConfig.cpp:3396 #: src/libslic3r/PrintConfig.cpp:3407 ->>>>>>> master msgid "" -"Default print profile associated with the current printer profile. On selection of " -"the current printer profile, this print profile will be activated." +"Default print profile associated with the current printer profile. On " +"selection of the current printer profile, this print profile will be " +"activated." msgstr "" -"Профиль печати по умолчанию, ÑвÑзанный Ñ Ñ‚ÐµÐºÑƒÑ‰Ð¸Ð¼ профилем принтера. При выборе " -"текущего Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ Ð¿Ñ€Ð¸Ð½Ñ‚ÐµÑ€Ð°, будет активирован Ñтот профиль печати." - -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:415 -msgid "Disable fan for the first" -msgstr "Ðе включать вентилÑтор на первых" +"Профиль печати по умолчанию, ÑвÑзанный Ñ Ñ‚ÐµÐºÑƒÑ‰Ð¸Ð¼ профилем принтера. При " +"выборе текущего Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ Ð¿Ñ€Ð¸Ð½Ñ‚ÐµÑ€Ð°, будет активирован Ñтот профиль печати." -#: src/libslic3r/PrintConfig.cpp:416 -======= #: src/libslic3r/PrintConfig.cpp:636 msgid "Disable fan for the first" msgstr "Ðе включать вентилÑтор на первых" #: src/libslic3r/PrintConfig.cpp:637 ->>>>>>> master msgid "" -"You can set this to a positive value to disable fan at all during the first layers, " -"so that it does not make adhesion worse." +"You can set this to a positive value to disable fan at all during the first " +"layers, so that it does not make adhesion worse." msgstr "" -<<<<<<< HEAD -"Ð’Ñ‹ можете задать положительное значение, чтобы отключить вентилÑтор при печати " -"первых Ñлоёв, чтобы не ухудшить адгезию к Ñтолу." - -#: src/libslic3r/PrintConfig.cpp:425 -msgid "Don't support bridges" -msgstr "Ðе печатать поддержку под моÑтами" - -#: src/libslic3r/PrintConfig.cpp:427 -======= "Ð’Ñ‹ можете задать положительное значение, чтобы отключить вентилÑтор при " "печати первых Ñлоёв, чтобы не ухудшить адгезию к Ñтолу." @@ -18405,23 +11411,11 @@ msgid "Don't support bridges" msgstr "Ðе печатать поддержку под моÑтами" #: src/libslic3r/PrintConfig.cpp:648 ->>>>>>> master msgid "" -"Experimental option for preventing support material from being generated under " -"bridged areas." +"Experimental option for preventing support material from being generated " +"under bridged areas." msgstr "ÐкÑÐ¿ÐµÑ€Ð¸Ð¼ÐµÐ½Ñ‚Ð°Ð»ÑŒÐ½Ð°Ñ Ð¾Ð¿Ñ†Ð¸Ñ Ð¿Ñ€ÐµÐ¿ÑÑ‚ÑÑ‚Ð²ÑƒÑŽÑ‰Ð°Ñ Ð¿ÐµÑ‡Ð°Ñ‚Ð¸ поддержки под моÑтами." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:433 -msgid "Distance between copies" -msgstr "РаÑÑтоÑние между копиÑми" - -#: src/libslic3r/PrintConfig.cpp:434 -msgid "Distance used for the auto-arrange feature of the plater." -msgstr "РаÑÑтоÑние, между моделÑм при автораÑÑтановке их на Ñтоле." - -#: src/libslic3r/PrintConfig.cpp:442 -======= #: src/libslic3r/PrintConfig.cpp:654 msgid "Distance between copies" msgstr "РаÑÑтоÑние между копиÑми" @@ -18431,44 +11425,22 @@ msgid "Distance used for the auto-arrange feature of the plater." msgstr "РаÑÑтоÑние, между моделÑм при автораÑÑтановке их на Ñтоле." #: src/libslic3r/PrintConfig.cpp:663 ->>>>>>> master msgid "" -"This end procedure is inserted at the end of the output file. Note that you can use " -"placeholder variables for all PrusaSlicer settings." +"This end procedure is inserted at the end of the output file. Note that you " +"can use placeholder variables for all PrusaSlicer settings." msgstr "" -<<<<<<< HEAD -"Команды в G-коде, которые будут вÑтавлÑÑ‚ÑŒÑÑ Ð² конец выходного файла. Обратите " -"внимание, что вы можете иÑпользовать шаблонные переменные Ð´Ð»Ñ Ð²Ñех параметров " -"PrusaSlicer." - -#: src/libslic3r/PrintConfig.cpp:452 -======= "Команды в G-коде, которые будут вÑтавлÑÑ‚ÑŒÑÑ Ð² конец выходного файла. " "Обратите внимание, что вы можете иÑпользовать шаблонные переменные Ð´Ð»Ñ Ð²Ñех " "параметров PrusaSlicer." #: src/libslic3r/PrintConfig.cpp:673 ->>>>>>> master -msgid "" -"This end procedure is inserted at the end of the output file, before the printer " -"end gcode (and before any toolchange from this filament in case of multimaterial " -"printers). Note that you can use placeholder variables for all PrusaSlicer " -"settings. If you have multiple extruders, the gcode is processed in extruder order." -msgstr "" -<<<<<<< HEAD -"Команды в G-коде, которые будут вÑтавлÑÑ‚ÑŒÑÑ Ð² конец выходного файла перед конечным " -"G-кодом принтера (и перед каждым переключением инÑтрумента Ñ Ñ‚ÐµÐºÑƒÑ‰Ð¸Ð¼ прутком " -"в Ñлучае мультиматериальных принтеров). Обратите внимание, что вы можете " -"иÑпользовать шаблонные переменные Ð´Ð»Ñ Ð²Ñех параметров PrusaSlicer. ЕÑли у Ð²Ð°Ñ " -"неÑколько ÑкÑтрудеров, G-код обрабатываетÑÑ Ð² ÑоответÑтвии Ñ Ð¿Ð¾Ñ€Ñдковым номером " -"ÑкÑтрудера." - -#: src/libslic3r/PrintConfig.cpp:463 -msgid "Ensure vertical shell thickness" -msgstr "ОбеÑпечивать вертикальную толщину оболочки" - -#: src/libslic3r/PrintConfig.cpp:465 -======= +msgid "" +"This end procedure is inserted at the end of the output file, before the " +"printer end gcode (and before any toolchange from this filament in case of " +"multimaterial printers). Note that you can use placeholder variables for all " +"PrusaSlicer settings. If you have multiple extruders, the gcode is processed " +"in extruder order." +msgstr "" "Команды в G-коде, которые будут вÑтавлÑÑ‚ÑŒÑÑ Ð² конец выходного файла перед " "конечным G-кодом принтера (и перед каждым переключением инÑтрумента Ñ " "текущим прутком в Ñлучае мультиматериальных принтеров). Обратите внимание, " @@ -18481,71 +11453,23 @@ msgid "Ensure vertical shell thickness" msgstr "ОбеÑпечивать вертикальную толщину оболочки" #: src/libslic3r/PrintConfig.cpp:686 ->>>>>>> master msgid "" -"Add solid infill near sloping surfaces to guarantee the vertical shell thickness " -"(top+bottom solid layers)." +"Add solid infill near sloping surfaces to guarantee the vertical shell " +"thickness (top+bottom solid layers)." msgstr "" -"ДобавлÑет Ñплошные опоры у наклонных поверхноÑтей Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, чтобы гарантировать " -"вертикальную толщину оболочки (верхние+нижние Ñплошные Ñлои). Ðто помогает избежать " -"дыр на наклонной поверхноÑти." - -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:471 -msgid "Top fill pattern" -msgstr "Шаблон Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð²ÐµÑ€Ñ…Ð½ÐµÐ¹ поверхноÑти" +"ДобавлÑет Ñплошные опоры у наклонных поверхноÑтей Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, чтобы " +"гарантировать вертикальную толщину оболочки (верхние+нижние Ñплошные Ñлои). " +"Ðто помогает избежать дыр на наклонной поверхноÑти." -#: src/libslic3r/PrintConfig.cpp:473 -======= #: src/libslic3r/PrintConfig.cpp:692 msgid "Top fill pattern" msgstr "Шаблон Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð²ÐµÑ€Ñ…Ð½ÐµÐ¹ поверхноÑти" #: src/libslic3r/PrintConfig.cpp:694 ->>>>>>> master msgid "" -"Fill pattern for top infill. This only affects the top visible layer, and not its " -"adjacent solid shells." +"Fill pattern for top infill. This only affects the top visible layer, and " +"not its adjacent solid shells." msgstr "" -<<<<<<< HEAD -"Тип Ñетки, которой закрываетÑÑ Ð²ÐµÑ€Ñ…Ð½ÑÑ Ð¿Ð¾Ð²ÐµÑ€Ñ…Ð½Ð¾ÑÑ‚ÑŒ. Ðто влиÑет только на внешний " -"видимый Ñлой, а не на прилегающие к нему твёрдые оболочки." - -#: src/libslic3r/PrintConfig.cpp:483 src/libslic3r/PrintConfig.cpp:918 -#: src/libslic3r/PrintConfig.cpp:2236 -msgid "Rectilinear" -msgstr "ПрÑмолинейный" - -#: src/libslic3r/PrintConfig.cpp:484 -msgid "Monotonic" -msgstr "Монотонный" - -#: src/libslic3r/PrintConfig.cpp:485 src/libslic3r/PrintConfig.cpp:919 -msgid "Aligned Rectilinear" -msgstr "Выровн. прÑмолинейн." - -#: src/libslic3r/PrintConfig.cpp:486 src/libslic3r/PrintConfig.cpp:925 -msgid "Concentric" -msgstr "КонцентричеÑкий" - -#: src/libslic3r/PrintConfig.cpp:487 src/libslic3r/PrintConfig.cpp:929 -msgid "Hilbert Curve" -msgstr "ÐšÑ€Ð¸Ð²Ð°Ñ Ð“Ð¸Ð»ÑŒÐ±ÐµÑ€Ñ‚Ð°" - -#: src/libslic3r/PrintConfig.cpp:488 src/libslic3r/PrintConfig.cpp:930 -msgid "Archimedean Chords" -msgstr "Хорды Ðрхимеда" - -#: src/libslic3r/PrintConfig.cpp:489 src/libslic3r/PrintConfig.cpp:931 -msgid "Octagram Spiral" -msgstr "Ð¡Ð¿Ð¸Ñ€Ð°Ð»ÑŒÐ½Ð°Ñ Ð¾ÐºÑ‚Ð°Ð³Ñ€Ð°Ð¼Ð¼Ð°" - -#: src/libslic3r/PrintConfig.cpp:495 -msgid "Bottom fill pattern" -msgstr "Шаблон Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð½Ð¸Ð¶Ð½ÐµÐ¹ поверхноÑти" - -#: src/libslic3r/PrintConfig.cpp:497 -======= "Тип Ñетки, которой закрываетÑÑ Ð²ÐµÑ€Ñ…Ð½ÑÑ Ð¿Ð¾Ð²ÐµÑ€Ñ…Ð½Ð¾ÑÑ‚ÑŒ. Ðто влиÑет только на " "внешний видимый Ñлой, а не на прилегающие к нему твёрдые оболочки." @@ -18584,21 +11508,10 @@ msgid "Bottom fill pattern" msgstr "Шаблон Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð½Ð¸Ð¶Ð½ÐµÐ¹ поверхноÑти" #: src/libslic3r/PrintConfig.cpp:718 ->>>>>>> master msgid "" -"Fill pattern for bottom infill. This only affects the bottom external visible " -"layer, and not its adjacent solid shells." +"Fill pattern for bottom infill. This only affects the bottom external " +"visible layer, and not its adjacent solid shells." msgstr "" -<<<<<<< HEAD -"Тип Ñетки, которой закрываетÑÑ Ð½Ð¸Ð¶Ð½ÑÑ Ð¿Ð¾Ð²ÐµÑ€Ñ…Ð½Ð¾ÑÑ‚ÑŒ. Ðто влиÑет только на нижний " -"внешний видимый Ñлой, а не на прилегающие к нему твёрдые оболочки." - -#: src/libslic3r/PrintConfig.cpp:506 src/libslic3r/PrintConfig.cpp:517 -msgid "External perimeters" -msgstr "Внешние периметры" - -#: src/libslic3r/PrintConfig.cpp:508 -======= "Тип Ñетки, которой закрываетÑÑ Ð½Ð¸Ð¶Ð½ÑÑ Ð¿Ð¾Ð²ÐµÑ€Ñ…Ð½Ð¾ÑÑ‚ÑŒ. Ðто влиÑет только на " "нижний внешний видимый Ñлой, а не на прилегающие к нему твёрдые оболочки." @@ -18607,31 +11520,13 @@ msgid "External perimeters" msgstr "Внешние периметры" #: src/libslic3r/PrintConfig.cpp:729 ->>>>>>> master msgid "" "Set this to a non-zero value to set a manual extrusion width for external " -"perimeters. If left zero, default extrusion width will be used if set, otherwise " -"1.125 x nozzle diameter will be used. If expressed as percentage (for example " -"200%), it will be computed over layer height." +"perimeters. If left zero, default extrusion width will be used if set, " +"otherwise 1.125 x nozzle diameter will be used. If expressed as percentage " +"(for example 200%), it will be computed over layer height." msgstr "" "УÑтановите значение отличное от 0, чтобы вручную задать ширину ÑкÑтрузии Ð´Ð»Ñ " -<<<<<<< HEAD -"внешних периметров. ЕÑли оÑтавить 0, будет иÑпользоватьÑÑ \"Ширина ÑкÑтрузии по " -"умолчанию\" - еÑли она задана, в противном Ñлучае будет иÑпользоватьÑÑ 1,125 x " -"диаметра Ñопла. ЕÑли задано в процентах, параметр вычиÑлÑетÑÑ Ð¾Ñ‚Ð½Ð¾Ñительно выÑоты " -"ÑлоÑ." - -#: src/libslic3r/PrintConfig.cpp:511 src/libslic3r/PrintConfig.cpp:621 -#: src/libslic3r/PrintConfig.cpp:962 src/libslic3r/PrintConfig.cpp:975 -#: src/libslic3r/PrintConfig.cpp:1104 src/libslic3r/PrintConfig.cpp:1159 -#: src/libslic3r/PrintConfig.cpp:1185 src/libslic3r/PrintConfig.cpp:1632 -#: src/libslic3r/PrintConfig.cpp:1961 src/libslic3r/PrintConfig.cpp:2110 -#: src/libslic3r/PrintConfig.cpp:2178 src/libslic3r/PrintConfig.cpp:2339 -msgid "mm or %" -msgstr "мм или %" - -#: src/libslic3r/PrintConfig.cpp:519 -======= "внешних периметров. ЕÑли оÑтавить 0, будет иÑпользоватьÑÑ Â«Ð¨Ð¸Ñ€Ð¸Ð½Ð° ÑкÑтрузии " "по умолчанию» - еÑли она задана, в противном Ñлучае будет иÑпользоватьÑÑ " "1,125 x диаметра Ñопла. ЕÑли задано в процентах, параметр вычиÑлÑетÑÑ " @@ -18647,29 +11542,15 @@ msgid "mm or %" msgstr "мм или %" #: src/libslic3r/PrintConfig.cpp:741 ->>>>>>> master msgid "" -"This separate setting will affect the speed of external perimeters (the visible " -"ones). If expressed as percentage (for example: 80%) it will be calculated on the " -"perimeters speed setting above. Set to zero for auto." +"This separate setting will affect the speed of external perimeters (the " +"visible ones). If expressed as percentage (for example: 80%) it will be " +"calculated on the perimeters speed setting above. Set to zero for auto." msgstr "" -"Ðтот параметр влиÑет на ÑкороÑÑ‚ÑŒ печати внешних периметров (видимых). ЕÑли задано в " -"процентах, параметр вычиÑлÑетÑÑ Ð¾Ñ‚Ð½Ð¾Ñительно ÑкороÑти печати внутренних периметров. " -"УÑтановите 0 Ð´Ð»Ñ Ð°Ð²Ñ‚Ð¾Ð½Ð°Ñтройки." +"Ðтот параметр влиÑет на ÑкороÑÑ‚ÑŒ печати внешних периметров (видимых). ЕÑли " +"задано в процентах, параметр вычиÑлÑетÑÑ Ð¾Ñ‚Ð½Ð¾Ñительно ÑкороÑти печати " +"внутренних периметров. УÑтановите 0 Ð´Ð»Ñ Ð°Ð²Ñ‚Ð¾Ð½Ð°Ñтройки." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:522 src/libslic3r/PrintConfig.cpp:984 -#: src/libslic3r/PrintConfig.cpp:1920 src/libslic3r/PrintConfig.cpp:1972 -#: src/libslic3r/PrintConfig.cpp:2222 src/libslic3r/PrintConfig.cpp:2352 -msgid "mm/s or %" -msgstr "мм/Ñ Ð¸Ð»Ð¸ %" - -#: src/libslic3r/PrintConfig.cpp:529 -msgid "External perimeters first" -msgstr "Внешние периметры печатать первыми" - -#: src/libslic3r/PrintConfig.cpp:531 -======= #: src/libslic3r/PrintConfig.cpp:744 src/libslic3r/PrintConfig.cpp:1222 #: src/libslic3r/PrintConfig.cpp:1233 src/libslic3r/PrintConfig.cpp:2306 #: src/libslic3r/PrintConfig.cpp:2359 src/libslic3r/PrintConfig.cpp:2690 @@ -18682,106 +11563,57 @@ msgid "External perimeters first" msgstr "Внешние периметры печатать первыми" #: src/libslic3r/PrintConfig.cpp:753 ->>>>>>> master msgid "" -"Print contour perimeters from the outermost one to the innermost one instead of the " -"default inverse order." +"Print contour perimeters from the outermost one to the innermost one instead " +"of the default inverse order." msgstr "" -"При включении, Ñначала будет печататьÑÑ Ð²Ð½ÐµÑˆÐ½Ð¸Ð¹ Ñлой периметра, потом внутренний. " -"Ðапример, еÑли периметр ÑоÑтоит из трёх Ñлоёв, то, включив Ñтот параметр, печать " -"будет идти в Ñледующем порÑдке: Ñначала внешний, потом Ñредний, потом внутренний " -"Ñлой." - -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:537 -msgid "Extra perimeters if needed" -msgstr "Дополнительные периметры при необходимоÑти" +"При включении, Ñначала будет печататьÑÑ Ð²Ð½ÐµÑˆÐ½Ð¸Ð¹ Ñлой периметра, потом " +"внутренний. Ðапример, еÑли периметр ÑоÑтоит из трёх Ñлоёв, то, включив Ñтот " +"параметр, печать будет идти в Ñледующем порÑдке: Ñначала внешний, потом " +"Ñредний, потом внутренний Ñлой." -#: src/libslic3r/PrintConfig.cpp:539 -======= #: src/libslic3r/PrintConfig.cpp:759 msgid "Extra perimeters if needed" msgstr "Дополнительные периметры при необходимоÑти" #: src/libslic3r/PrintConfig.cpp:761 ->>>>>>> master msgid "" -"Add more perimeters when needed for avoiding gaps in sloping walls. Slic3r keeps " -"adding perimeters, until more than 70% of the loop immediately above is supported." +"Add more perimeters when needed for avoiding gaps in sloping walls. Slic3r " +"keeps adding perimeters, until more than 70% of the loop immediately above " +"is supported." msgstr "" -<<<<<<< HEAD -"ДобавлÑет дополнительные периметры, когда Ñто необходимо, чтобы избежать пробелов в " -"наклонных Ñтенках. PrusaSlicer продолжит добавлÑÑ‚ÑŒ периметры пока в Ñледующем Ñлое " -"не будет поддерживатьÑÑ Ð±Ð¾Ð»ÐµÐµ 70% периметра." - -#: src/libslic3r/PrintConfig.cpp:549 -======= "ДобавлÑет дополнительные периметры, когда Ñто необходимо, чтобы избежать " "пробелов в наклонных Ñтенках. PrusaSlicer продолжит добавлÑÑ‚ÑŒ периметры пока " "в Ñледующем Ñлое не будет поддерживатьÑÑ Ð±Ð¾Ð»ÐµÐµ 70% периметра." #: src/libslic3r/PrintConfig.cpp:771 ->>>>>>> master msgid "" -"The extruder to use (unless more specific extruder settings are specified). This " -"value overrides perimeter and infill extruders, but not the support extruders." +"The extruder to use (unless more specific extruder settings are specified). " +"This value overrides perimeter and infill extruders, but not the support " +"extruders." msgstr "" -"ИÑпользуемый ÑкÑтрудер (еÑли не заданы более конкретные параметры ÑкÑтрудера). Ðто " -"значение переопределÑет ÑкÑтрудеры периметра и заполнениÑ, но не ÑкÑтрудеры " -"поддержки." +"ИÑпользуемый ÑкÑтрудер (еÑли не заданы более конкретные параметры " +"ÑкÑтрудера). Ðто значение переопределÑет ÑкÑтрудеры периметра и заполнениÑ, " +"но не ÑкÑтрудеры поддержки." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:561 -======= #: src/libslic3r/PrintConfig.cpp:783 ->>>>>>> master msgid "" -"Set this to the vertical distance between your nozzle tip and (usually) the X " -"carriage rods. In other words, this is the height of the clearance cylinder around " -"your extruder, and it represents the maximum depth the extruder can peek before " -"colliding with other printed objects." +"Set this to the vertical distance between your nozzle tip and (usually) the " +"X carriage rods. In other words, this is the height of the clearance " +"cylinder around your extruder, and it represents the maximum depth the " +"extruder can peek before colliding with other printed objects." msgstr "" "Задаёт вертикальное раÑÑтоÑние между кончиком Ñопла и (обычно) оÑью валов на " -<<<<<<< HEAD -"которых ездит каретка. Другими Ñловами, Ñто выÑота воображаемого цилиндра вокруг " -"ÑкÑтрудера, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»Ñет макÑимальную глубину, до которой ÑкÑтрудер может " -"опуÑтитьÑÑ, чтобы не ÑтолкнутьÑÑ Ñ Ð¼Ð¾Ð´ÐµÐ»ÑŒÑŽ." - -#: src/libslic3r/PrintConfig.cpp:572 -======= "которых ездит каретка. Другими Ñловами, Ñто выÑота воображаемого цилиндра " "вокруг ÑкÑтрудера, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»Ñет макÑимальную глубину, до которой " "ÑкÑтрудер может опуÑтитьÑÑ, чтобы не ÑтолкнутьÑÑ Ñ Ð¼Ð¾Ð´ÐµÐ»ÑŒÑŽ." #: src/libslic3r/PrintConfig.cpp:794 ->>>>>>> master msgid "" -"Set this to the clearance radius around your extruder. If the extruder is not " -"centered, choose the largest value for safety. This setting is used to check for " -"collisions and to display the graphical preview in the plater." +"Set this to the clearance radius around your extruder. If the extruder is " +"not centered, choose the largest value for safety. This setting is used to " +"check for collisions and to display the graphical preview in the plater." msgstr "" -<<<<<<< HEAD -"БезопаÑное раÑÑтоÑние (зазор) вокруг ÑкÑтрудера. ЕÑли ÑкÑтрудер уÑтановлен не по " -"центру - взÑÑ‚ÑŒ наибольшее безопаÑное значение. Ðтот параметр иÑпользуетÑÑ Ð´Ð»Ñ " -"Ð¿Ñ€ÐµÐ´Ð¾Ñ‚Ð²Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ ÑÑ‚Ð¾Ð»ÐºÐ½Ð¾Ð²ÐµÐ½Ð¸Ñ ÑкÑтрудера Ñ Ð¼Ð¾Ð´ÐµÐ»ÑŒÑŽ и графичеÑкого Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ Ð½Ð° " -"Ñтоле." - -#: src/libslic3r/PrintConfig.cpp:582 -msgid "Extruder Color" -msgstr "Цвет ÑкÑтрудера" - -#: src/libslic3r/PrintConfig.cpp:583 src/libslic3r/PrintConfig.cpp:645 -msgid "This is only used in the Slic3r interface as a visual help." -msgstr "" -"Ðтот параметр иÑпользуетÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ в интерфейÑе PrusaSlicer в качеÑтве визуальной " -"помощи." - -#: src/libslic3r/PrintConfig.cpp:589 -msgid "Extruder offset" -msgstr "Смещение ÑкÑтрудера по оÑÑм X/Y" - -#: src/libslic3r/PrintConfig.cpp:590 -======= "БезопаÑное раÑÑтоÑние (зазор) вокруг ÑкÑтрудера. ЕÑли ÑкÑтрудер уÑтановлен " "не по центру - взÑÑ‚ÑŒ наибольшее безопаÑное значение. Ðтот параметр " "иÑпользуетÑÑ Ð´Ð»Ñ Ð¿Ñ€ÐµÐ´Ð¾Ñ‚Ð²Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ ÑÑ‚Ð¾Ð»ÐºÐ½Ð¾Ð²ÐµÐ½Ð¸Ñ ÑкÑтрудера Ñ Ð¼Ð¾Ð´ÐµÐ»ÑŒÑŽ и " @@ -18803,26 +11635,12 @@ msgid "Extruder offset" msgstr "Смещение ÑкÑтрудера по оÑÑм X/Y" #: src/libslic3r/PrintConfig.cpp:812 ->>>>>>> master msgid "" -"If your firmware doesn't handle the extruder displacement you need the G-code to " -"take it into account. This option lets you specify the displacement of each " -"extruder with respect to the first one. It expects positive coordinates (they will " -"be subtracted from the XY coordinate)." +"If your firmware doesn't handle the extruder displacement you need the G-" +"code to take it into account. This option lets you specify the displacement " +"of each extruder with respect to the first one. It expects positive " +"coordinates (they will be subtracted from the XY coordinate)." msgstr "" -<<<<<<< HEAD -"Ðктуально только Ð´Ð»Ñ Ð¿Ñ€Ð¸Ð½Ñ‚ÐµÑ€Ð¾Ð² Ñ Ð½ÐµÑколькими ÑкÑтрудерами. ЕÑли прошивка вашего " -"принтера правильно не обрабатывает раÑположение/Ñмещение ÑкÑтрудера, Ñледует учеÑÑ‚ÑŒ " -"Ñто в G-коде. Ðтот параметр позволÑет задать Ñмещение каждого ÑкÑтрудера " -"отноÑительно первого. ВводÑÑ‚ÑÑ Ð¿Ð¾Ð»Ð¾Ð¶Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ðµ координаты (они будут вычтены из XY " -"координат)." - -#: src/libslic3r/PrintConfig.cpp:599 -msgid "Extrusion axis" -msgstr "ÐкÑтрузионные оÑи" - -#: src/libslic3r/PrintConfig.cpp:600 -======= "Ðктуально только Ð´Ð»Ñ Ð¿Ñ€Ð¸Ð½Ñ‚ÐµÑ€Ð¾Ð² Ñ Ð½ÐµÑколькими ÑкÑтрудерами. ЕÑли прошивка " "вашего принтера правильно не обрабатывает раÑположение/Ñмещение ÑкÑтрудера, " "Ñледует учеÑÑ‚ÑŒ Ñто в G-коде. Ðтот параметр позволÑет задать Ñмещение каждого " @@ -18834,69 +11652,44 @@ msgid "Extrusion axis" msgstr "ÐкÑтрузионные оÑи" #: src/libslic3r/PrintConfig.cpp:822 ->>>>>>> master msgid "" "Use this option to set the axis letter associated to your printer's extruder " "(usually E but some printers use A)." msgstr "" -"ИÑпользуйте Ñту опцию, чтобы задать букву оÑи, ÑвÑзанную Ñ ÑкÑтрудером вашего " -"принтера (обычно Ñто E, но на некоторых принтерах A)." +"ИÑпользуйте Ñту опцию, чтобы задать букву оÑи, ÑвÑзанную Ñ ÑкÑтрудером " +"вашего принтера (обычно Ñто E, но на некоторых принтерах A)." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:605 -msgid "Extrusion multiplier" -msgstr "ÐкÑтрузионный множитель" - -#: src/libslic3r/PrintConfig.cpp:606 -======= #: src/libslic3r/PrintConfig.cpp:827 msgid "Extrusion multiplier" msgstr "ÐкÑтрузионный множитель" #: src/libslic3r/PrintConfig.cpp:828 ->>>>>>> master msgid "" -"This factor changes the amount of flow proportionally. You may need to tweak this " -"setting to get nice surface finish and correct single wall widths. Usual values are " -"between 0.9 and 1.1. If you think you need to change this more, check filament " -"diameter and your firmware E steps." +"This factor changes the amount of flow proportionally. You may need to tweak " +"this setting to get nice surface finish and correct single wall widths. " +"Usual values are between 0.9 and 1.1. If you think you need to change this " +"more, check filament diameter and your firmware E steps." msgstr "" -"КоÑффициент количеÑтва подаваемого плаÑтика по Ñравнению Ñ Ð¾Ñновным значением. Ð’ " -"других ÑлайÑерах называетÑÑ Ð¢ÐµÐºÑƒÑ‡ÐµÑÑ‚ÑŒ (Flow). Вам может понадобитьÑÑ Ð½Ð°Ñтроить Ñтот " -"параметр, чтобы получить краÑивую поверхноÑÑ‚ÑŒ и правильную ширину одиночной Ñтенки. " -"Обычные Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ ÑоÑтавлÑÑŽÑ‚ от 0.9 до 1.1. ЕÑли вы Ñчитаете, что вам требуетÑÑ " -"большее значение, проверьте диаметр прутка и шаги ÑкÑтрудера в вашей прошивке." - -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:615 -msgid "Default extrusion width" -msgstr "Ширина ÑкÑтрузии по умолчанию" +"КоÑффициент количеÑтва подаваемого плаÑтика по Ñравнению Ñ Ð¾Ñновным " +"значением. Ð’ других ÑлайÑерах называетÑÑ Ð¢ÐµÐºÑƒÑ‡ÐµÑÑ‚ÑŒ (Flow). Вам может " +"понадобитьÑÑ Ð½Ð°Ñтроить Ñтот параметр, чтобы получить краÑивую поверхноÑÑ‚ÑŒ и " +"правильную ширину одиночной Ñтенки. Обычные Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ ÑоÑтавлÑÑŽÑ‚ от 0.9 до " +"1.1. ЕÑли вы Ñчитаете, что вам требуетÑÑ Ð±Ð¾Ð»ÑŒÑˆÐµÐµ значение, проверьте диаметр " +"прутка и шаги ÑкÑтрудера в вашей прошивке." -#: src/libslic3r/PrintConfig.cpp:617 -======= #: src/libslic3r/PrintConfig.cpp:837 msgid "Default extrusion width" msgstr "Ширина ÑкÑтрузии по умолчанию" #: src/libslic3r/PrintConfig.cpp:839 ->>>>>>> master msgid "" -"Set this to a non-zero value to allow a manual extrusion width. If left to zero, " -"Slic3r derives extrusion widths from the nozzle diameter (see the tooltips for " -"perimeter extrusion width, infill extrusion width etc). If expressed as percentage " -"(for example: 230%), it will be computed over layer height." +"Set this to a non-zero value to allow a manual extrusion width. If left to " +"zero, Slic3r derives extrusion widths from the nozzle diameter (see the " +"tooltips for perimeter extrusion width, infill extrusion width etc). If " +"expressed as percentage (for example: 230%), it will be computed over layer " +"height." msgstr "" "УÑтановите значение отличное от 0, чтобы вручную задать ширину ÑкÑтрузии " -<<<<<<< HEAD -"заполнениÑ. ЕÑли оÑтавить 0, будет иÑпользоватьÑÑ Ð·Ð°Ð´Ð°Ð½Ð½Ñ‹Ð¹ диаметр Ñопла. ЕÑли " -"задано в процентах, параметр вычиÑлÑетÑÑ Ð¾Ñ‚Ð½Ð¾Ñительно выÑоты ÑлоÑ." - -#: src/libslic3r/PrintConfig.cpp:628 -msgid "Keep fan always on" -msgstr "ВентилÑтор включён вÑегда" - -#: src/libslic3r/PrintConfig.cpp:629 -======= "заполнениÑ. ЕÑли оÑтавить 0, будет иÑпользоватьÑÑ Ð·Ð°Ð´Ð°Ð½Ð½Ñ‹Ð¹ диаметр Ñопла. " "ЕÑли задано в процентах, параметр вычиÑлÑетÑÑ Ð¾Ñ‚Ð½Ð¾Ñительно выÑоты ÑлоÑ." @@ -18905,21 +11698,10 @@ msgid "Keep fan always on" msgstr "ВентилÑтор включён вÑегда" #: src/libslic3r/PrintConfig.cpp:852 ->>>>>>> master msgid "" -"If this is enabled, fan will never be disabled and will be kept running at least at " -"its minimum speed. Useful for PLA, harmful for ABS." +"If this is enabled, fan will never be disabled and will be kept running at " +"least at its minimum speed. Useful for PLA, harmful for ABS." msgstr "" -<<<<<<< HEAD -"ЕÑли Ñта Ð¾Ð¿Ñ†Ð¸Ñ Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½Ð°, вентилÑтор никогда не будет отключатьÑÑ Ð¸ будет работать " -"Ñ…Ð¾Ñ‚Ñ Ð±Ñ‹ на минимальной ÑкороÑти. Полезно Ð´Ð»Ñ PLA, вредно Ð´Ð»Ñ ABS." - -#: src/libslic3r/PrintConfig.cpp:634 -msgid "Enable fan if layer print time is below" -msgstr "Включить обдув, еÑли Ð²Ñ€ÐµÐ¼Ñ Ð¿ÐµÑ‡Ð°Ñ‚Ð¸ ÑÐ»Ð¾Ñ Ð¼ÐµÐ½ÐµÐµ" - -#: src/libslic3r/PrintConfig.cpp:635 -======= "ЕÑли Ñта Ð¾Ð¿Ñ†Ð¸Ñ Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½Ð°, вентилÑтор никогда не будет отключатьÑÑ Ð¸ будет " "работать Ñ…Ð¾Ñ‚Ñ Ð±Ñ‹ на минимальной ÑкороÑти. Полезно Ð´Ð»Ñ PLA, вредно Ð´Ð»Ñ ABS." @@ -18928,38 +11710,15 @@ msgid "Enable fan if layer print time is below" msgstr "Включить обдув, еÑли Ð²Ñ€ÐµÐ¼Ñ Ð¿ÐµÑ‡Ð°Ñ‚Ð¸ ÑÐ»Ð¾Ñ Ð¼ÐµÐ½ÐµÐµ" #: src/libslic3r/PrintConfig.cpp:858 ->>>>>>> master msgid "" -"If layer print time is estimated below this number of seconds, fan will be enabled " -"and its speed will be calculated by interpolating the minimum and maximum speeds." +"If layer print time is estimated below this number of seconds, fan will be " +"enabled and its speed will be calculated by interpolating the minimum and " +"maximum speeds." msgstr "" -"ЕÑли Ð²Ñ€ÐµÐ¼Ñ Ð¿ÐµÑ‡Ð°Ñ‚Ð¸ ÑÐ»Ð¾Ñ Ð¾Ñ†ÐµÐ½Ð¸Ð²Ð°ÐµÑ‚ÑÑ Ð½Ð¸Ð¶Ðµ Ñтого количеÑтва Ñекунд, будет включён " -"вентилÑтор, и его ÑкороÑÑ‚ÑŒ будет раÑÑчитыватьÑÑ Ð¿ÑƒÑ‚Ñ‘Ð¼ интерполÑции минимальных и " -"макÑимальных ÑкороÑтей." - -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:637 src/libslic3r/PrintConfig.cpp:1908 -msgid "approximate seconds" -msgstr "приблизительно Ñекунд" - -#: src/libslic3r/PrintConfig.cpp:644 -msgid "Color" -msgstr "Цвет" - -#: src/libslic3r/PrintConfig.cpp:650 -msgid "Filament notes" -msgstr "Примечание о прутке" - -#: src/libslic3r/PrintConfig.cpp:651 -msgid "You can put your notes regarding the filament here." -msgstr "ЗдеÑÑŒ вы можете напиÑать Ñвои Ð¿Ñ€Ð¸Ð¼ÐµÑ‡Ð°Ð½Ð¸Ñ Ð¾Ñ‚Ð½Ð¾Ñительно прутка." +"ЕÑли Ð²Ñ€ÐµÐ¼Ñ Ð¿ÐµÑ‡Ð°Ñ‚Ð¸ ÑÐ»Ð¾Ñ Ð¾Ñ†ÐµÐ½Ð¸Ð²Ð°ÐµÑ‚ÑÑ Ð½Ð¸Ð¶Ðµ Ñтого количеÑтва Ñекунд, будет " +"включён вентилÑтор, и его ÑкороÑÑ‚ÑŒ будет раÑÑчитыватьÑÑ Ð¿ÑƒÑ‚Ñ‘Ð¼ интерполÑции " +"минимальных и макÑимальных ÑкороÑтей." -#: src/libslic3r/PrintConfig.cpp:659 src/libslic3r/PrintConfig.cpp:1455 -msgid "Max volumetric speed" -msgstr "МакÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ Ð¾Ð±ÑŠÑ‘Ð¼Ð½Ð°Ñ ÑкороÑÑ‚ÑŒ" - -#: src/libslic3r/PrintConfig.cpp:660 -======= #: src/libslic3r/PrintConfig.cpp:860 src/libslic3r/PrintConfig.cpp:2294 msgid "approximate seconds" msgstr "приблизительно Ñекунд" @@ -18981,39 +11740,11 @@ msgid "Max volumetric speed" msgstr "МакÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ Ð¾Ð±ÑŠÑ‘Ð¼Ð½Ð°Ñ ÑкороÑÑ‚ÑŒ" #: src/libslic3r/PrintConfig.cpp:883 ->>>>>>> master msgid "" -"Maximum volumetric speed allowed for this filament. Limits the maximum volumetric " -"speed of a print to the minimum of print and filament volumetric speed. Set to zero " -"for no limit." +"Maximum volumetric speed allowed for this filament. Limits the maximum " +"volumetric speed of a print to the minimum of print and filament volumetric " +"speed. Set to zero for no limit." msgstr "" -<<<<<<< HEAD -"МакÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ Ð¾Ð±ÑŠÑ‘Ð¼Ð½Ð°Ñ ÑкороÑÑ‚ÑŒ подачи (объёмный раÑход), Ñ€Ð°Ð·Ñ€ÐµÑˆÑ‘Ð½Ð½Ð°Ñ Ð´Ð»Ñ Ñтого " -"прутка. Ограничивает макÑимальную объёмную ÑкороÑÑ‚ÑŒ печати до минимальной " -"Ð´Ð»Ñ Ñтого принтера и прутка. УÑтановите 0, чтобы убрать ограничениÑ." - -#: src/libslic3r/PrintConfig.cpp:669 -msgid "Loading speed" -msgstr "СкороÑÑ‚ÑŒ загрузки" - -#: src/libslic3r/PrintConfig.cpp:670 -msgid "Speed used for loading the filament on the wipe tower." -msgstr "СкороÑÑ‚ÑŒ загрузки прутка при печати черновой башни." - -#: src/libslic3r/PrintConfig.cpp:677 -msgid "Loading speed at the start" -msgstr "ÐÐ°Ñ‡Ð°Ð»ÑŒÐ½Ð°Ñ ÑкороÑÑ‚ÑŒ загрузки" - -#: src/libslic3r/PrintConfig.cpp:678 -msgid "Speed used at the very beginning of loading phase." -msgstr "СкороÑÑ‚ÑŒ в начальной фазе загрузки прутка." - -#: src/libslic3r/PrintConfig.cpp:685 -msgid "Unloading speed" -msgstr "СкороÑÑ‚ÑŒ выгрузки" - -#: src/libslic3r/PrintConfig.cpp:686 -======= "МакÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ Ð¾Ð±ÑŠÑ‘Ð¼Ð½Ð°Ñ ÑкороÑÑ‚ÑŒ подачи (объёмный раÑход), Ñ€Ð°Ð·Ñ€ÐµÑˆÑ‘Ð½Ð½Ð°Ñ Ð´Ð»Ñ " "Ñтого прутка. Ограничивает макÑимальную объёмную ÑкороÑÑ‚ÑŒ печати до " "минимальной Ð´Ð»Ñ Ñтого принтера и прутка. УÑтановите 0, чтобы убрать " @@ -19040,29 +11771,10 @@ msgid "Unloading speed" msgstr "СкороÑÑ‚ÑŒ выгрузки" #: src/libslic3r/PrintConfig.cpp:909 ->>>>>>> master msgid "" -"Speed used for unloading the filament on the wipe tower (does not affect initial " -"part of unloading just after ramming)." +"Speed used for unloading the filament on the wipe tower (does not affect " +"initial part of unloading just after ramming)." msgstr "" -<<<<<<< HEAD -"СкороÑÑ‚ÑŒ выгрузки прутка на черновую башню. (не влиÑет на начальную фазу выгрузки " -"Ñразу поÑле Ñ€Ñмминга)." - -#: src/libslic3r/PrintConfig.cpp:694 -msgid "Unloading speed at the start" -msgstr "ÐÐ°Ñ‡Ð°Ð»ÑŒÐ½Ð°Ñ ÑкороÑÑ‚ÑŒ выгрузки" - -#: src/libslic3r/PrintConfig.cpp:695 -msgid "Speed used for unloading the tip of the filament immediately after ramming." -msgstr "СкороÑÑ‚ÑŒ выгрузки кончика прутка Ñразу поÑле Ñ€Ñмминга." - -#: src/libslic3r/PrintConfig.cpp:702 -msgid "Delay after unloading" -msgstr "Задержка поÑле выгрузки" - -#: src/libslic3r/PrintConfig.cpp:703 -======= "СкороÑÑ‚ÑŒ выгрузки прутка на черновую башню. (не влиÑет на начальную фазу " "выгрузки Ñразу поÑле Ñ€Ñмминга)." @@ -19080,50 +11792,27 @@ msgid "Delay after unloading" msgstr "Задержка поÑле выгрузки" #: src/libslic3r/PrintConfig.cpp:926 ->>>>>>> master msgid "" -"Time to wait after the filament is unloaded. May help to get reliable toolchanges " -"with flexible materials that may need more time to shrink to original dimensions." +"Time to wait after the filament is unloaded. May help to get reliable " +"toolchanges with flexible materials that may need more time to shrink to " +"original dimensions." msgstr "" -"Ð’Ñ€ÐµÐ¼Ñ Ð¾Ð¶Ð¸Ð´Ð°Ð½Ð¸Ñ Ð¿Ð¾Ñле выгрузки прутка. Ðто может помочь вам легко Ñменить Ñопло при " -"печати гибкими материалами, которым требуетÑÑ Ð±Ð¾Ð»ÑŒÑˆÐµ времени, чтобы вернутьÑÑ Ðº " -"Ñвоим первоначальным размерам." - -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:712 -msgid "Number of cooling moves" -msgstr "КоличеÑтво охлаждающих движений" +"Ð’Ñ€ÐµÐ¼Ñ Ð¾Ð¶Ð¸Ð´Ð°Ð½Ð¸Ñ Ð¿Ð¾Ñле выгрузки прутка. Ðто может помочь вам легко Ñменить " +"Ñопло при печати гибкими материалами, которым требуетÑÑ Ð±Ð¾Ð»ÑŒÑˆÐµ времени, " +"чтобы вернутьÑÑ Ðº Ñвоим первоначальным размерам." -#: src/libslic3r/PrintConfig.cpp:713 -======= #: src/libslic3r/PrintConfig.cpp:935 msgid "Number of cooling moves" msgstr "КоличеÑтво охлаждающих движений" #: src/libslic3r/PrintConfig.cpp:936 ->>>>>>> master msgid "" -"Filament is cooled by being moved back and forth in the cooling tubes. Specify " -"desired number of these moves." +"Filament is cooled by being moved back and forth in the cooling tubes. " +"Specify desired number of these moves." msgstr "" "Пруток охлаждаетÑÑ Ð² охлаждающих трубках путём Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰ÐµÐ½Ð¸Ñ Ð½Ð°Ð·Ð°Ð´ и вперёд. " "Укажите желаемое количеÑтво таких движений." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:721 -msgid "Speed of the first cooling move" -msgstr "СкороÑÑ‚ÑŒ первого охлаждающего движениÑ" - -#: src/libslic3r/PrintConfig.cpp:722 -msgid "Cooling moves are gradually accelerating beginning at this speed." -msgstr "Охлаждающие Ð´Ð²Ð¸Ð¶ÐµÐ½Ð¸Ñ Ð¿Ð¾Ñтепенно уÑкорÑÑŽÑ‚ÑÑ, Ð½Ð°Ñ‡Ð¸Ð½Ð°Ñ Ñ Ñтой ÑкороÑти." - -#: src/libslic3r/PrintConfig.cpp:729 -msgid "Minimal purge on wipe tower" -msgstr "Мин. объём ÑброÑа на черновой башне" - -#: src/libslic3r/PrintConfig.cpp:730 -======= #: src/libslic3r/PrintConfig.cpp:944 msgid "Speed of the first cooling move" msgstr "СкороÑÑ‚ÑŒ первого охлаждающего движениÑ" @@ -19137,39 +11826,13 @@ msgid "Minimal purge on wipe tower" msgstr "Мин. объём ÑброÑа на черновой башне" #: src/libslic3r/PrintConfig.cpp:953 ->>>>>>> master -msgid "" -"After a tool change, the exact position of the newly loaded filament inside the " -"nozzle may not be known, and the filament pressure is likely not yet stable. Before " -"purging the print head into an infill or a sacrificial object, Slic3r will always " -"prime this amount of material into the wipe tower to produce successive infill or " -"sacrificial object extrusions reliably." -msgstr "" -<<<<<<< HEAD -"ПоÑле Ñмены инÑтрумента, точное положение вновь загруженного прутка внутри него может " -"быть неизвеÑтно, и давление прутка, вероÑтно, ещё не Ñтабильно. Перед тем, как " -"очиÑтить печатающую головку в заполнение или в \"жертвенную\" модель, PrusaSlicer " -"вÑегда будет выдавливать Ñто количеÑтво материала на черновую башню, чтобы " -"обеÑпечить надёжную печать Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð¸Ð»Ð¸ \"жертвенной\" модели." - -#: src/libslic3r/PrintConfig.cpp:734 -msgid "mm³" -msgstr "мм³" - -#: src/libslic3r/PrintConfig.cpp:740 -msgid "Speed of the last cooling move" -msgstr "СкороÑÑ‚ÑŒ поÑледнего охлаждающего движениÑ" - -#: src/libslic3r/PrintConfig.cpp:741 -msgid "Cooling moves are gradually accelerating towards this speed." -msgstr "Охлаждающие Ð´Ð²Ð¸Ð¶ÐµÐ½Ð¸Ñ Ð¿Ð¾Ñтепенно уÑкорÑÑŽÑ‚ до Ñтой ÑкороÑти." - -#: src/libslic3r/PrintConfig.cpp:748 -msgid "Filament load time" -msgstr "Ð’Ñ€ÐµÐ¼Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸ плаÑтика" - -#: src/libslic3r/PrintConfig.cpp:749 -======= +msgid "" +"After a tool change, the exact position of the newly loaded filament inside " +"the nozzle may not be known, and the filament pressure is likely not yet " +"stable. Before purging the print head into an infill or a sacrificial " +"object, Slic3r will always prime this amount of material into the wipe tower " +"to produce successive infill or sacrificial object extrusions reliably." +msgstr "" "ПоÑле Ñмены инÑтрумента, точное положение вновь загруженного прутка внутри " "него может быть неизвеÑтно, и давление прутка, вероÑтно, ещё не Ñтабильно. " "Перед тем, как очиÑтить печатающую головку в заполнение или в «жертвенную» " @@ -19194,24 +11857,12 @@ msgid "Filament load time" msgstr "Ð’Ñ€ÐµÐ¼Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸ плаÑтика" #: src/libslic3r/PrintConfig.cpp:972 ->>>>>>> master msgid "" "Time for the printer firmware (or the Multi Material Unit 2.0) to load a new " -"filament during a tool change (when executing the T code). This time is added to " -"the total print time by the G-code time estimator." +"filament during a tool change (when executing the T code). This time is " +"added to the total print time by the G-code time estimator." msgstr "" "Ð’Ñ€ÐµÐ¼Ñ Ð·Ð° которое прошивка принтера (или Multi Material Unit 2.0) выгружает " -<<<<<<< HEAD -"пруток во Ð²Ñ€ÐµÐ¼Ñ Ñмены инÑтрумента (при выполнении кода Т). Ðто Ð²Ñ€ÐµÐ¼Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÑетÑÑ " -"к общему времени печати Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ алгоритма оценки времени Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ G-" -"кода." - -#: src/libslic3r/PrintConfig.cpp:756 -msgid "Ramming parameters" -msgstr "Параметры Ñ€Ñмминга" - -#: src/libslic3r/PrintConfig.cpp:757 -======= "пруток во Ð²Ñ€ÐµÐ¼Ñ Ñмены инÑтрумента (при выполнении кода Т). Ðто Ð²Ñ€ÐµÐ¼Ñ " "добавлÑетÑÑ Ðº общему времени печати Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ алгоритма оценки времени " "Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ G-кода." @@ -19221,100 +11872,50 @@ msgid "Ramming parameters" msgstr "Параметры Ñ€Ñмминга" #: src/libslic3r/PrintConfig.cpp:980 ->>>>>>> master msgid "" -"This string is edited by RammingDialog and contains ramming specific parameters." +"This string is edited by RammingDialog and contains ramming specific " +"parameters." msgstr "" "Ðта Ñтрока редактируетÑÑ Ð´Ð¸Ð°Ð»Ð¾Ð³Ð¾Ð²Ñ‹Ð¼ окном Ñ€Ñмминга и Ñодержит его конкретные " "параметры." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:763 -msgid "Filament unload time" -msgstr "Ð’Ñ€ÐµÐ¼Ñ Ð²Ñ‹Ð³Ñ€ÑƒÐ·ÐºÐ¸ плаÑтика" - -#: src/libslic3r/PrintConfig.cpp:764 -======= #: src/libslic3r/PrintConfig.cpp:986 msgid "Filament unload time" msgstr "Ð’Ñ€ÐµÐ¼Ñ Ð²Ñ‹Ð³Ñ€ÑƒÐ·ÐºÐ¸ плаÑтика" #: src/libslic3r/PrintConfig.cpp:987 ->>>>>>> master msgid "" -"Time for the printer firmware (or the Multi Material Unit 2.0) to unload a filament " -"during a tool change (when executing the T code). This time is added to the total " -"print time by the G-code time estimator." +"Time for the printer firmware (or the Multi Material Unit 2.0) to unload a " +"filament during a tool change (when executing the T code). This time is " +"added to the total print time by the G-code time estimator." msgstr "" "Ð’Ñ€ÐµÐ¼Ñ Ð·Ð° которое прошивка принтера (или Multi Material Unit 2.0) выгружает " "пруток во Ð²Ñ€ÐµÐ¼Ñ Ñмены инÑтрумента (при выполнении кода Т). Ðто Ð²Ñ€ÐµÐ¼Ñ " -<<<<<<< HEAD -"добавлÑетÑÑ Ðº общему времени печати Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ алгоритма оценки времени Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ G-" -"кода." - -#: src/libslic3r/PrintConfig.cpp:772 -======= "добавлÑетÑÑ Ðº общему времени печати Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ алгоритма оценки времени " "Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ G-кода." #: src/libslic3r/PrintConfig.cpp:995 ->>>>>>> master msgid "" -"Enter your filament diameter here. Good precision is required, so use a caliper and " -"do multiple measurements along the filament, then compute the average." +"Enter your filament diameter here. Good precision is required, so use a " +"caliper and do multiple measurements along the filament, then compute the " +"average." msgstr "" "ЗдеÑÑŒ задаётÑÑ Ð´Ð¸Ð°Ð¼ÐµÑ‚Ñ€ прутка. ТребуетÑÑ Ñ…Ð¾Ñ€Ð¾ÑˆÐ°Ñ Ñ‚Ð¾Ñ‡Ð½Ð¾ÑÑ‚ÑŒ, поÑтому " "иÑпользуйте штангенциркуль, чтобы Ñделать неÑколько измерений вдоль прутка и " "вычиÑлить Ñреднее значение." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:779 src/libslic3r/PrintConfig.cpp:2731 -#: src/libslic3r/PrintConfig.cpp:2732 -msgid "Density" -msgstr "ПлотноÑÑ‚ÑŒ" - -#: src/libslic3r/PrintConfig.cpp:780 -======= #: src/libslic3r/PrintConfig.cpp:1002 src/libslic3r/PrintConfig.cpp:3286 #: src/libslic3r/PrintConfig.cpp:3287 msgid "Density" msgstr "ПлотноÑÑ‚ÑŒ" #: src/libslic3r/PrintConfig.cpp:1003 ->>>>>>> master msgid "" -"Enter your filament density here. This is only for statistical information. A " -"decent way is to weigh a known length of filament and compute the ratio of the " -"length to volume. Better is to calculate the volume directly through displacement." +"Enter your filament density here. This is only for statistical information. " +"A decent way is to weigh a known length of filament and compute the ratio of " +"the length to volume. Better is to calculate the volume directly through " +"displacement." msgstr "" -<<<<<<< HEAD -"Введите здеÑÑŒ плотноÑÑ‚ÑŒ (г/Ñм3) иÑпользуемого марериала прутка. Ðто необходимо " -"только Ð´Ð»Ñ ÑтатиÑтичеÑкой информации. Хорошим методом ÑвлÑетÑÑ Ð²Ð·Ð²ÐµÑˆÐ¸Ð²Ð°Ð½Ð¸Ðµ куÑочка " -"прутка извеÑтной длины и вычиÑление Ð¾Ñ‚Ð½Ð¾ÑˆÐµÐ½Ð¸Ñ Ð´Ð»Ð¸Ð½Ñ‹ к его объёму. Объём же лучше " -"вычиÑлÑÑ‚ÑŒ непоÑредÑтвенно путём вытеÑÐ½ÐµÐ½Ð¸Ñ Ð¶Ð¸Ð´ÐºÐ¾Ñти." - -#: src/libslic3r/PrintConfig.cpp:783 -msgid "g/cm³" -msgstr "г/Ñм³" - -#: src/libslic3r/PrintConfig.cpp:788 -msgid "Filament type" -msgstr "Тип прутка" - -#: src/libslic3r/PrintConfig.cpp:789 -msgid "The filament material type for use in custom G-codes." -msgstr "Тип прутка Ð´Ð»Ñ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Ð² пользовательÑких G-кодах." - -#: src/libslic3r/PrintConfig.cpp:816 -msgid "Soluble material" -msgstr "РаÑтворимый материал" - -#: src/libslic3r/PrintConfig.cpp:817 -msgid "Soluble material is most likely used for a soluble support." -msgstr "РаÑтворимый материал, чаше вÑего иÑпользуют Ð´Ð»Ñ Ñ€Ð°Ñтворимой поддержки." - -#: src/libslic3r/PrintConfig.cpp:823 -======= "Введите здеÑÑŒ плотноÑÑ‚ÑŒ (г/Ñм3) иÑпользуемого марериала прутка. Ðто " "необходимо только Ð´Ð»Ñ ÑтатиÑтичеÑкой информации. Хорошим методом ÑвлÑетÑÑ " "взвешивание куÑочка прутка извеÑтной длины и вычиÑление Ð¾Ñ‚Ð½Ð¾ÑˆÐµÐ½Ð¸Ñ Ð´Ð»Ð¸Ð½Ñ‹ к " @@ -19342,24 +11943,13 @@ msgid "Soluble material is most likely used for a soluble support." msgstr "РаÑтворимый материал, чаше вÑего иÑпользуют Ð´Ð»Ñ Ñ€Ð°Ñтворимой поддержки." #: src/libslic3r/PrintConfig.cpp:1046 ->>>>>>> master msgid "" -"Enter your filament cost per kg here. This is only for statistical information." +"Enter your filament cost per kg here. This is only for statistical " +"information." msgstr "" "Введите ÑтоимоÑÑ‚ÑŒ прутка за 1 кг. Ðто необходимо только Ð´Ð»Ñ ÑтатиÑтичеÑкой " "информации." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:824 -msgid "money/kg" -msgstr "цена/кг" - -#: src/libslic3r/PrintConfig.cpp:829 -msgid "Spool weight" -msgstr "Ð’ÐµÑ Ð¿ÑƒÑтой катушки" - -#: src/libslic3r/PrintConfig.cpp:830 -======= #: src/libslic3r/PrintConfig.cpp:1047 msgid "money/kg" msgstr "цена/кг" @@ -19369,32 +11959,12 @@ msgid "Spool weight" msgstr "Ð’ÐµÑ Ð¿ÑƒÑтой катушки" #: src/libslic3r/PrintConfig.cpp:1053 ->>>>>>> master msgid "" "Enter weight of the empty filament spool. One may weigh a partially consumed " -"filament spool before printing and one may compare the measured weight with the " -"calculated weight of the filament with the spool to find out whether the amount of " -"filament on the spool is sufficient to finish the print." +"filament spool before printing and one may compare the measured weight with " +"the calculated weight of the filament with the spool to find out whether the " +"amount of filament on the spool is sufficient to finish the print." msgstr "" -<<<<<<< HEAD -"Введите Ð²ÐµÑ Ð¿ÑƒÑтой катушки. Чтобы выÑÑнить, хватит ли прутка на катушке Ð´Ð»Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¸Ñ Ð¿ÐµÑ‡Ð°Ñ‚Ð¸, " -"можно перед началом печати взвеÑить чаÑтично израÑходованную катушку Ñ Ð¿Ñ€ÑƒÑ‚ÐºÐ¾Ð¼ и Ñравнить Ñтот " -"Ð²ÐµÑ Ñ Ð²ÐµÑом прутка (Ñ ÐºÐ°Ñ‚ÑƒÑˆÐºÐ¾Ð¹), раÑÑчитанным в процеÑÑе нарезки модели." - -#: src/libslic3r/PrintConfig.cpp:834 -msgid "g" -msgstr "г" - -#: src/libslic3r/PrintConfig.cpp:843 src/libslic3r/PrintConfig.cpp:2815 -msgid "(Unknown)" -msgstr "(ÐеизвеÑтно)" - -#: src/libslic3r/PrintConfig.cpp:847 -msgid "Fill angle" -msgstr "Угол печати заполнениÑ" - -#: src/libslic3r/PrintConfig.cpp:849 -======= "Введите Ð²ÐµÑ Ð¿ÑƒÑтой катушки. Чтобы выÑÑнить, хватит ли прутка на катушке Ð´Ð»Ñ " "Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¸Ñ Ð¿ÐµÑ‡Ð°Ñ‚Ð¸, можно перед началом печати взвеÑить чаÑтично " "израÑходованную катушку Ñ Ð¿Ñ€ÑƒÑ‚ÐºÐ¾Ð¼ и Ñравнить Ñтот Ð²ÐµÑ Ñ Ð²ÐµÑом прутка (Ñ " @@ -19413,91 +11983,26 @@ msgid "Fill angle" msgstr "Угол печати заполнениÑ" #: src/libslic3r/PrintConfig.cpp:1072 ->>>>>>> master msgid "" -"Default base angle for infill orientation. Cross-hatching will be applied to this. " -"Bridges will be infilled using the best direction Slic3r can detect, so this " -"setting does not affect them." +"Default base angle for infill orientation. Cross-hatching will be applied to " +"this. Bridges will be infilled using the best direction Slic3r can detect, " +"so this setting does not affect them." msgstr "" "Базовый угол Ð´Ð»Ñ Ð¾Ñ€Ð¸ÐµÐ½Ñ‚Ð°Ñ†Ð¸Ð¸ шаблона заполнениÑ. Ð”Ð»Ñ Ñтого будет применÑÑ‚ÑŒÑÑ " -"штриховка креÑÑ‚-накреÑÑ‚. Ð”Ð»Ñ Ð¼Ð¾Ñтов будет иÑпользоватьÑÑ Ð»ÑƒÑ‡ÑˆÐ¸Ð¹ тип заполнениÑ, так " -"что Ñтот параметр не влиÑет на них." - -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:861 -msgid "Fill density" -msgstr "ПлотноÑÑ‚ÑŒ заполнениÑ" +"штриховка креÑÑ‚-накреÑÑ‚. Ð”Ð»Ñ Ð¼Ð¾Ñтов будет иÑпользоватьÑÑ Ð»ÑƒÑ‡ÑˆÐ¸Ð¹ тип " +"заполнениÑ, так что Ñтот параметр не влиÑет на них." -#: src/libslic3r/PrintConfig.cpp:863 -======= #: src/libslic3r/PrintConfig.cpp:1084 msgid "Fill density" msgstr "ПлотноÑÑ‚ÑŒ заполнениÑ" #: src/libslic3r/PrintConfig.cpp:1086 ->>>>>>> master msgid "Density of internal infill, expressed in the range 0% - 100%." msgstr "" "ПлотноÑÑ‚ÑŒ внутреннего заполнениÑ, Ð²Ñ‹Ñ€Ð°Ð¶ÐµÐ½Ð½Ð°Ñ Ð² диапазоне 0% - 100%. Чем выше " "процент заполнениÑ, тем крепче получаетÑÑ Ð¼Ð¾Ð´ÐµÐ»ÑŒ, но печатаетÑÑ Ð¾Ð½Ð° при Ñтом " "гораздо дольше." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:898 -msgid "Fill pattern" -msgstr "Шаблон заполнениÑ" - -#: src/libslic3r/PrintConfig.cpp:900 -msgid "Fill pattern for general low-density infill." -msgstr "Задаёт то каким риÑунком будет напечатано заполнение." - -#: src/libslic3r/PrintConfig.cpp:920 -msgid "Grid" -msgstr "Сетка" - -#: src/libslic3r/PrintConfig.cpp:921 -msgid "Triangles" -msgstr "Треугольники" - -#: src/libslic3r/PrintConfig.cpp:922 -msgid "Stars" -msgstr "Звезды" - -#: src/libslic3r/PrintConfig.cpp:923 -msgid "Cubic" -msgstr "КубичеÑкий" - -#: src/libslic3r/PrintConfig.cpp:924 -msgid "Line" -msgstr "Линии" - -#: src/libslic3r/PrintConfig.cpp:926 src/libslic3r/PrintConfig.cpp:2238 -msgid "Honeycomb" -msgstr "Медовые Ñоты" - -#: src/libslic3r/PrintConfig.cpp:927 -msgid "3D Honeycomb" -msgstr "3D Ñоты" - -#: src/libslic3r/PrintConfig.cpp:928 -msgid "Gyroid" -msgstr "Гироидный" - -#: src/libslic3r/PrintConfig.cpp:932 -msgid "Adaptive Cubic" -msgstr "ДинамичеÑкий куб" - -#: src/libslic3r/PrintConfig.cpp:933 -msgid "Support Cubic" -msgstr "Динам. куб. поддержка" - -#: src/libslic3r/PrintConfig.cpp:937 src/libslic3r/PrintConfig.cpp:946 -#: src/libslic3r/PrintConfig.cpp:956 src/libslic3r/PrintConfig.cpp:990 -msgid "First layer" -msgstr "Первый Ñлой" - -#: src/libslic3r/PrintConfig.cpp:938 -======= #: src/libslic3r/PrintConfig.cpp:1121 msgid "Fill pattern" msgstr "Шаблон заполнениÑ" @@ -19547,21 +12052,13 @@ msgid "Lightning" msgstr "МолниÑ" #: src/libslic3r/PrintConfig.cpp:1167 ->>>>>>> master msgid "" -"This is the acceleration your printer will use for first layer. Set zero to disable " -"acceleration control for first layer." +"This is the acceleration your printer will use for first layer. Set zero to " +"disable acceleration control for first layer." msgstr "" -"УÑкорение, которое принтер будет иÑпользовать Ð´Ð»Ñ Ð¿ÐµÑ‡Ð°Ñ‚Ð¸ первого ÑлоÑ. УÑтановить " -"0, чтобы отключить управление уÑкорением Ð´Ð»Ñ Ð¿ÐµÑ€Ð²Ð¾Ð³Ð¾ ÑлоÑ." - -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:947 -msgid "First layer bed temperature" -msgstr "Температура Ñтола на первом Ñлое" +"УÑкорение, которое принтер будет иÑпользовать Ð´Ð»Ñ Ð¿ÐµÑ‡Ð°Ñ‚Ð¸ первого ÑлоÑ. " +"УÑтановить 0, чтобы отключить управление уÑкорением Ð´Ð»Ñ Ð¿ÐµÑ€Ð²Ð¾Ð³Ð¾ ÑлоÑ." -#: src/libslic3r/PrintConfig.cpp:948 -======= #: src/libslic3r/PrintConfig.cpp:1175 msgid "First object layer over raft interface" msgstr "Первый Ñлой модели на подложке" @@ -19581,51 +12078,21 @@ msgid "First layer bed temperature" msgstr "Температура Ñтола на первом Ñлое" #: src/libslic3r/PrintConfig.cpp:1186 ->>>>>>> master msgid "" -"Heated build plate temperature for the first layer. Set this to zero to disable bed " -"temperature control commands in the output." +"Heated build plate temperature for the first layer. Set this to zero to " +"disable bed temperature control commands in the output." msgstr "" -<<<<<<< HEAD -"Температура подогреваемого Ñтола Ð´Ð»Ñ Ð¿ÐµÑ€Ð²Ð¾Ð³Ð¾ ÑлоÑ. УÑтановите 0, чтобы отключить " -"команды ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ñ‚ÐµÐ¼Ð¿ÐµÑ€Ð°Ñ‚ÑƒÑ€Ð¾Ð¹ Ñтола на выходе." - -#: src/libslic3r/PrintConfig.cpp:958 -======= "Температура подогреваемого Ñтола Ð´Ð»Ñ Ð¿ÐµÑ€Ð²Ð¾Ð³Ð¾ ÑлоÑ. УÑтановите 0, чтобы " "отключить команды ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ñ‚ÐµÐ¼Ð¿ÐµÑ€Ð°Ñ‚ÑƒÑ€Ð¾Ð¹ Ñтола на выходе." #: src/libslic3r/PrintConfig.cpp:1196 ->>>>>>> master msgid "" -"Set this to a non-zero value to set a manual extrusion width for first layer. You " -"can use this to force fatter extrudates for better adhesion. If expressed as " -"percentage (for example 120%) it will be computed over first layer height. If set " -"to zero, it will use the default extrusion width." +"Set this to a non-zero value to set a manual extrusion width for first " +"layer. You can use this to force fatter extrudates for better adhesion. If " +"expressed as percentage (for example 120%) it will be computed over first " +"layer height. If set to zero, it will use the default extrusion width." msgstr "" "УÑтановите значение отличное от 0, чтобы вручную задать ширину ÑкÑтрузии Ð´Ð»Ñ " -<<<<<<< HEAD -"первого ÑлоÑ. Ð’Ñ‹ можете поÑтавить большее значение, чем по умолчанию, Ð´Ð»Ñ Ð»ÑƒÑ‡ÑˆÐµÐ¹ " -"адгезии. ЕÑли задано в процентах, параметр вычиÑлÑетÑÑ Ð¾Ñ‚Ð½Ð¾Ñительно выÑоты ÑлоÑ. " -"При 0, будет иÑпользоватьÑÑ \"Ширина ÑкÑтрузии по умолчанию\"." - -#: src/libslic3r/PrintConfig.cpp:971 -msgid "" -"When printing with very low layer heights, you might still want to print a thicker " -"bottom layer to improve adhesion and tolerance for non perfect build plates. This " -"can be expressed as an absolute value or as a percentage (for example: 150%) over " -"the default layer height." -msgstr "" -"Ð’Ñ‹Ñота первого (Ñамого нижнего) ÑлоÑ. Как правило, задаётÑÑ Ð½ÐµÐ¼Ð½Ð¾Ð³Ð¾ больше \"Ð’Ñ‹Ñота " -"ÑлоÑ\" Ð´Ð»Ñ Ð»ÑƒÑ‡ÑˆÐµÐ³Ð¾ Ð·Ð°ÐºÑ€ÐµÐ¿Ð»ÐµÐ½Ð¸Ñ (адгезии) модели на Ñтоле. Ðта величина так же не " -"может быть больше диаметра Ñопла." - -#: src/libslic3r/PrintConfig.cpp:980 -msgid "First layer speed" -msgstr "СкороÑÑ‚ÑŒ печати первого ÑлоÑ" - -#: src/libslic3r/PrintConfig.cpp:981 -======= "первого ÑлоÑ. Ð’Ñ‹ можете поÑтавить большее значение, чем по умолчанию, Ð´Ð»Ñ " "лучшей адгезии. ЕÑли задано в процентах, параметр вычиÑлÑетÑÑ Ð¾Ñ‚Ð½Ð¾Ñительно " "выÑоты ÑлоÑ. При 0, будет иÑпользоватьÑÑ Â«Ð¨Ð¸Ñ€Ð¸Ð½Ð° ÑкÑтрузии по умолчанию»." @@ -19645,39 +12112,11 @@ msgid "First layer speed" msgstr "СкороÑÑ‚ÑŒ печати первого ÑлоÑ" #: src/libslic3r/PrintConfig.cpp:1219 ->>>>>>> master -msgid "" -"If expressed as absolute value in mm/s, this speed will be applied to all the print " -"moves of the first layer, regardless of their type. If expressed as a percentage " -"(for example: 40%) it will scale the default speeds." -msgstr "" -<<<<<<< HEAD -"ЕÑли задано в абÑолютном значении (мм/Ñ), Ñта ÑкороÑÑ‚ÑŒ будет применена ко вÑем " -"перемещениÑм при печати первого ÑлоÑ, незавиÑимо от их типа. ЕÑли задано в " -"процентах, параметр вычиÑлÑетÑÑ Ð¾Ñ‚Ð½Ð¾Ñительно выÑтавленных ÑкороÑтей по умолчанию. " -"Как правило, Ð´Ð»Ñ Ð»ÑƒÑ‡ÑˆÐµÐ³Ð¾ Ð¿Ñ€Ð¸Ð»Ð¸Ð¿Ð°Ð½Ð¸Ñ Ð¼Ð¾Ð´ÐµÐ»Ð¸ к Ñтолу задаётÑÑ Ð¼ÐµÐ½ÑŒÑˆÐµ оÑтальных на " -"30-50%." - -#: src/libslic3r/PrintConfig.cpp:991 -msgid "First layer nozzle temperature" -msgstr "Температура Ñопла на первом Ñлое" - -#: src/libslic3r/PrintConfig.cpp:992 msgid "" -"Nozzle temperature for the first layer. If you want to control temperature manually " -"during print, set this to zero to disable temperature control commands in the " -"output G-code." +"If expressed as absolute value in mm/s, this speed will be applied to all " +"the print moves of the first layer, regardless of their type. If expressed " +"as a percentage (for example: 40%) it will scale the default speeds." msgstr "" -"Температура Ñопла при печати первого ÑлоÑ. ЕÑли хотите контролировать температуру " -"во Ð²Ñ€ÐµÐ¼Ñ Ð¿ÐµÑ‡Ð°Ñ‚Ð¸ вручную, уÑтановите 0 Ð´Ð»Ñ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´ ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ñ‚ÐµÐ¼Ð¿ÐµÑ€Ð°Ñ‚ÑƒÑ€Ð¾Ð¹ " -"в выходном G-коде." - -#: src/libslic3r/PrintConfig.cpp:1000 -msgid "Full fan speed at layer" -msgstr "ÐŸÐ¾Ð»Ð½Ð°Ñ ÑкороÑÑ‚ÑŒ вентилÑтора на Ñлое" - -#: src/libslic3r/PrintConfig.cpp:1001 -======= "ЕÑли задано в абÑолютном значении (мм/Ñ), Ñта ÑкороÑÑ‚ÑŒ будет применена ко " "вÑем перемещениÑм при печати первого ÑлоÑ, незавиÑимо от их типа. ЕÑли " "задано в процентах, параметр вычиÑлÑетÑÑ Ð¾Ñ‚Ð½Ð¾Ñительно выÑтавленных ÑкороÑтей " @@ -19706,50 +12145,11 @@ msgid "First layer nozzle temperature" msgstr "Температура Ñопла на первом Ñлое" #: src/libslic3r/PrintConfig.cpp:1241 ->>>>>>> master -msgid "" -"Fan speed will be ramped up linearly from zero at layer \"disable_fan_first_layers" -"\" to maximum at layer \"full_fan_speed_layer\". \"full_fan_speed_layer\" will be " -"ignored if lower than \"disable_fan_first_layers\", in which case the fan will be " -"running at maximum allowed speed at layer \"disable_fan_first_layers\" + 1." -msgstr "" -<<<<<<< HEAD -"СкороÑÑ‚ÑŒ вентилÑтора будет линейно увеличиватьÑÑ Ð¾Ñ‚ Ð½ÑƒÐ»Ñ Ð½Ð° Ñлое " -"«disable_fan_first_layers» до макÑимальной на Ñлое «full_fan_speed_layer». " -"\"full_fan_speed_layer\" будет игнорироватьÑÑ, еÑли она ниже, чем " -"\"disable_fan_first_layers\", и в Ñтом Ñлучае вентилÑтор будет работать Ñ " -"макÑимально допуÑтимой ÑкороÑтью на Ñлое \"disable_fan_first_layers\" +1." - -#: src/libslic3r/PrintConfig.cpp:1013 msgid "" -"Speed for filling small gaps using short zigzag moves. Keep this reasonably low to " -"avoid too much shaking and resonance issues. Set zero to disable gaps filling." +"Nozzle temperature for the first layer. If you want to control temperature " +"manually during print, set this to zero to disable temperature control " +"commands in the output G-code." msgstr "" -"СкороÑÑ‚ÑŒ Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð½ÐµÐ±Ð¾Ð»ÑŒÑˆÐ¸Ñ… поверхноÑтей (пробелов). Печать проиÑходит быÑтрыми " -"зигзагообразными движениÑми, в результате, веÑÑŒ принтер может прилично Ñ‚Ñ€ÑÑти. " -"Задавайте низкие значениÑ, чтобы избежать Ñтого. УÑтановите 0, чтобы отключить " -"заполнение пробелов." - -#: src/libslic3r/PrintConfig.cpp:1021 -msgid "Verbose G-code" -msgstr "Подробный G-код" - -#: src/libslic3r/PrintConfig.cpp:1022 -msgid "" -"Enable this to get a commented G-code file, with each line explained by a " -"descriptive text. If you print from SD card, the additional weight of the file " -"could make your firmware slow down." -msgstr "" -"Включите Ñту опцию, чтобы в каждой Ñтроке G-код файла, приÑутÑтвовал комментарий Ñ " -"поÑÑнÑющим текÑтом. При печати Ñ SD-карты, ÑкороÑÑ‚ÑŒ чтение данных вашей прошивкой " -"может ÑнизитÑÑ Ð·Ð° Ñчёт ÑƒÐ²ÐµÐ»Ð¸Ñ‡ÐµÐ½Ð¸Ñ Ñ€Ð°Ð·Ð¼ÐµÑ€Ð° файла." - -#: src/libslic3r/PrintConfig.cpp:1029 -msgid "G-code flavor" -msgstr "Тип G-кода" - -#: src/libslic3r/PrintConfig.cpp:1030 -======= "Температура Ñопла при печати первого ÑлоÑ. ЕÑли хотите контролировать " "температуру во Ð²Ñ€ÐµÐ¼Ñ Ð¿ÐµÑ‡Ð°Ñ‚Ð¸ вручную, уÑтановите 0 Ð´Ð»Ñ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´ " "ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ñ‚ÐµÐ¼Ð¿ÐµÑ€Ð°Ñ‚ÑƒÑ€Ð¾Ð¹ в выходном G-коде." @@ -19852,29 +12252,12 @@ msgid "G-code flavor" msgstr "Тип G-кода" #: src/libslic3r/PrintConfig.cpp:1321 ->>>>>>> master msgid "" "Some G/M-code commands, including temperature control and others, are not " -"universal. Set this option to your printer's firmware to get a compatible output. " -"The \"No extrusion\" flavor prevents PrusaSlicer from exporting any extrusion value " -"at all." +"universal. Set this option to your printer's firmware to get a compatible " +"output. The \"No extrusion\" flavor prevents PrusaSlicer from exporting any " +"extrusion value at all." msgstr "" -<<<<<<< HEAD -"Ðекоторые команды G/M-кода, такие как контроль температуры и другие, не ÑвлÑÑŽÑ‚ÑÑ " -"универÑальными. Выберите тип прошивки вашего принтера, чтобы получить " -"ÑовмеÑтимоÑÑ‚ÑŒ. Параметр \"Без ÑкÑтрузии\" не позволÑет PrusaSlicer ÑкÑпортировать " -"какие-либо Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ ÑкÑтрузии." - -#: src/libslic3r/PrintConfig.cpp:1055 -msgid "No extrusion" -msgstr "Без ÑкÑтрузии" - -#: src/libslic3r/PrintConfig.cpp:1060 -msgid "Label objects" -msgstr "Ðазвание моделей" - -#: src/libslic3r/PrintConfig.cpp:1061 -======= "Ðекоторые команды G/M-кода, такие как контроль температуры и другие, не " "ÑвлÑÑŽÑ‚ÑÑ ÑƒÐ½Ð¸Ð²ÐµÑ€Ñальными. Выберите тип прошивки вашего принтера, чтобы " "получить ÑовмеÑтимоÑÑ‚ÑŒ. Параметр «Без ÑкÑтрузии» не позволÑет PrusaSlicer " @@ -19889,25 +12272,12 @@ msgid "Label objects" msgstr "Ðазвание моделей" #: src/libslic3r/PrintConfig.cpp:1354 ->>>>>>> master msgid "" -"Enable this to add comments into the G-Code labeling print moves with what object " -"they belong to, which is useful for the Octoprint CancelObject plugin. This " -"settings is NOT compatible with Single Extruder Multi Material setup and Wipe into " -"Object / Wipe into Infill." +"Enable this to add comments into the G-Code labeling print moves with what " +"object they belong to, which is useful for the Octoprint CancelObject " +"plugin. This settings is NOT compatible with Single Extruder Multi Material " +"setup and Wipe into Object / Wipe into Infill." msgstr "" -<<<<<<< HEAD -"Включите Ñту опцию, чтобы добавить комментарии в G-код Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð¸ÐµÐ¼ того, к какой " -"модели он принадлежит, что полезно Ð´Ð»Ñ Ð¿Ð»Ð°Ð³Ð¸Ð½Ð° Octoprint CancelObject. Ðта " -"наÑтройка не ÑовмеÑтима Ñ Ð½Ð°Ñтройкой \"Мультиматериальный одиночный ÑкÑтрудер\" и " -"\"ОчиÑтка в модель\" / \"ОчиÑтка в заполнение модели\"." - -#: src/libslic3r/PrintConfig.cpp:1068 -msgid "High extruder current on filament swap" -msgstr "Повышение тока ÑкÑтрудера при замене прутка" - -#: src/libslic3r/PrintConfig.cpp:1069 -======= "Включите Ñту опцию, чтобы добавить комментарии в G-код Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð¸ÐµÐ¼ того, к " "какой модели он принадлежит, что полезно Ð´Ð»Ñ Ð¿Ð»Ð°Ð³Ð¸Ð½Ð° Octoprint CancelObject. " "Ðта наÑтройка не ÑовмеÑтима Ñ Ð½Ð°Ñтройкой «Мультиматериальный одиночный " @@ -19926,136 +12296,42 @@ msgid "High extruder current on filament swap" msgstr "Повышение тока ÑкÑтрудера при замене прутка" #: src/libslic3r/PrintConfig.cpp:1368 ->>>>>>> master msgid "" -"It may be beneficial to increase the extruder motor current during the filament " -"exchange sequence to allow for rapid ramming feed rates and to overcome resistance " -"when loading a filament with an ugly shaped tip." +"It may be beneficial to increase the extruder motor current during the " +"filament exchange sequence to allow for rapid ramming feed rates and to " +"overcome resistance when loading a filament with an ugly shaped tip." msgstr "" -<<<<<<< HEAD -"Ðто может быть полезно Ð´Ð»Ñ ÑƒÐ²ÐµÐ»Ð¸Ñ‡ÐµÐ½Ð¸Ñ Ñ‚Ð¾ÐºÐ° Ð´Ð²Ð¸Ð³Ð°Ñ‚ÐµÐ»Ñ ÑкÑтрудера во Ð²Ñ€ÐµÐ¼Ñ Ð·Ð°Ð¼ÐµÐ½Ñ‹ " -"прутка, чтобы быÑтро увеличить ÑкороÑÑ‚ÑŒ подачи и преодолеть Ñопротивление " -"при загрузке прутка Ñ Ð¿Ð»Ð¾Ñ…Ð¾Ð¹ формой кончика." - -#: src/libslic3r/PrintConfig.cpp:1077 -======= "Ðто может быть полезно Ð´Ð»Ñ ÑƒÐ²ÐµÐ»Ð¸Ñ‡ÐµÐ½Ð¸Ñ Ñ‚Ð¾ÐºÐ° Ð´Ð²Ð¸Ð³Ð°Ñ‚ÐµÐ»Ñ ÑкÑтрудера во Ð²Ñ€ÐµÐ¼Ñ " "замены прутка, чтобы быÑтро увеличить ÑкороÑÑ‚ÑŒ подачи и преодолеть " "Ñопротивление при загрузке прутка Ñ Ð¿Ð»Ð¾Ñ…Ð¾Ð¹ формой кончика." #: src/libslic3r/PrintConfig.cpp:1376 ->>>>>>> master msgid "" -"This is the acceleration your printer will use for infill. Set zero to disable " -"acceleration control for infill." +"This is the acceleration your printer will use for infill. Set zero to " +"disable acceleration control for infill." msgstr "" -"УÑкорение, которое принтер будет иÑпользовать Ð´Ð»Ñ Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ. УÑтановить 0, чтобы " -"отключить управление уÑкорением Ð´Ð»Ñ Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ." - -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1085 -msgid "Combine infill every" -msgstr "ОбъединÑÑ‚ÑŒ заполнение каждые" +"УÑкорение, которое принтер будет иÑпользовать Ð´Ð»Ñ Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ. УÑтановить 0, " +"чтобы отключить управление уÑкорением Ð´Ð»Ñ Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ." -#: src/libslic3r/PrintConfig.cpp:1087 -======= #: src/libslic3r/PrintConfig.cpp:1384 msgid "Combine infill every" msgstr "ОбъединÑÑ‚ÑŒ заполнение каждые" #: src/libslic3r/PrintConfig.cpp:1386 ->>>>>>> master msgid "" -"This feature allows to combine infill and speed up your print by extruding thicker " -"infill layers while preserving thin perimeters, thus accuracy." +"This feature allows to combine infill and speed up your print by extruding " +"thicker infill layers while preserving thin perimeters, thus accuracy." msgstr "" -"Ð”Ð»Ñ Ñкономии времени печати еÑÑ‚ÑŒ возможноÑÑ‚ÑŒ печатать заполнение не на каждом Ñлое, " -"а Ñкажем, на двух или трёх ÑлоÑÑ… Ñразу. По умолчанию Ñтоит 1, то еÑÑ‚ÑŒ печатать " -"заполнение в каждом Ñлое. ЕÑли, например, поÑтавить 2, тогда на два ÑÐ»Ð¾Ñ Ð¿ÐµÑ€Ð¸Ð¼ÐµÑ‚Ñ€Ð° " -"будет печататьÑÑ Ð¾Ð´Ð¸Ð½ Ñлой Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ ÑƒÐ´Ð²Ð¾ÐµÐ½Ð½Ð¾Ð¹ толщины. При Ñтом ÑохранÑÑŽÑ‚ÑÑ " -"тонкие периметры, и тем Ñамым точноÑÑ‚ÑŒ." +"Ð”Ð»Ñ Ñкономии времени печати еÑÑ‚ÑŒ возможноÑÑ‚ÑŒ печатать заполнение не на " +"каждом Ñлое, а Ñкажем, на двух или трёх ÑлоÑÑ… Ñразу. По умолчанию Ñтоит 1, " +"то еÑÑ‚ÑŒ печатать заполнение в каждом Ñлое. ЕÑли, например, поÑтавить 2, " +"тогда на два ÑÐ»Ð¾Ñ Ð¿ÐµÑ€Ð¸Ð¼ÐµÑ‚Ñ€Ð° будет печататьÑÑ Ð¾Ð´Ð¸Ð½ Ñлой Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ ÑƒÐ´Ð²Ð¾ÐµÐ½Ð½Ð¾Ð¹ " +"толщины. При Ñтом ÑохранÑÑŽÑ‚ÑÑ Ñ‚Ð¾Ð½ÐºÐ¸Ðµ периметры, и тем Ñамым точноÑÑ‚ÑŒ." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1090 -======= #: src/libslic3r/PrintConfig.cpp:1389 ->>>>>>> master msgid "Combine infill every n layers" -msgstr "" -"ОбъединÑÑ‚ÑŒ заполнение каждые" - -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1096 -msgid "Length of the infill anchor" -msgstr "Длина привÑзок разреженного заполнениÑ" - -#: src/libslic3r/PrintConfig.cpp:1098 -msgid "" -"Connect an infill line to an internal perimeter with a short segment of an " -"additional perimeter. If expressed as percentage (example: 15%) it is calculated " -"over infill extrusion width. PrusaSlicer tries to connect two close infill lines to " -"a short perimeter segment. If no such perimeter segment shorter than " -"infill_anchor_max is found, the infill line is connected to a perimeter segment at " -"just one side and the length of the perimeter segment taken is limited to this " -"parameter, but no longer than anchor_length_max. Set this parameter to zero to " -"disable anchoring perimeters connected to a single infill line." -msgstr "" -"СоединÑÑ‚ÑŒ линию Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ñ Ð²Ð½ÑƒÑ‚Ñ€ÐµÐ½Ð½Ð¸Ð¼ периметром Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ короткого отрезка " -"дополнительного периметра (привÑзок). ЕÑли выражено в процентах (например 15%), то " -"она вычиÑлÑетÑÑ Ð¿Ð¾ ширине ÑкÑтрузии заполнениÑ. PrusaSlicer пытаетÑÑ Ñоединить две " -"ближайшие линии Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ñ ÐºÐ¾Ñ€Ð¾Ñ‚ÐºÐ¸Ð¼ отрезком периметра. ЕÑли не найдено такого " -"отрезка периметра короче \"МакÑимальной длины привÑзок разреженного заполнениÑ" -"\" (anchor_length_max), то Ð»Ð¸Ð½Ð¸Ñ Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ ÑоединÑетÑÑ Ñ Ð¾Ñ‚Ñ€ÐµÐ·ÐºÐ¾Ð¼ периметра только " -"Ñ Ð¾Ð´Ð½Ð¾Ð¹ Ñтороны, а длина отрезка периметра ограничена Ñтим параметром, но не больше " -"\"МакÑимальной длины привÑзок разреженного заполнениÑ\" (anchor_length_max). " -"УÑтановите Ñтот параметр равным нулю Ð´Ð»Ñ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¸Ð²Ñзок периметров, " -"Ñоединённых к одной линии заполнениÑ." - -#: src/libslic3r/PrintConfig.cpp:1113 -msgid "0 (no open anchors)" -msgstr "0 (нет открытых привÑзок)" - -#: src/libslic3r/PrintConfig.cpp:1118 src/libslic3r/PrintConfig.cpp:1140 -msgid "1000 (unlimited)" -msgstr "1000 (неограниченно)" - -#: src/libslic3r/PrintConfig.cpp:1123 -msgid "Maximum length of the infill anchor" -msgstr "МакÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ Ð´Ð»Ð¸Ð½Ð° привÑзок разреженного заполнениÑ" - -#: src/libslic3r/PrintConfig.cpp:1125 -msgid "" -"Connect an infill line to an internal perimeter with a short segment of an " -"additional perimeter. If expressed as percentage (example: 15%) it is calculated " -"over infill extrusion width. PrusaSlicer tries to connect two close infill lines to " -"a short perimeter segment. If no such perimeter segment shorter than this parameter " -"is found, the infill line is connected to a perimeter segment at just one side and " -"the length of the perimeter segment taken is limited to infill_anchor, but no " -"longer than this parameter. Set this parameter to zero to disable anchoring." -msgstr "" -"СоединÑÑ‚ÑŒ линию Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ñ Ð²Ð½ÑƒÑ‚Ñ€ÐµÐ½Ð½Ð¸Ð¼ периметром Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ короткого отрезка " -"дополнительного периметра (привÑзок). ЕÑли выражено в процентах (например 15%), то " -"она вычиÑлÑетÑÑ Ð¿Ð¾ ширине ÑкÑтрузии заполнениÑ. PrusaSlicer пытаетÑÑ Ñоединить две " -"ближайшие линии Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ñ ÐºÐ¾Ñ€Ð¾Ñ‚ÐºÐ¸Ð¼ отрезком периметра. ЕÑли не найдено такого " -"отрезка периметра короче Ñтого параметра, Ð»Ð¸Ð½Ð¸Ñ Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ ÑоединÑетÑÑ Ñ Ð¾Ñ‚Ñ€ÐµÐ·ÐºÐ¾Ð¼ " -"периметра только Ñ Ð¾Ð´Ð½Ð¾Ð¹ Ñтороны, а длина отрезка периметра ограничена \"Длиной " -"привÑзок разреженного заполнениÑ\" (infill_anchor), но не больше Ñтого параметра. " -"УÑтановите Ñтот параметр равным нулю Ð´Ð»Ñ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¸Ð²Ñзок." - -#: src/libslic3r/PrintConfig.cpp:1135 -msgid "0 (not anchored)" -msgstr "0 (без привÑзок)" - -#: src/libslic3r/PrintConfig.cpp:1145 -msgid "Infill extruder" -msgstr "ÐкÑтрудер заполнениÑ" - -#: src/libslic3r/PrintConfig.cpp:1147 -msgid "The extruder to use when printing infill." -msgstr "Ðомер ÑкÑтрудера, которым печатаетÑÑ Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ðµ." +msgstr "ОбъединÑÑ‚ÑŒ заполнение каждые" -#: src/libslic3r/PrintConfig.cpp:1155 -======= #: src/libslic3r/PrintConfig.cpp:1395 msgid "Length of the infill anchor" msgstr "Длина привÑзок разреженного заполнениÑ" @@ -20146,28 +12422,14 @@ msgid "The extruder to use when printing infill." msgstr "Ðомер ÑкÑтрудера, которым печатаетÑÑ Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ðµ." #: src/libslic3r/PrintConfig.cpp:1456 ->>>>>>> master msgid "" -"Set this to a non-zero value to set a manual extrusion width for infill. If left " -"zero, default extrusion width will be used if set, otherwise 1.125 x nozzle " -"diameter will be used. You may want to use fatter extrudates to speed up the infill " -"and make your parts stronger. If expressed as percentage (for example 90%) it will " -"be computed over layer height." +"Set this to a non-zero value to set a manual extrusion width for infill. If " +"left zero, default extrusion width will be used if set, otherwise 1.125 x " +"nozzle diameter will be used. You may want to use fatter extrudates to speed " +"up the infill and make your parts stronger. If expressed as percentage (for " +"example 90%) it will be computed over layer height." msgstr "" "УÑтановите значение отличное от 0, чтобы вручную задать ширину ÑкÑтрузии Ð´Ð»Ñ " -<<<<<<< HEAD -"заполнениÑ. ЕÑли оÑтавить 0, будет иÑпользоватьÑÑ \"Ширина ÑкÑтрузии по умолчанию\" " -"- еÑли она задана, в противном Ñлучае будет иÑпользоватьÑÑ 1,125 x диаметра Ñопла. " -"Ð’Ñ‹ можете иÑпользовать Ñопла большего диаметра, чтобы уÑкорить заполнение и Ñделать " -"ваши детали прочнее. ЕÑли задано в процентах, параметр вычиÑлÑетÑÑ Ð¾Ñ‚Ð½Ð¾Ñительно " -"выÑоты ÑлоÑ." - -#: src/libslic3r/PrintConfig.cpp:1165 -msgid "Infill before perimeters" -msgstr "Сначала печатать заполнение" - -#: src/libslic3r/PrintConfig.cpp:1166 -======= "заполнениÑ. ЕÑли оÑтавить 0, будет иÑпользоватьÑÑ Â«Ð¨Ð¸Ñ€Ð¸Ð½Ð° ÑкÑтрузии по " "умолчанию» - еÑли она задана, в противном Ñлучае будет иÑпользоватьÑÑ 1,125 " "x диаметра Ñопла. Ð’Ñ‹ можете иÑпользовать Ñопла большего диаметра, чтобы " @@ -20179,22 +12441,11 @@ msgid "Infill before perimeters" msgstr "Сначала печатать заполнение" #: src/libslic3r/PrintConfig.cpp:1468 ->>>>>>> master msgid "" -"This option will switch the print order of perimeters and infill, making the latter " -"first." +"This option will switch the print order of perimeters and infill, making the " +"latter first." msgstr "" "ИзменÑет порÑдок печати Ñлоёв. Обычно Ñначала печатаетÑÑ Ð¿ÐµÑ€Ð¸Ð¼ÐµÑ‚Ñ€, а потом " -<<<<<<< HEAD -"заполнение. Включив Ñтот параметр, Ñначала будет печататьÑÑ Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ðµ, а потом " -"периметр. Имеет ÑмыÑл, еÑли периметр печатаетÑÑ Ð² один Ñлой." - -#: src/libslic3r/PrintConfig.cpp:1171 -msgid "Only infill where needed" -msgstr "Заполнение только там, где нужно" - -#: src/libslic3r/PrintConfig.cpp:1173 -======= "заполнение. Включив Ñтот параметр, Ñначала будет печататьÑÑ Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ðµ, а " "потом периметр. Имеет ÑмыÑл, еÑли периметр печатаетÑÑ Ð² один Ñлой." @@ -20203,25 +12454,11 @@ msgid "Only infill where needed" msgstr "Заполнение только там, где нужно" #: src/libslic3r/PrintConfig.cpp:1475 ->>>>>>> master msgid "" -"This option will limit infill to the areas actually needed for supporting ceilings " -"(it will act as internal support material). If enabled, slows down the G-code " -"generation due to the multiple checks involved." +"This option will limit infill to the areas actually needed for supporting " +"ceilings (it will act as internal support material). If enabled, slows down " +"the G-code generation due to the multiple checks involved." msgstr "" -<<<<<<< HEAD -"PrusaSlicer проанализирует модель и выберет где именно необходимо заполнение Ð´Ð»Ñ " -"того, чтобы поддержать внутренние потолки и ÑвеÑÑ‹. Полезно Ð´Ð»Ñ ÑƒÐ¼ÐµÐ½ÑŒÑˆÐµÐ½Ð¸Ñ Ð²Ñ€ÐµÐ¼ÐµÐ½Ð¸ и " -"материалов, но параметр очень влиÑет на прочноÑÑ‚ÑŒ модели, поÑтому пользоватьÑÑ Ð½Ð°Ð´Ð¾ " -"Ñ Ð¾ÑторожноÑтью. ЕÑли включено, замедлÑет генерацию G-кода из-за многочиÑленных " -"раÑчётов." - -#: src/libslic3r/PrintConfig.cpp:1180 -msgid "Infill/perimeters overlap" -msgstr "Перекрытие линий Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ñ Ð»Ð¸Ð½Ð¸Ñми периметра" - -#: src/libslic3r/PrintConfig.cpp:1182 -======= "PrusaSlicer проанализирует модель и выберет где именно необходимо заполнение " "Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, чтобы поддержать внутренние потолки и ÑвеÑÑ‹. Полезно Ð´Ð»Ñ " "ÑƒÐ¼ÐµÐ½ÑŒÑˆÐµÐ½Ð¸Ñ Ð²Ñ€ÐµÐ¼ÐµÐ½Ð¸ и материалов, но параметр очень влиÑет на прочноÑÑ‚ÑŒ " @@ -20233,43 +12470,24 @@ msgid "Infill/perimeters overlap" msgstr "Перекрытие линий Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ñ Ð»Ð¸Ð½Ð¸Ñми периметра" #: src/libslic3r/PrintConfig.cpp:1484 ->>>>>>> master msgid "" -"This setting applies an additional overlap between infill and perimeters for better " -"bonding. Theoretically this shouldn't be needed, but backlash might cause gaps. If " -"expressed as percentage (example: 15%) it is calculated over perimeter extrusion " -"width." +"This setting applies an additional overlap between infill and perimeters for " +"better bonding. Theoretically this shouldn't be needed, but backlash might " +"cause gaps. If expressed as percentage (example: 15%) it is calculated over " +"perimeter extrusion width." msgstr "" -"Параметр указывает на Ñколько миллиметров или процентов печать Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð±ÑƒÐ´ÐµÑ‚ " -"перекрывать периметры Ð´Ð»Ñ Ð»ÑƒÑ‡ÑˆÐµÐ³Ð¾ ÑоединениÑ. ТеоретичеÑки надобноÑти в Ñтом нет, " -"но люфты при движении могут вызывать пробелы при печати. ЕÑли задано в процентах, " -"параметр вычиÑлÑетÑÑ Ð¾Ñ‚Ð½Ð¾Ñительно ширины ÑкÑтрузии периметра." +"Параметр указывает на Ñколько миллиметров или процентов печать Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ " +"будет перекрывать периметры Ð´Ð»Ñ Ð»ÑƒÑ‡ÑˆÐµÐ³Ð¾ ÑоединениÑ. ТеоретичеÑки надобноÑти " +"в Ñтом нет, но люфты при движении могут вызывать пробелы при печати. ЕÑли " +"задано в процентах, параметр вычиÑлÑетÑÑ Ð¾Ñ‚Ð½Ð¾Ñительно ширины ÑкÑтрузии " +"периметра." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1193 -======= #: src/libslic3r/PrintConfig.cpp:1495 ->>>>>>> master msgid "Speed for printing the internal fill. Set to zero for auto." msgstr "" "СкороÑÑ‚ÑŒ печати внутреннего заполнениÑ. ЕÑли уÑтановлено 0, то ÑлайÑер " "автоматичеÑки наÑтраивает Ñтот параметр." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1201 -msgid "Inherits profile" -msgstr "ÐаÑледует профиль" - -#: src/libslic3r/PrintConfig.cpp:1202 -msgid "Name of the profile, from which this profile inherits." -msgstr "Ð˜Ð¼Ñ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ, от которого наÑледуетÑÑ Ð´Ð°Ð½Ð½Ñ‹Ð¹ профиль." - -#: src/libslic3r/PrintConfig.cpp:1215 -msgid "Interface shells" -msgstr "СвÑзующие оболочки" - -#: src/libslic3r/PrintConfig.cpp:1216 -======= #: src/libslic3r/PrintConfig.cpp:1503 msgid "Inherits profile" msgstr "ÐаÑледует профиль" @@ -20283,23 +12501,11 @@ msgid "Interface shells" msgstr "СвÑзующие оболочки" #: src/libslic3r/PrintConfig.cpp:1518 ->>>>>>> master msgid "" -"Force the generation of solid shells between adjacent materials/volumes. Useful for " -"multi-extruder prints with translucent materials or manual soluble support material." +"Force the generation of solid shells between adjacent materials/volumes. " +"Useful for multi-extruder prints with translucent materials or manual " +"soluble support material." msgstr "" -<<<<<<< HEAD -"Принудительное Ñоздание замкнутых (Ñплошных) оболочек между Ñмежными материалами/" -"объёмами. Полезно Ð´Ð»Ñ Ð¼Ð½Ð¾Ð³Ð¾ÑкÑтрудерных принтеров при печати полупрозрачными " -"материалами или раÑтворимой поддержкой. Помогает избежать диффузию материалов." - -#: src/libslic3r/PrintConfig.cpp:1224 -msgid "Enable ironing" -msgstr "Вкл. разглаживание" - -#: src/libslic3r/PrintConfig.cpp:1225 -msgid "Enable ironing of the top layers with the hot print head for smooth surface" -======= "Принудительное Ñоздание замкнутых (Ñплошных) оболочек между Ñмежными " "материалами/объёмами. Полезно Ð´Ð»Ñ Ð¼Ð½Ð¾Ð³Ð¾ÑкÑтрудерных принтеров при печати " "полупрозрачными материалами или раÑтворимой поддержкой. Помогает избежать " @@ -20326,46 +12532,10 @@ msgstr "Вкл. разглаживание" #: src/libslic3r/PrintConfig.cpp:1536 msgid "" "Enable ironing of the top layers with the hot print head for smooth surface" ->>>>>>> master msgstr "" "Включение Ñ€Ð°Ð·Ð³Ð»Ð°Ð¶Ð¸Ð²Ð°Ð½Ð¸Ñ Ð²ÐµÑ€Ñ…Ð½Ð¸Ñ… Ñлоёв Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ горÑчего Ñопла Ð´Ð»Ñ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ " "гладкой поверхноÑти." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1231 src/libslic3r/PrintConfig.cpp:1233 -msgid "Ironing Type" -msgstr "Тип разглаживаниÑ" - -#: src/libslic3r/PrintConfig.cpp:1238 -msgid "All top surfaces" -msgstr "Ð’Ñе верхние поверх." - -#: src/libslic3r/PrintConfig.cpp:1239 -msgid "Topmost surface only" -msgstr "Самые верхние поверх." - -#: src/libslic3r/PrintConfig.cpp:1240 -msgid "All solid surfaces" -msgstr "Ð’Ñе Ñплошные поверх." - -#: src/libslic3r/PrintConfig.cpp:1245 -msgid "Flow rate" -msgstr "Поток" - -#: src/libslic3r/PrintConfig.cpp:1247 -msgid "Percent of a flow rate relative to object's normal layer height." -msgstr "Процент потока Ñ€Ð°Ð·Ð³Ð»Ð°Ð¶Ð¸Ð²Ð°Ð½Ð¸Ñ Ð¾Ñ‚Ð½Ð¾Ñительно нормальной выÑоты ÑÐ»Ð¾Ñ Ð¼Ð¾Ð´ÐµÐ»Ð¸." - -#: src/libslic3r/PrintConfig.cpp:1255 -msgid "Spacing between ironing passes" -msgstr "РаÑÑтоÑние между линиÑми разглаживаниÑ" - -#: src/libslic3r/PrintConfig.cpp:1257 -msgid "Distance between ironing lines" -msgstr "РаÑÑтоÑние между линиÑми разглаживаниÑ." - -#: src/libslic3r/PrintConfig.cpp:1274 -======= #: src/libslic3r/PrintConfig.cpp:1542 src/libslic3r/PrintConfig.cpp:1544 msgid "Ironing Type" msgstr "Тип разглаживаниÑ" @@ -20400,24 +12570,12 @@ msgid "Distance between ironing lines" msgstr "РаÑÑтоÑние между линиÑми разглаживаниÑ." #: src/libslic3r/PrintConfig.cpp:1585 ->>>>>>> master msgid "" -"This custom code is inserted at every layer change, right after the Z move and " -"before the extruder moves to the first layer point. Note that you can use " -"placeholder variables for all Slic3r settings as well as [layer_num] and [layer_z]." +"This custom code is inserted at every layer change, right after the Z move " +"and before the extruder moves to the first layer point. Note that you can " +"use placeholder variables for all Slic3r settings as well as [layer_num] and " +"[layer_z]." msgstr "" -<<<<<<< HEAD -"Ðтот пользовательÑкий код вÑтавлÑетÑÑ Ð¿Ñ€Ð¸ каждой Ñмене ÑлоÑ, Ñразу поÑле Ð´Ð²Ð¸Ð¶ÐµÐ½Ð¸Ñ " -"оÑи Z и до того, как ÑкÑтрудер перемеÑтитьÑÑ Ð² точку первого ÑлоÑ. Обратите " -"внимание, что вы можете иÑпользовать шаблонные переменные Ð´Ð»Ñ Ð²Ñех параметров " -"PrusaSlicer в том чиÑле [layer_num] и [layer_z]." - -#: src/libslic3r/PrintConfig.cpp:1285 -msgid "Supports remaining times" -msgstr "Поддержка точного времени печати" - -#: src/libslic3r/PrintConfig.cpp:1286 -======= "Ðтот пользовательÑкий код вÑтавлÑетÑÑ Ð¿Ñ€Ð¸ каждой Ñмене ÑлоÑ, Ñразу поÑле " "Ð´Ð²Ð¸Ð¶ÐµÐ½Ð¸Ñ Ð¾Ñи Z и до того, как ÑкÑтрудер перемеÑтитьÑÑ Ð² точку первого ÑлоÑ. " "Обратите внимание, что вы можете иÑпользовать шаблонные переменные Ð´Ð»Ñ Ð²Ñех " @@ -20428,190 +12586,12 @@ msgid "Supports remaining times" msgstr "Поддержка точного времени печати" #: src/libslic3r/PrintConfig.cpp:1597 ->>>>>>> master msgid "" -"Emit M73 P[percent printed] R[remaining time in minutes] at 1 minute intervals into " -"the G-code to let the firmware show accurate remaining time. As of now only the " -"Prusa i3 MK3 firmware recognizes M73. Also the i3 MK3 firmware supports M73 Qxx Sxx " -"for the silent mode." +"Emit M73 P[percent printed] R[remaining time in minutes] at 1 minute " +"intervals into the G-code to let the firmware show accurate remaining time. " +"As of now only the Prusa i3 MK3 firmware recognizes M73. Also the i3 MK3 " +"firmware supports M73 Qxx Sxx for the silent mode." msgstr "" -<<<<<<< HEAD -"ДобавлÑет команду Ðœ73 P[процентов напечатано в нормальном режиме] R[оÑтавшееÑÑ " -"Ð²Ñ€ÐµÐ¼Ñ Ð² Ñекундах в нормальном режиме] Ñ Ð¸Ð½Ñ‚ÐµÑ€Ð²Ð°Ð»Ð¾Ð¼ в 1 минуту в G-код, чтобы " -"прошивка отображала оÑтавшееÑÑ Ð²Ñ€ÐµÐ¼Ñ Ð¿ÐµÑ‡Ð°Ñ‚Ð¸. Ðа данный момент только прошивка Prusa " -"i3 MK3 раÑпознает команду M73. Также прошивка i3 MK3 поддерживает команду M73 Qxx " -"Sxx Ð´Ð»Ñ Ñ‚Ð¸Ñ…Ð¾Ð³Ð¾ режима печати." - -#: src/libslic3r/PrintConfig.cpp:1294 -msgid "Supports stealth mode" -msgstr "Поддержка тихого режима" - -#: src/libslic3r/PrintConfig.cpp:1295 -msgid "The firmware supports stealth mode" -msgstr "Прошивка должна поддерживать тихий режим" - -#: src/libslic3r/PrintConfig.cpp:1300 -msgid "How to apply limits" -msgstr "Как применÑÑ‚ÑŒ Ð¾Ð³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¸Ð½Ñ‚ÐµÑ€Ð°" - -#: src/libslic3r/PrintConfig.cpp:1301 -msgid "Purpose of Machine Limits" -msgstr "Ðазначение ограничений принтера" - -#: src/libslic3r/PrintConfig.cpp:1303 -msgid "How to apply the Machine Limits" -msgstr "Как применÑÑ‚ÑŒ Ð¾Ð³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¸Ð½Ñ‚ÐµÑ€Ð°" - -#: src/libslic3r/PrintConfig.cpp:1308 -msgid "Emit to G-code" -msgstr "ОтправлÑÑ‚ÑŒ в G-код" - -#: src/libslic3r/PrintConfig.cpp:1309 -msgid "Use for time estimate" -msgstr "ИÑпользовать Ð´Ð»Ñ Ð¾Ñ†ÐµÐ½ÐºÐ¸ времени" - -#: src/libslic3r/PrintConfig.cpp:1310 -msgid "Ignore" -msgstr "Игнорировать" - -#: src/libslic3r/PrintConfig.cpp:1333 -msgid "Maximum feedrate X" -msgstr "МакÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ ÑкороÑÑ‚ÑŒ Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰ÐµÐ½Ð¸Ñ Ð¿Ð¾ X" - -#: src/libslic3r/PrintConfig.cpp:1334 -msgid "Maximum feedrate Y" -msgstr "МакÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ ÑкороÑÑ‚ÑŒ Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰ÐµÐ½Ð¸Ñ Ð¿Ð¾ Y" - -#: src/libslic3r/PrintConfig.cpp:1335 -msgid "Maximum feedrate Z" -msgstr "МакÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ ÑкороÑÑ‚ÑŒ Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰ÐµÐ½Ð¸Ñ Ð¿Ð¾ Z" - -#: src/libslic3r/PrintConfig.cpp:1336 -msgid "Maximum feedrate E" -msgstr "МакÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ ÑкороÑÑ‚ÑŒ подачи у ÑкÑтрудера (E)" - -#: src/libslic3r/PrintConfig.cpp:1339 -msgid "Maximum feedrate of the X axis" -msgstr "МакÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ ÑкороÑÑ‚ÑŒ Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰ÐµÐ½Ð¸Ñ Ð¿Ð¾ оÑи X" - -#: src/libslic3r/PrintConfig.cpp:1340 -msgid "Maximum feedrate of the Y axis" -msgstr "МакÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ ÑкороÑÑ‚ÑŒ Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰ÐµÐ½Ð¸Ñ Ð¿Ð¾ оÑи Y" - -#: src/libslic3r/PrintConfig.cpp:1341 -msgid "Maximum feedrate of the Z axis" -msgstr "МакÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ ÑкороÑÑ‚ÑŒ Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰ÐµÐ½Ð¸Ñ Ð¿Ð¾ оÑи Z" - -#: src/libslic3r/PrintConfig.cpp:1342 -msgid "Maximum feedrate of the E axis" -msgstr "МакÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ ÑкороÑÑ‚ÑŒ подачи у ÑкÑтрудера (E)" - -#: src/libslic3r/PrintConfig.cpp:1350 -msgid "Maximum acceleration X" -msgstr "МакÑимальное уÑкорение по X" - -#: src/libslic3r/PrintConfig.cpp:1351 -msgid "Maximum acceleration Y" -msgstr "МакÑимальное уÑкорение по Y" - -#: src/libslic3r/PrintConfig.cpp:1352 -msgid "Maximum acceleration Z" -msgstr "МакÑимальное уÑкорение по Z" - -#: src/libslic3r/PrintConfig.cpp:1353 -msgid "Maximum acceleration E" -msgstr "МакÑимальное уÑкорение подачи у ÑкÑтрудера (E)" - -#: src/libslic3r/PrintConfig.cpp:1356 -msgid "Maximum acceleration of the X axis" -msgstr "МакÑимальное уÑкорение при перемещении по оÑи X" - -#: src/libslic3r/PrintConfig.cpp:1357 -msgid "Maximum acceleration of the Y axis" -msgstr "МакÑимальное уÑкорение при перемещении по оÑи Y" - -#: src/libslic3r/PrintConfig.cpp:1358 -msgid "Maximum acceleration of the Z axis" -msgstr "МакÑимальное уÑкорение при перемещении по оÑи Z" - -#: src/libslic3r/PrintConfig.cpp:1359 -msgid "Maximum acceleration of the E axis" -msgstr "МакÑимальное уÑкорение подачи у ÑкÑтрудера (E)" - -#: src/libslic3r/PrintConfig.cpp:1367 -msgid "Maximum jerk X" -msgstr "МакÑимальный рывок по X" - -#: src/libslic3r/PrintConfig.cpp:1368 -msgid "Maximum jerk Y" -msgstr "МакÑимальный рывок по Y" - -#: src/libslic3r/PrintConfig.cpp:1369 -msgid "Maximum jerk Z" -msgstr "МакÑимальный рывок по Z" - -#: src/libslic3r/PrintConfig.cpp:1370 -msgid "Maximum jerk E" -msgstr "МакÑимальный рывок у ÑкÑтрудера (E)" - -#: src/libslic3r/PrintConfig.cpp:1373 -msgid "Maximum jerk of the X axis" -msgstr "МакÑимальный рывок по оÑи X" - -#: src/libslic3r/PrintConfig.cpp:1374 -msgid "Maximum jerk of the Y axis" -msgstr "МакÑимальный рывок по оÑи Y" - -#: src/libslic3r/PrintConfig.cpp:1375 -msgid "Maximum jerk of the Z axis" -msgstr "МакÑимальный рывок по оÑи Z" - -#: src/libslic3r/PrintConfig.cpp:1376 -msgid "Maximum jerk of the E axis" -msgstr "МакÑимальный рывок у ÑкÑтрудера (E)" - -#: src/libslic3r/PrintConfig.cpp:1386 -msgid "Minimum feedrate when extruding" -msgstr "ÐœÐ¸Ð½Ð¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ ÑкороÑÑ‚ÑŒ Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¸ печати" - -#: src/libslic3r/PrintConfig.cpp:1388 -msgid "Minimum feedrate when extruding (M205 S)" -msgstr "ÐœÐ¸Ð½Ð¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ ÑкороÑÑ‚ÑŒ Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¸ печати (M205 S)" - -#: src/libslic3r/PrintConfig.cpp:1396 -msgid "Minimum travel feedrate" -msgstr "ÐœÐ¸Ð½Ð¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ ÑкороÑÑ‚ÑŒ Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰ÐµÐ½Ð¸Ñ Ð±ÐµÐ· печати" - -#: src/libslic3r/PrintConfig.cpp:1398 -msgid "Minimum travel feedrate (M205 T)" -msgstr "ÐœÐ¸Ð½Ð¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ ÑкороÑÑ‚ÑŒ Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰ÐµÐ½Ð¸Ñ Ð±ÐµÐ· печати (M205 T)" - -#: src/libslic3r/PrintConfig.cpp:1406 -msgid "Maximum acceleration when extruding" -msgstr "МакÑимальное уÑкорение при печати" - -#: src/libslic3r/PrintConfig.cpp:1408 -msgid "Maximum acceleration when extruding (M204 S)" -msgstr "МакÑимальное уÑкорение при печати (M204 S)" - -#: src/libslic3r/PrintConfig.cpp:1416 -msgid "Maximum acceleration when retracting" -msgstr "МакÑимальное уÑкорение ретракта" - -#: src/libslic3r/PrintConfig.cpp:1418 -msgid "Maximum acceleration when retracting (M204 T)" -msgstr "МакÑимальное уÑкорение ÑкÑтрудера при ретракте (M204 T)" - -#: src/libslic3r/PrintConfig.cpp:1425 src/libslic3r/PrintConfig.cpp:1434 -msgid "Max" -msgstr "МакÑ." - -#: src/libslic3r/PrintConfig.cpp:1426 -msgid "This setting represents the maximum speed of your fan." -msgstr "Ðтот параметр регулирует макÑимальную ÑкороÑÑ‚ÑŒ Ð²Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ð²ÐµÐ½Ñ‚Ð¸Ð»Ñтора." - -#: src/libslic3r/PrintConfig.cpp:1435 -======= "ДобавлÑет команду Ðœ73 P[процентов напечатано в нормальном режиме] " "R[оÑтавшееÑÑ Ð²Ñ€ÐµÐ¼Ñ Ð² Ñекундах в нормальном режиме] Ñ Ð¸Ð½Ñ‚ÐµÑ€Ð²Ð°Ð»Ð¾Ð¼ в 1 минуту в " "G-код, чтобы прошивка отображала оÑтавшееÑÑ Ð²Ñ€ÐµÐ¼Ñ Ð¿ÐµÑ‡Ð°Ñ‚Ð¸. Ðа данный момент " @@ -20803,26 +12783,13 @@ msgid "This setting represents the maximum speed of your fan." msgstr "Ðтот параметр регулирует макÑимальную ÑкороÑÑ‚ÑŒ Ð²Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ð²ÐµÐ½Ñ‚Ð¸Ð»Ñтора." #: src/libslic3r/PrintConfig.cpp:1759 ->>>>>>> master msgid "" -"This is the highest printable layer height for this extruder, used to cap the " -"variable layer height and support layer height. Maximum recommended layer height is " -"75% of the extrusion width to achieve reasonable inter-layer adhesion. If set to 0, " -"layer height is limited to 75% of the nozzle diameter." +"This is the highest printable layer height for this extruder, used to cap " +"the variable layer height and support layer height. Maximum recommended " +"layer height is 75% of the extrusion width to achieve reasonable inter-layer " +"adhesion. If set to 0, layer height is limited to 75% of the nozzle diameter." msgstr "" "Ðто Ð½Ð°Ð¸Ð±Ð¾Ð»ÑŒÑˆÐ°Ñ Ð²Ñ‹Ñота печатного ÑÐ»Ð¾Ñ Ð´Ð»Ñ Ñтого ÑкÑтрудера, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ñ‚Ð°ÐºÐ¶Ðµ " -<<<<<<< HEAD -"иÑпользуетÑÑ Ð´Ð»Ñ Ð¾Ð³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÐ½Ð¸Ñ Ñ„ÑƒÐ½ÐºÑ†Ð¸Ð¸ \"ÐŸÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ Ð²Ñ‹Ñота Ñлоёв\" и выÑоты ÑÐ»Ð¾Ñ " -"поддержки. Ð”Ð»Ñ Ð´Ð¾ÑÑ‚Ð¸Ð¶ÐµÐ½Ð¸Ñ Ñ…Ð¾Ñ€Ð¾ÑˆÐµÐ¹ межÑлойной адгезии, макÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ Ñ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑƒÐµÐ¼Ð°Ñ " -"выÑота ÑÐ»Ð¾Ñ ÑоÑтавлÑет 75% ширины ÑкÑтрузии. ЕÑли уÑтановлено 0, выÑота ÑÐ»Ð¾Ñ " -"ограничиваетÑÑ 75% диаметра Ñопла." - -#: src/libslic3r/PrintConfig.cpp:1445 -msgid "Max print speed" -msgstr "МакÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ ÑкороÑÑ‚ÑŒ печати" - -#: src/libslic3r/PrintConfig.cpp:1446 -======= "иÑпользуетÑÑ Ð´Ð»Ñ Ð¾Ð³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÐ½Ð¸Ñ Ñ„ÑƒÐ½ÐºÑ†Ð¸Ð¸ Â«ÐŸÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ Ð²Ñ‹Ñота Ñлоёв» и выÑоты ÑÐ»Ð¾Ñ " "поддержки. Ð”Ð»Ñ Ð´Ð¾ÑÑ‚Ð¸Ð¶ÐµÐ½Ð¸Ñ Ñ…Ð¾Ñ€Ð¾ÑˆÐµÐ¹ межÑлойной адгезии, макÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ " "Ñ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑƒÐµÐ¼Ð°Ñ Ð²Ñ‹Ñота ÑÐ»Ð¾Ñ ÑоÑтавлÑет 75% ширины ÑкÑтрузии. ЕÑли уÑтановлено " @@ -20833,78 +12800,42 @@ msgid "Max print speed" msgstr "МакÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ ÑкороÑÑ‚ÑŒ печати" #: src/libslic3r/PrintConfig.cpp:1770 ->>>>>>> master msgid "" -"When setting other speed settings to 0 Slic3r will autocalculate the optimal speed " -"in order to keep constant extruder pressure. This experimental setting is used to " -"set the highest print speed you want to allow." +"When setting other speed settings to 0 Slic3r will autocalculate the optimal " +"speed in order to keep constant extruder pressure. This experimental setting " +"is used to set the highest print speed you want to allow." msgstr "" -<<<<<<< HEAD -"При уÑтановке других параметров ÑкороÑти в 0, PrusaSlicer автоматичеÑки раÑÑчитает " -"оптимальную ÑкороÑÑ‚ÑŒ Ð´Ð»Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶Ð°Ð½Ð¸Ñ Ð¿Ð¾ÑтоÑнного Ð´Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð² ÑкÑтрудере. Ðтот " -"ÑкÑпериментальный параметр иÑпользуетÑÑ Ð´Ð»Ñ Ð·Ð°Ð´Ð°Ð½Ð¸Ñ Ð¶ÐµÐ»Ð°ÐµÐ¼Ð¾Ð¹ вами макÑимальной " -"ÑкороÑти печати." - -#: src/libslic3r/PrintConfig.cpp:1456 -======= "При уÑтановке других параметров ÑкороÑти в 0, PrusaSlicer автоматичеÑки " "раÑÑчитает оптимальную ÑкороÑÑ‚ÑŒ Ð´Ð»Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶Ð°Ð½Ð¸Ñ Ð¿Ð¾ÑтоÑнного Ð´Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð² " "ÑкÑтрудере. Ðтот ÑкÑпериментальный параметр иÑпользуетÑÑ Ð´Ð»Ñ Ð·Ð°Ð´Ð°Ð½Ð¸Ñ " "желаемой вами макÑимальной ÑкороÑти печати." #: src/libslic3r/PrintConfig.cpp:1780 ->>>>>>> master msgid "" -"This experimental setting is used to set the maximum volumetric speed your extruder " -"supports." +"This experimental setting is used to set the maximum volumetric speed your " +"extruder supports." msgstr "" -"ÐкÑÐ¿ÐµÑ€Ð¸Ð¼ÐµÐ½Ñ‚Ð°Ð»ÑŒÐ½Ð°Ñ Ð¾Ð¿Ñ†Ð¸Ñ Ð¸ÑпользуетÑÑ Ð´Ð»Ñ ÑƒÑтановки макÑимальной объёмной ÑкороÑти " -"подачи (выдавливаниÑ) материала, которую поддерживает ваш ÑкÑтрудер. 0 - без " -"ограничений." +"ÐкÑÐ¿ÐµÑ€Ð¸Ð¼ÐµÐ½Ñ‚Ð°Ð»ÑŒÐ½Ð°Ñ Ð¾Ð¿Ñ†Ð¸Ñ Ð¸ÑпользуетÑÑ Ð´Ð»Ñ ÑƒÑтановки макÑимальной объёмной " +"ÑкороÑти подачи (выдавливаниÑ) материала, которую поддерживает ваш " +"ÑкÑтрудер. 0 - без ограничений." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1465 -msgid "Max volumetric slope positive" -msgstr "МакÑ. положительное объёмное навиÑание" - -#: src/libslic3r/PrintConfig.cpp:1466 src/libslic3r/PrintConfig.cpp:1477 -======= #: src/libslic3r/PrintConfig.cpp:1789 msgid "Max volumetric slope positive" msgstr "МакÑ. положительное объёмное навиÑание" #: src/libslic3r/PrintConfig.cpp:1790 src/libslic3r/PrintConfig.cpp:1801 ->>>>>>> master msgid "" -"This experimental setting is used to limit the speed of change in extrusion rate. A " -"value of 1.8 mm³/s² ensures, that a change from the extrusion rate of 1.8 mm³/s " -"(0.45mm extrusion width, 0.2mm extrusion height, feedrate 20 mm/s) to 5.4 mm³/s " -"(feedrate 60 mm/s) will take at least 2 seconds." +"This experimental setting is used to limit the speed of change in extrusion " +"rate. A value of 1.8 mm³/s² ensures, that a change from the extrusion rate " +"of 1.8 mm³/s (0.45mm extrusion width, 0.2mm extrusion height, feedrate 20 mm/" +"s) to 5.4 mm³/s (feedrate 60 mm/s) will take at least 2 seconds." msgstr "" -"Ðтот ÑкÑпериментальный параметр иÑпользуетÑÑ Ð´Ð»Ñ Ð¾Ð³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÐ½Ð¸Ñ ÑкороÑти Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ " -"ÑкÑтрузии. Значение 1.8 мм³/Ѳ гарантирует, что изменение ÑкороÑти ÑкÑтрузии Ñ 1.8 " -"мм³/Ñ (ширина ÑкÑтрузии 0.45 мм, выÑота ÑкÑтрузии 0.2 мм, ÑкороÑÑ‚ÑŒ подачи 20 мм/Ñ) " -"до 5.4 мм³/Ñ (ÑкороÑÑ‚ÑŒ подачи 60 мм/Ñ) займёт не менее 2-Ñ… Ñекунд." - -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1470 src/libslic3r/PrintConfig.cpp:1481 -msgid "mm³/s²" -msgstr "мм³/Ѳ" +"Ðтот ÑкÑпериментальный параметр иÑпользуетÑÑ Ð´Ð»Ñ Ð¾Ð³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÐ½Ð¸Ñ ÑкороÑти " +"Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ ÑкÑтрузии. Значение 1.8 мм³/Ѳ гарантирует, что изменение ÑкороÑти " +"ÑкÑтрузии Ñ 1.8 мм³/Ñ (ширина ÑкÑтрузии 0.45 мм, выÑота ÑкÑтрузии 0.2 мм, " +"ÑкороÑÑ‚ÑŒ подачи 20 мм/Ñ) до 5.4 мм³/Ñ (ÑкороÑÑ‚ÑŒ подачи 60 мм/Ñ) займёт не " +"менее 2-Ñ… Ñекунд." -#: src/libslic3r/PrintConfig.cpp:1476 -msgid "Max volumetric slope negative" -msgstr "МакÑ. отрицательное объёмное навиÑание" - -#: src/libslic3r/PrintConfig.cpp:1488 src/libslic3r/PrintConfig.cpp:1497 -msgid "Min" -msgstr "Мин." - -#: src/libslic3r/PrintConfig.cpp:1489 -msgid "This setting represents the minimum PWM your fan needs to work." -msgstr "Ðтот параметр регулирует минимальную ÑкороÑÑ‚ÑŒ Ð²Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ð²ÐµÐ½Ñ‚Ð¸Ð»Ñтора." - -#: src/libslic3r/PrintConfig.cpp:1498 -======= #: src/libslic3r/PrintConfig.cpp:1794 src/libslic3r/PrintConfig.cpp:1805 msgid "mm³/s²" msgstr "мм³/Ѳ" @@ -20922,21 +12853,11 @@ msgid "This setting represents the minimum PWM your fan needs to work." msgstr "Ðтот параметр регулирует минимальную ÑкороÑÑ‚ÑŒ Ð²Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ð²ÐµÐ½Ñ‚Ð¸Ð»Ñтора." #: src/libslic3r/PrintConfig.cpp:1822 ->>>>>>> master msgid "" "This is the lowest printable layer height for this extruder and limits the " -"resolution for variable layer height. Typical values are between 0.05 mm and 0.1 mm." +"resolution for variable layer height. Typical values are between 0.05 mm and " +"0.1 mm." msgstr "" -<<<<<<< HEAD -"Ðто Ð½Ð°Ð¸Ð¼ÐµÐ½ÑŒÑˆÐ°Ñ Ð²Ñ‹Ñота печатаемого ÑÐ»Ð¾Ñ Ð´Ð»Ñ Ð´Ð°Ð½Ð½Ð¾Ð³Ð¾ ÑкÑтрудера и в то же Ð²Ñ€ÐµÐ¼Ñ " -"нижний предел Ð´Ð»Ñ Ñ„ÑƒÐ½ÐºÑ†Ð¸Ð¸ \"ÐŸÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ Ð²Ñ‹Ñота Ñлоёв\". Обычно Ñто 0.05 или 0.1 мм." - -#: src/libslic3r/PrintConfig.cpp:1506 -msgid "Min print speed" -msgstr "ÐœÐ¸Ð½Ð¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ ÑкороÑÑ‚ÑŒ печати" - -#: src/libslic3r/PrintConfig.cpp:1507 -======= "Ðто Ð½Ð°Ð¸Ð¼ÐµÐ½ÑŒÑˆÐ°Ñ Ð²Ñ‹Ñота печатаемого ÑÐ»Ð¾Ñ Ð´Ð»Ñ Ð´Ð°Ð½Ð½Ð¾Ð³Ð¾ ÑкÑтрудера и в то же " "Ð²Ñ€ÐµÐ¼Ñ Ð½Ð¸Ð¶Ð½Ð¸Ð¹ предел Ð´Ð»Ñ Ñ„ÑƒÐ½ÐºÑ†Ð¸Ð¸ Â«ÐŸÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ Ð²Ñ‹Ñота Ñлоёв». Обычно Ñто 0.05 " "или 0.1 мм." @@ -20946,65 +12867,37 @@ msgid "Min print speed" msgstr "ÐœÐ¸Ð½Ð¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ ÑкороÑÑ‚ÑŒ печати" #: src/libslic3r/PrintConfig.cpp:1831 ->>>>>>> master msgid "Slic3r will not scale speed down below this speed." msgstr "" -"Ðижний предел того, как медленно Ñлой может быть напечатан. Slic3 не будет Ñнижать " -"ÑкороÑÑ‚ÑŒ ниже Ñтой." - -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1514 -msgid "Minimal filament extrusion length" -msgstr "ÐœÐ¸Ð½Ð¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ Ð´Ð»Ð¸Ð½Ð° ÑкÑтрузии" +"Ðижний предел того, как медленно Ñлой может быть напечатан. Slic3 не будет " +"Ñнижать ÑкороÑÑ‚ÑŒ ниже Ñтой." -#: src/libslic3r/PrintConfig.cpp:1515 -======= #: src/libslic3r/PrintConfig.cpp:1838 msgid "Minimal filament extrusion length" msgstr "ÐœÐ¸Ð½Ð¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ Ð´Ð»Ð¸Ð½Ð° ÑкÑтрузии" #: src/libslic3r/PrintConfig.cpp:1839 ->>>>>>> master msgid "" -"Generate no less than the number of skirt loops required to consume the specified " -"amount of filament on the bottom layer. For multi-extruder machines, this minimum " -"applies to each extruder." +"Generate no less than the number of skirt loops required to consume the " +"specified amount of filament on the bottom layer. For multi-extruder " +"machines, this minimum applies to each extruder." msgstr "" -"Минимальное количеÑтво плаÑтика, которое должен протолкнуть ÑкÑтрудер при печати " -"юбки в миллиметрах. Ð”Ð»Ñ Ð¿Ñ€Ð¸Ð½Ñ‚ÐµÑ€Ð¾Ð² Ñ Ð½ÐµÑколькими ÑкÑтрудерами Ñтот минимум отноÑитÑÑ " -"к каждому ÑкÑтрудеру." +"Минимальное количеÑтво плаÑтика, которое должен протолкнуть ÑкÑтрудер при " +"печати юбки в миллиметрах. Ð”Ð»Ñ Ð¿Ñ€Ð¸Ð½Ñ‚ÐµÑ€Ð¾Ð² Ñ Ð½ÐµÑколькими ÑкÑтрудерами Ñтот " +"минимум отноÑитÑÑ Ðº каждому ÑкÑтрудеру." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1524 -msgid "Configuration notes" -msgstr "Примечание конфигурации" - -#: src/libslic3r/PrintConfig.cpp:1525 -======= #: src/libslic3r/PrintConfig.cpp:1848 msgid "Configuration notes" msgstr "Примечание конфигурации" #: src/libslic3r/PrintConfig.cpp:1849 ->>>>>>> master msgid "" -"You can put here your personal notes. This text will be added to the G-code header " -"comments." +"You can put here your personal notes. This text will be added to the G-code " +"header comments." msgstr "" -"ЗдеÑÑŒ вы можете оÑтавить Ñвои Ð·Ð°Ð¼ÐµÑ‡Ð°Ð½Ð¸Ñ Ð´Ð»Ñ Ñ‚ÐµÐºÑƒÑ‰ÐµÐ³Ð¾ профилÑ. Ðтот текÑÑ‚ будет " -"добавлен к комментариÑм в заголовок G-кода." - -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1535 -msgid "This is the diameter of your extruder nozzle (for example: 0.5, 0.35 etc.)" -msgstr "Диаметр иÑпользуемого Ñопла (например: 0.5, 0.35 и др.)" - -#: src/libslic3r/PrintConfig.cpp:1540 -msgid "Host Type" -msgstr "Тип хоÑта" +"ЗдеÑÑŒ вы можете оÑтавить Ñвои Ð·Ð°Ð¼ÐµÑ‡Ð°Ð½Ð¸Ñ Ð´Ð»Ñ Ñ‚ÐµÐºÑƒÑ‰ÐµÐ³Ð¾ профилÑ. Ðтот текÑÑ‚ " +"будет добавлен к комментариÑм в заголовок G-кода." -#: src/libslic3r/PrintConfig.cpp:1541 -======= #: src/libslic3r/PrintConfig.cpp:1859 msgid "" "This is the diameter of your extruder nozzle (for example: 0.5, 0.35 etc.)" @@ -21015,21 +12908,10 @@ msgid "Host Type" msgstr "Тип хоÑта" #: src/libslic3r/PrintConfig.cpp:1865 ->>>>>>> master msgid "" -"Slic3r can upload G-code files to a printer host. This field must contain the kind " -"of the host." +"Slic3r can upload G-code files to a printer host. This field must contain " +"the kind of the host." msgstr "" -<<<<<<< HEAD -"PrusaSlicer может загружать G-код файлы на хоÑÑ‚ принтера. Ðто поле должно Ñодержать " -"тип хоÑта." - -#: src/libslic3r/PrintConfig.cpp:1558 -msgid "Only retract when crossing perimeters" -msgstr "Ретракт только при переÑечении периметров" - -#: src/libslic3r/PrintConfig.cpp:1559 -======= "PrusaSlicer может загружать G-код файлы на хоÑÑ‚ принтера. Ðто поле должно " "Ñодержать тип хоÑта." @@ -21038,80 +12920,50 @@ msgid "Only retract when crossing perimeters" msgstr "Ретракт только при переÑечении периметров" #: src/libslic3r/PrintConfig.cpp:1888 ->>>>>>> master msgid "" "Disables retraction when the travel path does not exceed the upper layer's " "perimeters (and thus any ooze will be probably invisible)." msgstr "" -"При включённом параметре процеÑÑ Ñ€ÐµÑ‚Ñ€Ð°ÐºÑ‚Ð° включаетÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ тогда, когда Ñопло " -"выходит за внешний контур." +"При включённом параметре процеÑÑ Ñ€ÐµÑ‚Ñ€Ð°ÐºÑ‚Ð° включаетÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ тогда, когда " +"Ñопло выходит за внешний контур." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1566 -======= #: src/libslic3r/PrintConfig.cpp:1895 ->>>>>>> master msgid "" -"This option will drop the temperature of the inactive extruders to prevent oozing. " -"It will enable a tall skirt automatically and move extruders outside such skirt " -"when changing temperatures." +"This option will drop the temperature of the inactive extruders to prevent " +"oozing. It will enable a tall skirt automatically and move extruders outside " +"such skirt when changing temperatures." msgstr "" "Ðтот параметр Ñнижает температуру неактивных ÑкÑтрудеров Ð´Ð»Ñ Ð¿Ñ€ÐµÐ´Ð¾Ñ‚Ð²Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ " "проÑÐ°Ñ‡Ð¸Ð²Ð°Ð½Ð¸Ñ Ñ€Ð°Ñплавленного материала из Ñопла. Ðто автоматичеÑки активирует " "генерацию юбки и перемещает ÑкÑтрудеры на Ñту юбки при изменении температуры." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1573 -msgid "Output filename format" -msgstr "Формат выходного файла" - -#: src/libslic3r/PrintConfig.cpp:1574 -======= #: src/libslic3r/PrintConfig.cpp:1902 msgid "Output filename format" msgstr "Формат выходного файла" #: src/libslic3r/PrintConfig.cpp:1903 ->>>>>>> master msgid "" "You can use all configuration options as variables inside this template. For " -"example: [layer_height], [fill_density] etc. You can also use [timestamp], [year], " -"[month], [day], [hour], [minute], [second], [version], [input_filename], " +"example: [layer_height], [fill_density] etc. You can also use [timestamp], " +"[year], [month], [day], [hour], [minute], [second], [version], " +"[input_filename], [input_filename_base]." +msgstr "" +"Ð’Ñ‹ можете иÑпользовать вÑе параметры в качеÑтве переменных внутри Ñтого " +"шаблона. Они будÑÑ‚ добавлены к имени файла. Ðапример: [layer_height], " +"[fill_density]. Так же вы можете иÑпользовать [timestamp], [year], [month], " +"[day], [hour], [minute], [second], [version], [input_filename], " "[input_filename_base]." -msgstr "" -"Ð’Ñ‹ можете иÑпользовать вÑе параметры в качеÑтве переменных внутри Ñтого шаблона. " -"Они будÑÑ‚ добавлены к имени файла. Ðапример: [layer_height], [fill_density]. Так же " -"вы можете иÑпользовать [timestamp], [year], [month], [day], [hour], [minute], " -"[second], [version], [input_filename], [input_filename_base]." - -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1583 -msgid "Detect bridging perimeters" -msgstr "ОпределÑÑ‚ÑŒ навиÑающие периметры" -#: src/libslic3r/PrintConfig.cpp:1585 -======= #: src/libslic3r/PrintConfig.cpp:1912 msgid "Detect bridging perimeters" msgstr "ОпределÑÑ‚ÑŒ навиÑающие периметры" #: src/libslic3r/PrintConfig.cpp:1914 ->>>>>>> master msgid "" -"Experimental option to adjust flow for overhangs (bridge flow will be used), to " -"apply bridge speed to them and enable fan." +"Experimental option to adjust flow for overhangs (bridge flow will be used), " +"to apply bridge speed to them and enable fan." msgstr "" "ÐкÑÐ¿ÐµÑ€Ð¸Ð¼ÐµÐ½Ñ‚Ð°Ð»ÑŒÐ½Ð°Ñ Ð¾Ð¿Ñ†Ð¸Ñ. ЕÑли у модели еÑÑ‚ÑŒ чаÑти имеющие ÑвеÑÑ‹, программа " -<<<<<<< HEAD -"раÑÑчитает возможноÑÑ‚ÑŒ их печати без поддержки, при Ñтом увеличит обдув модели и " -"выÑтавит ÑкороÑÑ‚ÑŒ печати, как при печати моÑтов." - -#: src/libslic3r/PrintConfig.cpp:1591 -msgid "Filament parking position" -msgstr "Положение парковки прутка" - -#: src/libslic3r/PrintConfig.cpp:1592 -======= "раÑÑчитает возможноÑÑ‚ÑŒ их печати без поддержки, при Ñтом увеличит обдув " "модели и выÑтавит ÑкороÑÑ‚ÑŒ печати, как при печати моÑтов." @@ -21120,21 +12972,10 @@ msgid "Filament parking position" msgstr "Положение парковки прутка" #: src/libslic3r/PrintConfig.cpp:1921 ->>>>>>> master msgid "" -"Distance of the extruder tip from the position where the filament is parked when " -"unloaded. This should match the value in printer firmware." +"Distance of the extruder tip from the position where the filament is parked " +"when unloaded. This should match the value in printer firmware." msgstr "" -<<<<<<< HEAD -"РаÑÑтоÑние от кончика ÑкÑтрудера до точки, где размещаетÑÑ Ð¿Ñ€ÑƒÑ‚Ð¾Ðº при выгрузке. " -"РаÑÑтоÑние должно ÑоответÑтвовать значению в прошивке принтера." - -#: src/libslic3r/PrintConfig.cpp:1600 -msgid "Extra loading distance" -msgstr "Ð”Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð´Ð»Ð¸Ð½Ð° загрузки" - -#: src/libslic3r/PrintConfig.cpp:1601 -======= "РаÑÑтоÑние от кончика ÑкÑтрудера до точки, где размещаетÑÑ Ð¿Ñ€ÑƒÑ‚Ð¾Ðº при " "выгрузке. РаÑÑтоÑние должно ÑоответÑтвовать значению в прошивке принтера." @@ -21143,52 +12984,30 @@ msgid "Extra loading distance" msgstr "Ð”Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð´Ð»Ð¸Ð½Ð° загрузки" #: src/libslic3r/PrintConfig.cpp:1930 ->>>>>>> master msgid "" -"When set to zero, the distance the filament is moved from parking position during " -"load is exactly the same as it was moved back during unload. When positive, it is " -"loaded further, if negative, the loading move is shorter than unloading." +"When set to zero, the distance the filament is moved from parking position " +"during load is exactly the same as it was moved back during unload. When " +"positive, it is loaded further, if negative, the loading move is shorter " +"than unloading." msgstr "" -"ЕÑли уÑтановлено 0, то раÑÑтоÑние, которое проходит пруток при перемещении из " -"Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð¿Ð°Ñ€ÐºÐ¾Ð²ÐºÐ¸ во Ð²Ñ€ÐµÐ¼Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸, точно такое же, как и при выгрузке. При " -"положительном значении, она загружаетÑÑ Ð´Ð°Ð»ÑŒÑˆÐµ; при отрицательном, ход загрузки " -"короче (по Ñравнению Ñ Ð²Ñ‹Ð³Ñ€ÑƒÐ·ÐºÐ¾Ð¹)." - -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1609 src/libslic3r/PrintConfig.cpp:1626 -#: src/libslic3r/PrintConfig.cpp:1639 src/libslic3r/PrintConfig.cpp:1649 -msgid "Perimeters" -msgstr "Периметры" +"ЕÑли уÑтановлено 0, то раÑÑтоÑние, которое проходит пруток при перемещении " +"из Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð¿Ð°Ñ€ÐºÐ¾Ð²ÐºÐ¸ во Ð²Ñ€ÐµÐ¼Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸, точно такое же, как и при выгрузке. " +"При положительном значении, она загружаетÑÑ Ð´Ð°Ð»ÑŒÑˆÐµ; при отрицательном, ход " +"загрузки короче (по Ñравнению Ñ Ð²Ñ‹Ð³Ñ€ÑƒÐ·ÐºÐ¾Ð¹)." -#: src/libslic3r/PrintConfig.cpp:1610 -======= #: src/libslic3r/PrintConfig.cpp:1938 src/libslic3r/PrintConfig.cpp:1955 #: src/libslic3r/PrintConfig.cpp:1969 src/libslic3r/PrintConfig.cpp:1979 msgid "Perimeters" msgstr "Периметры" #: src/libslic3r/PrintConfig.cpp:1939 ->>>>>>> master msgid "" -"This is the acceleration your printer will use for perimeters. Set zero to disable " -"acceleration control for perimeters." +"This is the acceleration your printer will use for perimeters. Set zero to " +"disable acceleration control for perimeters." msgstr "" "Ðто уÑкорение, которое ваш принтер будет иÑпользовать Ð´Ð»Ñ Ð¿ÐµÑ‡Ð°Ñ‚Ð¸ периметров. " "УÑтановите ноль, чтобы отключить управление уÑкорением по периметру." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1617 -msgid "Perimeter extruder" -msgstr "ÐкÑтрудер, печатающий внешние периметры" - -#: src/libslic3r/PrintConfig.cpp:1619 -msgid "The extruder to use when printing perimeters and brim. First extruder is 1." -msgstr "" -"Ðомер ÑкÑтрудера, которым печатаютÑÑ Ð²Ð½ÐµÑˆÐ½Ð¸Ðµ периметры модели и кайма. Первый " -"ÑкÑтрудер - 1." - -#: src/libslic3r/PrintConfig.cpp:1628 -======= #: src/libslic3r/PrintConfig.cpp:1946 msgid "Perimeter extruder" msgstr "ÐкÑтрудер, печатающий внешние периметры" @@ -21201,24 +13020,14 @@ msgstr "" "Первый ÑкÑтрудер - 1." #: src/libslic3r/PrintConfig.cpp:1957 ->>>>>>> master msgid "" -"Set this to a non-zero value to set a manual extrusion width for perimeters. You " -"may want to use thinner extrudates to get more accurate surfaces. If left zero, " -"default extrusion width will be used if set, otherwise 1.125 x nozzle diameter will " -"be used. If expressed as percentage (for example 200%) it will be computed over " -"layer height." +"Set this to a non-zero value to set a manual extrusion width for perimeters. " +"You may want to use thinner extrudates to get more accurate surfaces. If " +"left zero, default extrusion width will be used if set, otherwise 1.125 x " +"nozzle diameter will be used. If expressed as percentage (for example 200%) " +"it will be computed over layer height." msgstr "" "УÑтановите значение отличное от 0, чтобы вручную задать ширину ÑкÑтрузии Ð´Ð»Ñ " -<<<<<<< HEAD -"периметров. Ð’Ñ‹ можете иÑпользовать более тонкие Ñопла, чтобы получить более точных " -"поверхноÑтей. ЕÑли оÑтавить 0, будет иÑпользоватьÑÑ \"Ширина ÑкÑтрузии по умолчанию" -"\" - еÑли она задана, в противном Ñлучае будет иÑпользоватьÑÑ 1,125 x диаметра " -"Ñопла. ЕÑли задано в процентах, параметр вычиÑлÑетÑÑ Ð¾Ñ‚Ð½Ð¾Ñительно выÑоты ÑлоÑ." - -#: src/libslic3r/PrintConfig.cpp:1641 -msgid "Speed for perimeters (contours, aka vertical shells). Set to zero for auto." -======= "периметров. Ð’Ñ‹ можете иÑпользовать более тонкие Ñопла, чтобы получить более " "точных поверхноÑтей. ЕÑли оÑтавить 0, будет иÑпользоватьÑÑ Â«Ð¨Ð¸Ñ€Ð¸Ð½Ð° ÑкÑтрузии " "по умолчанию» - еÑли она задана, в противном Ñлучае будет иÑпользоватьÑÑ " @@ -21228,35 +13037,17 @@ msgid "Speed for perimeters (contours, aka vertical shells). Set to zero for aut #: src/libslic3r/PrintConfig.cpp:1971 msgid "" "Speed for perimeters (contours, aka vertical shells). Set to zero for auto." ->>>>>>> master msgstr "" -"СкороÑÑ‚ÑŒ печати периметров (контуров, иначе вертикальных Ñтенок). УÑтановите 0 Ð´Ð»Ñ " -"автонаÑтройки." +"СкороÑÑ‚ÑŒ печати периметров (контуров, иначе вертикальных Ñтенок). УÑтановите " +"0 Ð´Ð»Ñ Ð°Ð²Ñ‚Ð¾Ð½Ð°Ñтройки." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1651 -======= #: src/libslic3r/PrintConfig.cpp:1981 ->>>>>>> master msgid "" -"This option sets the number of perimeters to generate for each layer. Note that " -"Slic3r may increase this number automatically when it detects sloping surfaces " -"which benefit from a higher number of perimeters if the Extra Perimeters option is " -"enabled." +"This option sets the number of perimeters to generate for each layer. Note " +"that Slic3r may increase this number automatically when it detects sloping " +"surfaces which benefit from a higher number of perimeters if the Extra " +"Perimeters option is enabled." msgstr "" -<<<<<<< HEAD -"КоличеÑтво Ñлоёв контура модели (или количеÑтво вертикальных Ñлоёв Ñтенки модели). " -"Чем меньше чиÑло, тем меньше толщина Ñтенки модели, а значит, модель будет более " -"хрупкаÑ. Обратите внимание, еÑли включена Ð¾Ð¿Ñ†Ð¸Ñ \"Дополнительные периметры при " -"необходимоÑти\", PrusaSlicer может автоматичеÑки увеличить Ñто значение, еÑли " -"обнаружит наклонные поверхноÑти." - -#: src/libslic3r/PrintConfig.cpp:1655 -msgid "(minimum)" -msgstr "(минимум)" - -#: src/libslic3r/PrintConfig.cpp:1663 -======= "КоличеÑтво Ñлоёв контура модели (или количеÑтво вертикальных Ñлоёв Ñтенки " "модели). Чем меньше чиÑло, тем меньше толщина Ñтенки модели, а значит, " "модель будет более хрупкаÑ. Обратите внимание, еÑли включена Ð¾Ð¿Ñ†Ð¸Ñ " @@ -21268,50 +13059,13 @@ msgid "(minimum)" msgstr "(минимум)" #: src/libslic3r/PrintConfig.cpp:1993 ->>>>>>> master msgid "" -"If you want to process the output G-code through custom scripts, just list their " -"absolute paths here. Separate multiple scripts with a semicolon. Scripts will be " -"passed the absolute path to the G-code file as the first argument, and they can " -"access the Slic3r config settings by reading environment variables." +"If you want to process the output G-code through custom scripts, just list " +"their absolute paths here. Separate multiple scripts with a semicolon. " +"Scripts will be passed the absolute path to the G-code file as the first " +"argument, and they can access the Slic3r config settings by reading " +"environment variables." msgstr "" -<<<<<<< HEAD -"ЕÑли вы хотите обработать выходной G-код Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ пользовательÑких Ñкриптов, " -"проÑто перечиÑлите здеÑÑŒ абÑолютные пути к ним. РазделÑйте Ñкрипты точкой Ñ " -"запÑтой. Скриптам будет передан абÑолютный путь к файлу G-кода в качеÑтве первого " -"аргумента, и они Ñмогут получить доÑтуп к наÑтройкам конфигурации PrusaSlicer, " -"Ñ‡Ð¸Ñ‚Ð°Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ñ‹Ðµ окружениÑ." - -#: src/libslic3r/PrintConfig.cpp:1675 -msgid "Printer type" -msgstr "Тип принтера" - -#: src/libslic3r/PrintConfig.cpp:1676 -msgid "Type of the printer." -msgstr "Тип принтера." - -#: src/libslic3r/PrintConfig.cpp:1681 -msgid "Printer notes" -msgstr "ÐŸÑ€Ð¸Ð¼ÐµÑ‡Ð°Ð½Ð¸Ñ Ðº принтеру" - -#: src/libslic3r/PrintConfig.cpp:1682 -msgid "You can put your notes regarding the printer here." -msgstr "ЗдеÑÑŒ вы можете размеÑтить Ñвои заметки о принтере." - -#: src/libslic3r/PrintConfig.cpp:1690 -msgid "Printer vendor" -msgstr "Производитель принтера" - -#: src/libslic3r/PrintConfig.cpp:1691 -msgid "Name of the printer vendor." -msgstr "Ðазвание Ð¿Ñ€Ð¾Ð¸Ð·Ð²Ð¾Ð´Ð¸Ñ‚ÐµÐ»Ñ Ð¿Ñ€Ð¸Ð½Ñ‚ÐµÑ€Ð°." - -#: src/libslic3r/PrintConfig.cpp:1696 -msgid "Printer variant" -msgstr "ÐœÐ¾Ð´Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ Ð¿Ñ€Ð¸Ð½Ñ‚ÐµÑ€Ð°" - -#: src/libslic3r/PrintConfig.cpp:1697 -======= "ЕÑли вы хотите обработать выходной G-код Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ пользовательÑких " "Ñкриптов, проÑто перечиÑлите здеÑÑŒ абÑолютные пути к ним. РазделÑйте Ñкрипты " "точкой Ñ Ð·Ð°Ð¿Ñтой. Скриптам будет передан абÑолютный путь к файлу G-кода в " @@ -21347,20 +13101,13 @@ msgid "Printer variant" msgstr "ÐœÐ¾Ð´Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ Ð¿Ñ€Ð¸Ð½Ñ‚ÐµÑ€Ð°" #: src/libslic3r/PrintConfig.cpp:2027 ->>>>>>> master msgid "" "Name of the printer variant. For example, the printer variants may be " "differentiated by a nozzle diameter." msgstr "" -"Ðазвание модификации принтера. Ðапример, Ñто можно различать по диаметру Ñопла." - -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1714 -msgid "Raft layers" -msgstr "Слоёв в подложке" +"Ðазвание модификации принтера. Ðапример, Ñто можно различать по диаметру " +"Ñопла." -#: src/libslic3r/PrintConfig.cpp:1716 -======= #: src/libslic3r/PrintConfig.cpp:2044 msgid "Raft contact Z distance" msgstr "РаÑÑтоÑние от подложки до модели по вертикали" @@ -21405,54 +13152,24 @@ msgid "Raft layers" msgstr "Слоёв в подложке" #: src/libslic3r/PrintConfig.cpp:2083 ->>>>>>> master msgid "" -"The object will be raised by this number of layers, and support material will be " -"generated under it." +"The object will be raised by this number of layers, and support material " +"will be generated under it." msgstr "" -"Параметр уÑтанавливает выÑоту подложки в ÑлоÑÑ…. Ðоль - отключает Ñоздание подложки." - -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1724 -msgid "Resolution" -msgstr "Разрешение" +"Параметр уÑтанавливает выÑоту подложки в ÑлоÑÑ…. Ðоль - отключает Ñоздание " +"подложки." -#: src/libslic3r/PrintConfig.cpp:1725 -======= #: src/libslic3r/PrintConfig.cpp:2091 msgid "Slice resolution" msgstr "Разрешение нарезки" #: src/libslic3r/PrintConfig.cpp:2092 ->>>>>>> master msgid "" -"Minimum detail resolution, used to simplify the input file for speeding up the " -"slicing job and reducing memory usage. High-resolution models often carry more " -"detail than printers can render. Set to zero to disable any simplification and use " -"full resolution from input." +"Minimum detail resolution, used to simplify the input file for speeding up " +"the slicing job and reducing memory usage. High-resolution models often " +"carry more detail than printers can render. Set to zero to disable any " +"simplification and use full resolution from input." msgstr "" -<<<<<<< HEAD -"Минимальное разрешение деталей модели. ИÑпользуетÑÑ, чтобы упроÑтить входной файл " -"Ð´Ð»Ñ ÑƒÑÐºÐ¾Ñ€ÐµÐ½Ð¸Ñ Ð½Ð°Ñ€ÐµÐ·ÐºÐ¸ и ÑƒÐ¼ÐµÐ½ÑŒÑˆÐµÐ½Ð¸Ñ Ð¿Ð¾Ñ‚Ñ€ÐµÐ±Ð»ÐµÐ½Ð¸Ñ Ð¾Ð¿ÐµÑ€Ð°Ñ‚Ð¸Ð²Ð½Ð¾Ð¹ памÑти. Модели Ñ Ð²Ñ‹Ñоким " -"разрешением чаÑто Ñодержат больше деталей, чем принтеры могут выдать. УÑтановите 0, " -"чтобы отключить любое упрощение и иÑпользовать полное разрешение Ð´Ð»Ñ Ð²Ñ…Ð¾Ð´Ð½Ð¾Ð³Ð¾ файла." - -#: src/libslic3r/PrintConfig.cpp:1735 -msgid "Minimum travel after retraction" -msgstr "Минимальное раÑÑтоÑние Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ñ€ÐµÑ‚Ñ€Ð°ÐºÑ‚Ð°" - -#: src/libslic3r/PrintConfig.cpp:1736 -msgid "Retraction is not triggered when travel moves are shorter than this length." -msgstr "" -"Ретракт не будет Ñрабатывать, еÑли раÑÑтоÑние между точками печати меньше заданного " -"значениÑ." - -#: src/libslic3r/PrintConfig.cpp:1742 -msgid "Retract amount before wipe" -msgstr "Величина ретракта перед очиÑткой" - -#: src/libslic3r/PrintConfig.cpp:1743 -======= "Минимальное разрешение деталей модели. ИÑпользуетÑÑ, чтобы упроÑтить входной " "файл Ð´Ð»Ñ ÑƒÑÐºÐ¾Ñ€ÐµÐ½Ð¸Ñ Ð½Ð°Ñ€ÐµÐ·ÐºÐ¸ и ÑƒÐ¼ÐµÐ½ÑŒÑˆÐµÐ½Ð¸Ñ Ð¿Ð¾Ñ‚Ñ€ÐµÐ±Ð»ÐµÐ½Ð¸Ñ Ð¾Ð¿ÐµÑ€Ð°Ñ‚Ð¸Ð²Ð½Ð¾Ð¹ памÑти. " "Модели Ñ Ð²Ñ‹Ñоким разрешением чаÑто Ñодержат больше деталей, чем принтеры " @@ -21497,33 +13214,10 @@ msgid "Retract amount before wipe" msgstr "Величина ретракта перед очиÑткой" #: src/libslic3r/PrintConfig.cpp:2122 ->>>>>>> master msgid "" -"With bowden extruders, it may be wise to do some amount of quick retract before " -"doing the wipe movement." +"With bowden extruders, it may be wise to do some amount of quick retract " +"before doing the wipe movement." msgstr "" -<<<<<<< HEAD -"При иÑпользовании боуден-ÑкÑтрудеров, будет разумно Ñделать небольшое втÑгивание " -"прутка перед тем, как Ñовершить движение очиÑтки." - -#: src/libslic3r/PrintConfig.cpp:1750 -msgid "Retract on layer change" -msgstr "Ретракт при Ñмене ÑлоÑ" - -#: src/libslic3r/PrintConfig.cpp:1751 -msgid "This flag enforces a retraction whenever a Z move is done." -msgstr "Ðта Ð¾Ð¿Ñ†Ð¸Ñ Ð²ÐºÐ»ÑŽÑ‡Ð°ÐµÑ‚ ретракт при переходе Ñо ÑÐ»Ð¾Ñ Ð½Ð° Ñлой." - -#: src/libslic3r/PrintConfig.cpp:1756 src/libslic3r/PrintConfig.cpp:1764 -msgid "Length" -msgstr "Длина" - -#: src/libslic3r/PrintConfig.cpp:1757 -msgid "Retraction Length" -msgstr "Длина ретракта" - -#: src/libslic3r/PrintConfig.cpp:1758 -======= "При иÑпользовании боуден-ÑкÑтрудеров, будет разумно Ñделать небольшое " "втÑгивание прутка перед тем, как Ñовершить движение очиÑтки." @@ -21544,25 +13238,12 @@ msgid "Retraction Length" msgstr "Длина ретракта" #: src/libslic3r/PrintConfig.cpp:2137 ->>>>>>> master msgid "" -"When retraction is triggered, filament is pulled back by the specified amount (the " -"length is measured on raw filament, before it enters the extruder)." +"When retraction is triggered, filament is pulled back by the specified " +"amount (the length is measured on raw filament, before it enters the " +"extruder)." msgstr "" "Когда Ñрабатывает ретракт, пруток втÑгиваетÑÑ Ð½Ð°Ð·Ð°Ð´ на указанную величину " -<<<<<<< HEAD -"(длина измерÑетÑÑ Ð¿Ð¾ \"Ñырому\" прутку, то еÑÑ‚ÑŒ до Ð¿Ð¾Ð¿Ð°Ð´Ð°Ð½Ð¸Ñ ÐµÑ‘ в ÑкÑтрудер)." - -#: src/libslic3r/PrintConfig.cpp:1760 src/libslic3r/PrintConfig.cpp:1769 -msgid "mm (zero to disable)" -msgstr "мм (0 - отключено)" - -#: src/libslic3r/PrintConfig.cpp:1765 -msgid "Retraction Length (Toolchange)" -msgstr "Длина ретракта (при Ñмене инÑтрумента)" - -#: src/libslic3r/PrintConfig.cpp:1766 -======= "(длина измерÑетÑÑ Ð¿Ð¾ «Ñырому» прутку, то еÑÑ‚ÑŒ до Ð¿Ð¾Ð¿Ð°Ð´Ð°Ð½Ð¸Ñ ÐµÑ‘ в ÑкÑтрудер)." #: src/libslic3r/PrintConfig.cpp:2144 @@ -21570,23 +13251,11 @@ msgid "Retraction Length (Toolchange)" msgstr "Длина ретракта (при Ñмене инÑтрумента)" #: src/libslic3r/PrintConfig.cpp:2145 ->>>>>>> master msgid "" -"When retraction is triggered before changing tool, filament is pulled back by the " -"specified amount (the length is measured on raw filament, before it enters the " -"extruder)." +"When retraction is triggered before changing tool, filament is pulled back " +"by the specified amount (the length is measured on raw filament, before it " +"enters the extruder)." msgstr "" -<<<<<<< HEAD -"Когда Ñрабатывает ретракт, перед Ñменой Ñопла, пруток втÑгиваетÑÑ Ð½Ð°Ð·Ð°Ð´ " -"на указанную величину (длина измерÑетÑÑ Ð¿Ð¾ \"Ñырому\" прутку, то еÑÑ‚ÑŒ до " -"Ð¿Ð¾Ð¿Ð°Ð´Ð°Ð½Ð¸Ñ ÐµÐ³Ð¾ в ÑкÑтрудер)." - -#: src/libslic3r/PrintConfig.cpp:1774 -msgid "Lift Z" -msgstr "Приподнимать Ñопло на" - -#: src/libslic3r/PrintConfig.cpp:1775 -======= "Когда Ñрабатывает ретракт, перед Ñменой Ñопла, пруток втÑгиваетÑÑ Ð½Ð°Ð·Ð°Ð´ на " "указанную величину (длина измерÑетÑÑ Ð¿Ð¾ «Ñырому» прутку, то еÑÑ‚ÑŒ до " "Ð¿Ð¾Ð¿Ð°Ð´Ð°Ð½Ð¸Ñ ÐµÐ³Ð¾ в ÑкÑтрудер)." @@ -21596,27 +13265,11 @@ msgid "Lift Z" msgstr "Приподнимать Ñопло на" #: src/libslic3r/PrintConfig.cpp:2154 ->>>>>>> master msgid "" -"If you set this to a positive value, Z is quickly raised every time a retraction is " -"triggered. When using multiple extruders, only the setting for the first extruder " -"will be considered." +"If you set this to a positive value, Z is quickly raised every time a " +"retraction is triggered. When using multiple extruders, only the setting for " +"the first extruder will be considered." msgstr "" -<<<<<<< HEAD -"Задаёт на Ñколько миллиметров вверх будет каждый раз приподниматьÑÑ Ñопло, когда " -"Ñрабатывает ретракт. При иÑпользовании неÑкольких ÑкÑтрудеров будут учитыватьÑÑ " -"наÑтройки только первого ÑкÑтрудера." - -#: src/libslic3r/PrintConfig.cpp:1782 -msgid "Above Z" -msgstr "Выше" - -#: src/libslic3r/PrintConfig.cpp:1783 -msgid "Only lift Z above" -msgstr "Приподнимать Ñопло только выше" - -#: src/libslic3r/PrintConfig.cpp:1784 -======= "Задаёт на Ñколько миллиметров вверх будет каждый раз приподниматьÑÑ Ñопло, " "когда Ñрабатывает ретракт. При иÑпользовании неÑкольких ÑкÑтрудеров будут " "учитыватьÑÑ Ð½Ð°Ñтройки только первого ÑкÑтрудера." @@ -21630,27 +13283,11 @@ msgid "Only lift Z above" msgstr "Приподнимать Ñопло только выше" #: src/libslic3r/PrintConfig.cpp:2163 ->>>>>>> master msgid "" "If you set this to a positive value, Z lift will only take place above the " -"specified absolute Z. You can tune this setting for skipping lift on the first " -"layers." +"specified absolute Z. You can tune this setting for skipping lift on the " +"first layers." msgstr "" -<<<<<<< HEAD -"ЕÑли указать положительное значение, ÑкÑтрудер будет подыматьÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ выше (поÑле) " -"заданной здеÑÑŒ выÑоты (выÑота ÑчитаетÑÑ Ð¾Ñ‚ Ñтола). Таким образом вы можете " -"отключить подъём Ñопла при печати на первых ÑлоÑÑ… (в начале печати)." - -#: src/libslic3r/PrintConfig.cpp:1791 -msgid "Below Z" -msgstr "Ðиже" - -#: src/libslic3r/PrintConfig.cpp:1792 -msgid "Only lift Z below" -msgstr "Приподнимать Ñопло только ниже" - -#: src/libslic3r/PrintConfig.cpp:1793 -======= "ЕÑли указать положительное значение, ÑкÑтрудер будет подыматьÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ выше " "(поÑле) заданной здеÑÑŒ выÑоты (выÑота ÑчитаетÑÑ Ð¾Ñ‚ Ñтола). Таким образом вы " "можете отключить подъём Ñопла при печати на первых ÑлоÑÑ… (в начале печати)." @@ -21664,23 +13301,11 @@ msgid "Only lift Z below" msgstr "Приподнимать Ñопло только ниже" #: src/libslic3r/PrintConfig.cpp:2172 ->>>>>>> master msgid "" "If you set this to a positive value, Z lift will only take place below the " -"specified absolute Z. You can tune this setting for limiting lift to the first " -"layers." +"specified absolute Z. You can tune this setting for limiting lift to the " +"first layers." msgstr "" -<<<<<<< HEAD -"ЕÑли указать положительное значение, ÑкÑтрудер будет подыматьÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ ниже (до) " -"заданной здеÑÑŒ выÑоты (выÑота ÑчитаетÑÑ Ð¾Ñ‚ Ñтола). Таким образом вы можете " -"запретить подъём Ñопла выше уÑтановленной выÑоты." - -#: src/libslic3r/PrintConfig.cpp:1801 src/libslic3r/PrintConfig.cpp:1809 -msgid "Extra length on restart" -msgstr "Ð”Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð´Ð»Ð¸Ð½Ð° подачи перед возобновлением печати" - -#: src/libslic3r/PrintConfig.cpp:1802 -======= "ЕÑли указать положительное значение, ÑкÑтрудер будет подыматьÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ ниже " "(до) заданной здеÑÑŒ выÑоты (выÑота ÑчитаетÑÑ Ð¾Ñ‚ Ñтола). Таким образом вы " "можете запретить подъём Ñопла выше уÑтановленной выÑоты." @@ -21690,113 +13315,49 @@ msgid "Extra length on restart" msgstr "Ð”Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð´Ð»Ð¸Ð½Ð° подачи перед возобновлением печати" #: src/libslic3r/PrintConfig.cpp:2181 ->>>>>>> master msgid "" -"When the retraction is compensated after the travel move, the extruder will push " -"this additional amount of filament. This setting is rarely needed." +"When the retraction is compensated after the travel move, the extruder will " +"push this additional amount of filament. This setting is rarely needed." msgstr "" -"КомпенÑÐ°Ñ†Ð¸Ñ Ð´Ð»Ð¸Ð½Ñ‹ выдавливаемого плаÑтика поÑле Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰ÐµÐ½Ð¸Ñ ÑкÑтрудера, поÑле " -"работы ретракта. ПоÑле того как ÑкÑтрудер втÑнул пруток и перемеÑтилÑÑ Ð² другое меÑто " -"печати, проиÑходит Ð¾Ð±Ñ€Ð°Ñ‚Ð½Ð°Ñ Ð¿Ð¾Ð´Ð°Ñ‡Ð° того же количеÑтва прутка + заданное тут значение. " -"Ð”Ð»Ñ ÑƒÐ²ÐµÐ»Ð¸Ñ‡ÐµÐ½Ð¸Ñ Ñтавим положительное значение (например 0.5 мм), Ð´Ð»Ñ ÑƒÐ¼ÐµÐ½ÑŒÑˆÐµÐ½Ð¸Ñ - " -"отрицательное. Ðтот параметр редко необходим." +"КомпенÑÐ°Ñ†Ð¸Ñ Ð´Ð»Ð¸Ð½Ñ‹ выдавливаемого плаÑтика поÑле Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰ÐµÐ½Ð¸Ñ ÑкÑтрудера, " +"поÑле работы ретракта. ПоÑле того как ÑкÑтрудер втÑнул пруток и перемеÑтилÑÑ " +"в другое меÑто печати, проиÑходит Ð¾Ð±Ñ€Ð°Ñ‚Ð½Ð°Ñ Ð¿Ð¾Ð´Ð°Ñ‡Ð° того же количеÑтва прутка " +"+ заданное тут значение. Ð”Ð»Ñ ÑƒÐ²ÐµÐ»Ð¸Ñ‡ÐµÐ½Ð¸Ñ Ñтавим положительное значение " +"(например 0.5 мм), Ð´Ð»Ñ ÑƒÐ¼ÐµÐ½ÑŒÑˆÐµÐ½Ð¸Ñ - отрицательное. Ðтот параметр редко " +"необходим." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1810 -======= #: src/libslic3r/PrintConfig.cpp:2189 ->>>>>>> master msgid "" -"When the retraction is compensated after changing tool, the extruder will push this " -"additional amount of filament." +"When the retraction is compensated after changing tool, the extruder will " +"push this additional amount of filament." msgstr "" -"КомпенÑÐ°Ñ†Ð¸Ñ Ð´Ð»Ð¸Ð½Ñ‹ выдавливаемого плаÑтика перед возобновлением печати поÑле Ñмены " -"Ñопла." - -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1817 src/libslic3r/PrintConfig.cpp:1818 -msgid "Retraction Speed" -msgstr "СкороÑÑ‚ÑŒ ретракта" +"КомпенÑÐ°Ñ†Ð¸Ñ Ð´Ð»Ð¸Ð½Ñ‹ выдавливаемого плаÑтика перед возобновлением печати поÑле " +"Ñмены Ñопла." -#: src/libslic3r/PrintConfig.cpp:1819 -======= #: src/libslic3r/PrintConfig.cpp:2196 src/libslic3r/PrintConfig.cpp:2197 msgid "Retraction Speed" msgstr "СкороÑÑ‚ÑŒ ретракта" #: src/libslic3r/PrintConfig.cpp:2198 ->>>>>>> master msgid "The speed for retractions (it only applies to the extruder motor)." msgstr "" -"СкороÑÑ‚ÑŒ Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð¹ проиÑходит ретракт - втÑгивание прутка (отноÑитÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ к " -"двигателю ÑкÑтрудера)." +"СкороÑÑ‚ÑŒ Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð¹ проиÑходит ретракт - втÑгивание прутка (отноÑитÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ " +"к двигателю ÑкÑтрудера)." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1825 src/libslic3r/PrintConfig.cpp:1826 -msgid "Deretraction Speed" -msgstr "СкороÑÑ‚ÑŒ компенÑирующего ретракта" - -#: src/libslic3r/PrintConfig.cpp:1827 -======= #: src/libslic3r/PrintConfig.cpp:2204 src/libslic3r/PrintConfig.cpp:2205 msgid "Deretraction Speed" msgstr "СкороÑÑ‚ÑŒ компенÑирующего ретракта" #: src/libslic3r/PrintConfig.cpp:2206 ->>>>>>> master msgid "" -"The speed for loading of a filament into extruder after retraction (it only applies " -"to the extruder motor). If left to zero, the retraction speed is used." -msgstr "" -"СкороÑÑ‚ÑŒ загрузки прутка в ÑкÑтрудер поÑле ретракта (применима только к двигателю " -"ÑкÑтрудера). ЕÑли оÑтавить ноль, будет иÑпользоватьÑÑ ÑкороÑÑ‚ÑŒ ретракта." - -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1834 -msgid "Seam position" -msgstr "ÐŸÐ¾Ð·Ð¸Ñ†Ð¸Ñ ÑˆÐ²Ð°" - -#: src/libslic3r/PrintConfig.cpp:1836 -msgid "Position of perimeters starting points." +"The speed for loading of a filament into extruder after retraction (it only " +"applies to the extruder motor). If left to zero, the retraction speed is " +"used." msgstr "" -"Ðтот параметр позволÑет выбрать начальную точку каждого ÑÐ»Ð¾Ñ Ð² направлении Z, и " -"таким образом определÑет, где будет шов модели. ИзменÑÑ Ñтот параметр можно " -"уменьшить видимоÑÑ‚ÑŒ шва." - -#: src/libslic3r/PrintConfig.cpp:1842 -msgid "Random" -msgstr "Случайно" - -#: src/libslic3r/PrintConfig.cpp:1843 -msgid "Nearest" -msgstr "БлижайшаÑ" - -#: src/libslic3r/PrintConfig.cpp:1844 -msgid "Aligned" -msgstr "По краю" - -#: src/libslic3r/PrintConfig.cpp:1852 -msgid "Direction" -msgstr "Ðаправление" - -#: src/libslic3r/PrintConfig.cpp:1854 -msgid "Preferred direction of the seam" -msgstr "Предпочтительное направление шва" - -#: src/libslic3r/PrintConfig.cpp:1855 -msgid "Seam preferred direction" -msgstr "Предпочтительное направление шва" - -#: src/libslic3r/PrintConfig.cpp:1862 -msgid "Jitter" -msgstr "Ð Ð°Ð·Ð±Ñ€Ð¾Ñ ÑˆÐ²Ð°" +"СкороÑÑ‚ÑŒ загрузки прутка в ÑкÑтрудер поÑле ретракта (применима только к " +"двигателю ÑкÑтрудера). ЕÑли оÑтавить ноль, будет иÑпользоватьÑÑ ÑкороÑÑ‚ÑŒ " +"ретракта." -#: src/libslic3r/PrintConfig.cpp:1864 -msgid "Seam preferred direction jitter" -msgstr "Предпочтительное направление разброÑа шва (в градуÑах) " - -#: src/libslic3r/PrintConfig.cpp:1865 -======= #: src/libslic3r/PrintConfig.cpp:2213 msgid "Seam position" msgstr "ÐŸÐ¾Ð·Ð¸Ñ†Ð¸Ñ ÑˆÐ²Ð°" @@ -21841,59 +13402,9 @@ msgid "Seam preferred direction jitter" msgstr "Предпочтительное направление разброÑа шва (в градуÑах)" #: src/libslic3r/PrintConfig.cpp:2244 ->>>>>>> master msgid "Preferred direction of the seam - jitter" msgstr "Предпочтительное направление разброÑа шва (в градуÑах)" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1872 -msgid "Distance from object" -msgstr "РаÑÑтоÑние от юбки до модели" - -#: src/libslic3r/PrintConfig.cpp:1873 -msgid "" -"Distance between skirt and object(s). Set this to zero to attach the skirt to the " -"object(s) and get a brim for better adhesion." -msgstr "" -"Задаёт на каком раÑÑтоÑнии от модели будет раÑполагатьÑÑ ÑŽÐ±ÐºÐ°. УÑтановите 0, чтобы " -"прикрепить юбку к модели и получить кайму Ð´Ð»Ñ Ð»ÑƒÑ‡ÑˆÐµÐ³Ð¾ прилипаниÑ." - -#: src/libslic3r/PrintConfig.cpp:1880 -msgid "Skirt height" -msgstr "Слоёв юбки" - -#: src/libslic3r/PrintConfig.cpp:1881 -msgid "" -"Height of skirt expressed in layers. Set this to a tall value to use skirt as a " -"shield against drafts." -msgstr "" -"Ð’Ñ‹Ñота юбки Ð²Ñ‹Ñ€Ð°Ð¶ÐµÐ½Ð½Ð°Ñ ÐºÐ¾Ð»Ð¸Ñ‡ÐµÑтвом Ñлоёв. УÑтановите выÑокое значение, чтобы " -"иÑпользовать юбку в качеÑтве защиты от внешнего воздушного потока." - -#: src/libslic3r/PrintConfig.cpp:1888 -msgid "Draft shield" -msgstr "Защитный кожух" - -#: src/libslic3r/PrintConfig.cpp:1889 -msgid "" -"If enabled, the skirt will be as tall as a highest printed object. This is useful " -"to protect an ABS or ASA print from warping and detaching from print bed due to " -"wind draft." -msgstr "" -"ЕÑли включено, юбка будет печататьÑÑ Ð²Ñ‹Ñотой Ñ Ñамую выÑокую печатаемую модель. Ðто " -"полезно Ð´Ð»Ñ Ð·Ð°Ñ‰Ð¸Ñ‚Ñ‹ материалов типа ABS или ASA от деформации и отрыва от Ñтола из-" -"за внешнего воздушного потока." - -#: src/libslic3r/PrintConfig.cpp:1895 -msgid "Loops (minimum)" -msgstr "Юбок вокруг модели (минимум)" - -#: src/libslic3r/PrintConfig.cpp:1896 -msgid "Skirt Loops" -msgstr "Петель юбки" - -#: src/libslic3r/PrintConfig.cpp:1897 -======= #: src/libslic3r/PrintConfig.cpp:2251 msgid "Distance from brim/object" msgstr "РаÑÑтоÑние между юбкой/каймой" @@ -21955,23 +13466,11 @@ msgid "Skirt Loops" msgstr "Петель юбки" #: src/libslic3r/PrintConfig.cpp:2283 ->>>>>>> master msgid "" -"Number of loops for the skirt. If the Minimum Extrusion Length option is set, the " -"number of loops might be greater than the one configured here. Set this to zero to " -"disable skirt completely." +"Number of loops for the skirt. If the Minimum Extrusion Length option is " +"set, the number of loops might be greater than the one configured here. Set " +"this to zero to disable skirt completely." msgstr "" -<<<<<<< HEAD -"КоличеÑтво юбок вокруг модели. ЕÑли задан параметр \"ÐœÐ¸Ð½Ð¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ Ð´Ð»Ð¸Ð½Ð° ÑкÑтрузии\", " -"количеÑтво юбок может быть больше, чем задано здеÑÑŒ. Чтобы полноÑтью отключить " -"юбку, уÑтановите 0." - -#: src/libslic3r/PrintConfig.cpp:1905 -msgid "Slow down if layer print time is below" -msgstr "Замедление при печати ÑÐ»Ð¾Ñ Ð¼ÐµÐ½ÐµÐµ" - -#: src/libslic3r/PrintConfig.cpp:1906 -======= "КоличеÑтво юбок вокруг модели. ЕÑли задан параметр Â«ÐœÐ¸Ð½Ð¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ Ð´Ð»Ð¸Ð½Ð° " "ÑкÑтрузии», количеÑтво юбок может быть больше, чем задано здеÑÑŒ. Чтобы " "полноÑтью отключить юбку, уÑтановите 0." @@ -21981,45 +13480,25 @@ msgid "Slow down if layer print time is below" msgstr "Замедление при печати ÑÐ»Ð¾Ñ Ð¼ÐµÐ½ÐµÐµ" #: src/libslic3r/PrintConfig.cpp:2292 ->>>>>>> master msgid "" -"If layer print time is estimated below this number of seconds, print moves speed " -"will be scaled down to extend duration to this value." +"If layer print time is estimated below this number of seconds, print moves " +"speed will be scaled down to extend duration to this value." msgstr "" -"ЕÑли Ð²Ñ€ÐµÐ¼Ñ Ð¿ÐµÑ‡Ð°Ñ‚Ð¸ ÑÐ»Ð¾Ñ Ð¾Ñ†ÐµÐ½Ð¸Ð²Ð°ÐµÑ‚ÑÑ Ð½Ð¸Ð¶Ðµ Ñтого количеÑтва Ñекунд, ÑкороÑÑ‚ÑŒ печати " -"будет пропорционально уменьшена, чтобы увеличить продолжительноÑÑ‚ÑŒ до Ñтого " -"значениÑ." - -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1915 -msgid "Small perimeters" -msgstr "Маленькие периметры" +"ЕÑли Ð²Ñ€ÐµÐ¼Ñ Ð¿ÐµÑ‡Ð°Ñ‚Ð¸ ÑÐ»Ð¾Ñ Ð¾Ñ†ÐµÐ½Ð¸Ð²Ð°ÐµÑ‚ÑÑ Ð½Ð¸Ð¶Ðµ Ñтого количеÑтва Ñекунд, ÑкороÑÑ‚ÑŒ " +"печати будет пропорционально уменьшена, чтобы увеличить продолжительноÑÑ‚ÑŒ до " +"Ñтого значениÑ." -#: src/libslic3r/PrintConfig.cpp:1917 -======= #: src/libslic3r/PrintConfig.cpp:2301 msgid "Small perimeters" msgstr "Маленькие периметры" #: src/libslic3r/PrintConfig.cpp:2303 ->>>>>>> master msgid "" -"This separate setting will affect the speed of perimeters having radius <= 6.5mm " -"(usually holes). If expressed as percentage (for example: 80%) it will be " -"calculated on the perimeters speed setting above. Set to zero for auto." +"This separate setting will affect the speed of perimeters having radius <= " +"6.5mm (usually holes). If expressed as percentage (for example: 80%) it will " +"be calculated on the perimeters speed setting above. Set to zero for auto." msgstr "" "Ðтот параметр влиÑет на ÑкороÑÑ‚ÑŒ печати периметров Ñ Ñ€Ð°Ð´Ð¸ÑƒÑом \n" -<<<<<<< HEAD -"<= 6,5 мм (обычно Ñто отверÑтиÑ). ЕÑли задано в процентах, параметр вычиÑлÑетÑÑ " -"отноÑительно ÑкороÑти печати периметров указанной выше. УÑтановите 0 Ð´Ð»Ñ " -"автонаÑтройки." - -#: src/libslic3r/PrintConfig.cpp:1927 -msgid "Solid infill threshold area" -msgstr "Заполнение площади, меньше указанной" - -#: src/libslic3r/PrintConfig.cpp:1929 -======= "<= 6,5 мм (обычно Ñто отверÑтиÑ). ЕÑли задано в процентах, параметр " "вычиÑлÑетÑÑ Ð¾Ñ‚Ð½Ð¾Ñительно ÑкороÑти печати периметров указанной выше. " "УÑтановите 0 Ð´Ð»Ñ Ð°Ð²Ñ‚Ð¾Ð½Ð°Ñтройки." @@ -22029,41 +13508,21 @@ msgid "Solid infill threshold area" msgstr "Заполнение площади, меньше указанной" #: src/libslic3r/PrintConfig.cpp:2315 ->>>>>>> master msgid "" -"Force solid infill for regions having a smaller area than the specified threshold." +"Force solid infill for regions having a smaller area than the specified " +"threshold." msgstr "" "Заполнение площади меньше указанной будет производитьÑÑ \n" "100% (Ñплошным) заполнением." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1930 -msgid "mm²" -msgstr "мм²" - -#: src/libslic3r/PrintConfig.cpp:1936 -======= #: src/libslic3r/PrintConfig.cpp:2316 msgid "mm²" msgstr "мм²" #: src/libslic3r/PrintConfig.cpp:2322 ->>>>>>> master msgid "Solid infill extruder" -msgstr "" -"ÐкÑтрудер, печатающий Ñплошные Ñлои заполнениÑ" +msgstr "ÐкÑтрудер, печатающий Ñплошные Ñлои заполнениÑ" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1938 -msgid "The extruder to use when printing solid infill." -msgstr "Ðомер ÑкÑтрудера, которым печатаютÑÑ Ñплошные Ñлои заполнениÑ." - -#: src/libslic3r/PrintConfig.cpp:1944 -msgid "Solid infill every" -msgstr "Сплошное заполнение каждые" - -#: src/libslic3r/PrintConfig.cpp:1946 -======= #: src/libslic3r/PrintConfig.cpp:2324 msgid "The extruder to use when printing solid infill." msgstr "Ðомер ÑкÑтрудера, которым печатаютÑÑ Ñплошные Ñлои заполнениÑ." @@ -22073,94 +13532,40 @@ msgid "Solid infill every" msgstr "Сплошное заполнение каждые" #: src/libslic3r/PrintConfig.cpp:2332 ->>>>>>> master msgid "" -"This feature allows to force a solid layer every given number of layers. Zero to " -"disable. You can set this to any value (for example 9999); Slic3r will " -"automatically choose the maximum possible number of layers to combine according to " -"nozzle diameter and layer height." +"This feature allows to force a solid layer every given number of layers. " +"Zero to disable. You can set this to any value (for example 9999); Slic3r " +"will automatically choose the maximum possible number of layers to combine " +"according to nozzle diameter and layer height." msgstr "" -<<<<<<< HEAD -"Ðта Ñ„ÑƒÐ½ÐºÑ†Ð¸Ñ Ð¿Ð¾Ð·Ð²Ð¾Ð»Ñет принудительно делать Ñплошное заполнение через указанное " -"количеÑтво Ñлоёв. Чтобы отключить, уÑтановите 0. Ð’Ñ‹ можете задать любое значение, " -"PrusaSlicer автоматичеÑки выберет макÑимально возможное количеÑтво Ñлоёв в " -"завиÑимоÑти от диаметра Ñопла и выÑоты ÑлоÑ." - -#: src/libslic3r/PrintConfig.cpp:1958 -======= "Ðта Ñ„ÑƒÐ½ÐºÑ†Ð¸Ñ Ð¿Ð¾Ð·Ð²Ð¾Ð»Ñет принудительно делать Ñплошное заполнение через " "указанное количеÑтво Ñлоёв. Чтобы отключить, уÑтановите 0. Ð’Ñ‹ можете задать " "любое значение, PrusaSlicer автоматичеÑки выберет макÑимально возможное " "количеÑтво Ñлоёв в завиÑимоÑти от диаметра Ñопла и выÑоты ÑлоÑ." #: src/libslic3r/PrintConfig.cpp:2344 ->>>>>>> master msgid "" -"Set this to a non-zero value to set a manual extrusion width for infill for solid " -"surfaces. If left zero, default extrusion width will be used if set, otherwise " -"1.125 x nozzle diameter will be used. If expressed as percentage (for example 90%) " -"it will be computed over layer height." +"Set this to a non-zero value to set a manual extrusion width for infill for " +"solid surfaces. If left zero, default extrusion width will be used if set, " +"otherwise 1.125 x nozzle diameter will be used. If expressed as percentage " +"(for example 90%) it will be computed over layer height." msgstr "" "УÑтановите значение отличное от 0, чтобы вручную задать ширину ÑкÑтрузии Ð´Ð»Ñ " -<<<<<<< HEAD -"Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ñплошных поверхноÑтей. ЕÑли оÑтавить 0, будет иÑпользоватьÑÑ \"Ширина " -"ÑкÑтрузии по умолчанию\" - еÑли она задана, в противном Ñлучае будет иÑпользоватьÑÑ " -"1,125 x диаметра Ñопла. ЕÑли задано в процентах, параметр вычиÑлÑетÑÑ Ð¾Ñ‚Ð½Ð¾Ñительно " -"выÑоты ÑлоÑ." - -#: src/libslic3r/PrintConfig.cpp:1969 -======= "Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ñплошных поверхноÑтей. ЕÑли оÑтавить 0, будет иÑпользоватьÑÑ " "«Ширина ÑкÑтрузии по умолчанию» - еÑли она задана, в противном Ñлучае будет " "иÑпользоватьÑÑ 1,125 x диаметра Ñопла. ЕÑли задано в процентах, параметр " "вычиÑлÑетÑÑ Ð¾Ñ‚Ð½Ð¾Ñительно выÑоты ÑлоÑ." #: src/libslic3r/PrintConfig.cpp:2356 ->>>>>>> master -msgid "" -"Speed for printing solid regions (top/bottom/internal horizontal shells). This can " -"be expressed as a percentage (for example: 80%) over the default infill speed " -"above. Set to zero for auto." -msgstr "" -"СкороÑÑ‚ÑŒ печати Ñплошных облаÑтей (верха/низа/внутренних горизонтальных оболочек). " -"ЕÑли задано в процентах, параметр вычиÑлÑетÑÑ Ð¾Ñ‚Ð½Ð¾Ñительно ÑкороÑти Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ " -"указанной выше. УÑтановите 0 Ð´Ð»Ñ Ð°Ð²Ñ‚Ð¾Ð½Ð°Ñтройки." - -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1981 -msgid "Number of solid layers to generate on top and bottom surfaces." -msgstr "КоличеÑтво Ñплошных Ñлоёв при печати верхней и нижней поверхноÑти модели." - -#: src/libslic3r/PrintConfig.cpp:1987 src/libslic3r/PrintConfig.cpp:1988 -msgid "Minimum thickness of a top / bottom shell" -msgstr "ÐœÐ¸Ð½Ð¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ Ñ‚Ð¾Ð»Ñ‰Ð¸Ð½Ð° оболочки Ñверху/Ñнизу" - -#: src/libslic3r/PrintConfig.cpp:1994 -msgid "Spiral vase" -msgstr "Ð¡Ð¿Ð¸Ñ€Ð°Ð»ÑŒÐ½Ð°Ñ Ð²Ð°Ð·Ð°" - -#: src/libslic3r/PrintConfig.cpp:1995 msgid "" -"This feature will raise Z gradually while printing a single-walled object in order " -"to remove any visible seam. This option requires a single perimeter, no infill, no " -"top solid layers and no support material. You can still set any number of bottom " -"solid layers as well as skirt/brim loops. It won't work when printing more than one " -"single object." +"Speed for printing solid regions (top/bottom/internal horizontal shells). " +"This can be expressed as a percentage (for example: 80%) over the default " +"infill speed above. Set to zero for auto." msgstr "" -"Ð”Ð°Ð½Ð½Ð°Ñ Ð½Ð°Ñтройка применÑетÑÑ Ð¿Ñ€Ð¸ печати Ñпиральных и пуÑтотелых, а также " -"тонкоÑтенных моделей. Модель печатаетÑÑ Ð² одну Ñтенку без верней поверхноÑти, " -"Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð¸ поддержки. При Ñтом Ñопло движетÑÑ Ð²Ð´Ð¾Ð»ÑŒ периметра непрерывно " -"поÑтепенно поднимаÑÑÑŒ, так получаютÑÑ Ñ€Ð¾Ð²Ð½Ñ‹Ðµ краÑивые вазы без видимых швов. Ð’Ñ‹ " -"можете задать любое количеÑтво нижних Ñплошных Ñлоёв, а также печать юбки/каймы. " -"При включении Ñтого параметра невозможно напечатать горизонтальную плоÑкоÑÑ‚ÑŒ - " -"горизонтальные Ñлои без поддержки будут провиÑать." - -#: src/libslic3r/PrintConfig.cpp:2003 -msgid "Temperature variation" -msgstr "ÐšÐ¾Ð»ÐµÐ±Ð°Ð½Ð¸Ñ Ñ‚ÐµÐ¼Ð¿ÐµÑ€Ð°Ñ‚ÑƒÑ€Ñ‹" +"СкороÑÑ‚ÑŒ печати Ñплошных облаÑтей (верха/низа/внутренних горизонтальных " +"оболочек). ЕÑли задано в процентах, параметр вычиÑлÑетÑÑ Ð¾Ñ‚Ð½Ð¾Ñительно " +"ÑкороÑти Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ð¹ выше. УÑтановите 0 Ð´Ð»Ñ Ð°Ð²Ñ‚Ð¾Ð½Ð°Ñтройки." -#: src/libslic3r/PrintConfig.cpp:2004 -======= #: src/libslic3r/PrintConfig.cpp:2368 msgid "Number of solid layers to generate on top and bottom surfaces." msgstr "" @@ -22195,96 +13600,25 @@ msgid "Temperature variation" msgstr "ÐšÐ¾Ð»ÐµÐ±Ð°Ð½Ð¸Ñ Ñ‚ÐµÐ¼Ð¿ÐµÑ€Ð°Ñ‚ÑƒÑ€Ñ‹" #: src/libslic3r/PrintConfig.cpp:2391 ->>>>>>> master msgid "" -"Temperature difference to be applied when an extruder is not active. Enables a full-" -"height \"sacrificial\" skirt on which the nozzles are periodically wiped." +"Temperature difference to be applied when an extruder is not active. Enables " +"a full-height \"sacrificial\" skirt on which the nozzles are periodically " +"wiped." msgstr "" -<<<<<<< HEAD -"РазноÑÑ‚ÑŒ температур, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÑетÑÑ, когда ÑкÑтрудер не иÑпользуетÑÑ. Включает " -"печать \"жертвенной\" юбки Ñ Ð²Ñ‹Ñотой, равной выÑоте модели, об которую Ñопла будут " -"Ð²Ñ€ÐµÐ¼Ñ Ð¾Ñ‚ времени очищатьÑÑ." - -#: src/libslic3r/PrintConfig.cpp:2014 -======= "РазноÑÑ‚ÑŒ температур, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÑетÑÑ, когда ÑкÑтрудер не иÑпользуетÑÑ. " "Включает печать «жертвенной» юбки Ñ Ð²Ñ‹Ñотой, равной выÑоте модели, об " "которую Ñопла будут Ð²Ñ€ÐµÐ¼Ñ Ð¾Ñ‚ времени очищатьÑÑ." #: src/libslic3r/PrintConfig.cpp:2401 ->>>>>>> master -msgid "" -"This start procedure is inserted at the beginning, after bed has reached the target " -"temperature and extruder just started heating, and before extruder has finished " -"heating. If PrusaSlicer detects M104 or M190 in your custom codes, such commands " -"will not be prepended automatically so you're free to customize the order of " -"heating commands and other custom actions. Note that you can use placeholder " -"variables for all PrusaSlicer settings, so you can put a \"M109 " -"S[first_layer_temperature]\" command wherever you want." -msgstr "" -<<<<<<< HEAD -"Ðтот код выполнÑетÑÑ Ð² начале, поÑле того как Ñтол уже доÑтиг заданной температуры, " -"а ÑкÑтрудер только начал нагреватьÑÑ, и до того, как ÑкÑтрудер закончил нагрев. " -"ЕÑли PrusaSlicer обнаруживает M104 или M190 в ваших пользовательÑких кодах, такие " -"команды не будут добавлÑÑ‚ÑŒÑÑ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑки, поÑтому вы можете наÑтроить порÑдок " -"команд нагрева и другие дейÑтвиÑ. Обратите внимание, что вы можете иÑпользовать " -"шаблонные переменные Ð´Ð»Ñ Ð²Ñех параметров PrusaSlicer, поÑтому вы можете вÑтавить " -"команду \"M109 S[first_layer_temperature]\" где угодно." - -#: src/libslic3r/PrintConfig.cpp:2029 -msgid "" -"This start procedure is inserted at the beginning, after any printer start gcode " -"(and after any toolchange to this filament in case of multi-material printers). " -"This is used to override settings for a specific filament. If PrusaSlicer detects " -"M104, M109, M140 or M190 in your custom codes, such commands will not be prepended " -"automatically so you're free to customize the order of heating commands and other " -"custom actions. Note that you can use placeholder variables for all PrusaSlicer " -"settings, so you can put a \"M109 S[first_layer_temperature]\" command wherever you " -"want. If you have multiple extruders, the gcode is processed in extruder order." -msgstr "" -"Ðтот код выполнÑетÑÑ Ð² начале, поÑле каждого запуÑка принтером G-кода (и поÑле " -"каждого Ð¿ÐµÑ€ÐµÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð¸Ð½Ñтрумента на нужный пруток в Ñлучае мультиматериальных" -"принтеров). Ðто иÑпользуетÑÑ Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¾Ð² Ð´Ð»Ñ " -"конкретного прутка. ЕÑли PrusaSlicer обнаруживает M104, M109, M140 или " -"M190 в ваших пользовательÑких кодах, такие команды не будут добавлÑÑ‚ÑŒÑÑ " -"автоматичеÑки, поÑтому вы можете вÑтавить порÑдок команд нагрева и другие дейÑтвиÑ. " -"Обратите внимание, что вы можете иÑпользовать шаблонные переменные Ð´Ð»Ñ Ð²Ñех " -"параметров PrusaSlicer, поÑтому вы можете вÑтавить команду \"M109 " -"S[first_layer_temperature]\" где угодно. ЕÑли у Ð²Ð°Ñ Ð½ÐµÑколько ÑкÑтрудеров, G-код " -"обрабатываетÑÑ Ð² ÑоответÑтвии Ñ Ð¿Ð¾Ñ€Ñдковым номером ÑкÑтрудера." - -#: src/libslic3r/PrintConfig.cpp:2045 -msgid "Color change G-code" -msgstr "G-код Ñмены цвета" - -#: src/libslic3r/PrintConfig.cpp:2046 -msgid "This G-code will be used as a code for the color change" -msgstr "Ðтот G-код будет иÑпользоватьÑÑ Ð´Ð»Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñ†Ð²ÐµÑ‚Ð°." - -#: src/libslic3r/PrintConfig.cpp:2055 -msgid "This G-code will be used as a code for the pause print" -msgstr "Ðтот G-код будет иÑпользоватьÑÑ Ð´Ð»Ñ Ð¿Ð°ÑƒÐ·Ñ‹ печати." - -#: src/libslic3r/PrintConfig.cpp:2064 -msgid "This G-code will be used as a custom code" -msgstr "Ðтот G-код будет иÑпользоватьÑÑ Ð´Ð»Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒÑкого кода." - -#: src/libslic3r/PrintConfig.cpp:2072 -msgid "Single Extruder Multi Material" -msgstr "Мультиматериальный одиночный ÑкÑтрудер" - -#: src/libslic3r/PrintConfig.cpp:2073 -msgid "The printer multiplexes filaments into a single hot end." +msgid "" +"This start procedure is inserted at the beginning, after bed has reached the " +"target temperature and extruder just started heating, and before extruder " +"has finished heating. If PrusaSlicer detects M104 or M190 in your custom " +"codes, such commands will not be prepended automatically so you're free to " +"customize the order of heating commands and other custom actions. Note that " +"you can use placeholder variables for all PrusaSlicer settings, so you can " +"put a \"M109 S[first_layer_temperature]\" command wherever you want." msgstr "" -"Принтер ÑпоÑобный печатать неÑколькими видами/цветами плаÑтика (ÑоединÑÑ Ð¸Ñ… в однин " -"пруток) Ñ Ð¾Ð´Ð½Ð¾Ð¹ ÑкÑтрузионной головкой." - -#: src/libslic3r/PrintConfig.cpp:2078 -msgid "Prime all printing extruders" -msgstr "Подготовка вÑех печатающих ÑкÑтрудеров" - -#: src/libslic3r/PrintConfig.cpp:2079 -======= "Ðтот код выполнÑетÑÑ Ð² начале, поÑле того как Ñтол уже доÑтиг заданной " "температуры, а ÑкÑтрудер только начал нагреватьÑÑ, и до того, как ÑкÑтрудер " "закончил нагрев. ЕÑли PrusaSlicer обнаруживает M104 или M190 в ваших " @@ -22349,47 +13683,24 @@ msgid "Prime all printing extruders" msgstr "Подготовка вÑех печатающих ÑкÑтрудеров" #: src/libslic3r/PrintConfig.cpp:2466 ->>>>>>> master msgid "" -"If enabled, all printing extruders will be primed at the front edge of the print " -"bed at the start of the print." +"If enabled, all printing extruders will be primed at the front edge of the " +"print bed at the start of the print." msgstr "" "ЕÑли Ñтот параметр включён, вÑе печатающие ÑкÑтрудеры в начале печати будут " "подготавливатьÑÑ Ð½Ð° переднем крае Ñтола." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2084 -msgid "No sparse layers (EXPERIMENTAL)" -msgstr "ОтÑутÑтвие разреженных Ñлоёв (ÐКСПЕРИМЕÐТÐЛЬÐО)" - -#: src/libslic3r/PrintConfig.cpp:2085 -======= #: src/libslic3r/PrintConfig.cpp:2471 msgid "No sparse layers (EXPERIMENTAL)" msgstr "ОтÑутÑтвие разреженных Ñлоёв (ÐКСПЕРИМЕÐТÐЛЬÐО)" #: src/libslic3r/PrintConfig.cpp:2472 ->>>>>>> master msgid "" -"If enabled, the wipe tower will not be printed on layers with no toolchanges. On " -"layers with a toolchange, extruder will travel downward to print the wipe tower. " -"User is responsible for ensuring there is no collision with the print." +"If enabled, the wipe tower will not be printed on layers with no " +"toolchanges. On layers with a toolchange, extruder will travel downward to " +"print the wipe tower. User is responsible for ensuring there is no collision " +"with the print." msgstr "" -<<<<<<< HEAD -"ЕÑли Ñтот параметр включён, Ñ‡ÐµÑ€Ð½Ð¾Ð²Ð°Ñ Ð±Ð°ÑˆÐ½Ñ Ð½Ðµ будет печататьÑÑ Ð½Ð° ÑлоÑÑ… где не " -"проиÑходит Ñмена инÑтрумента. Ðа ÑлоÑÑ…, где проиÑходит Ñмена инÑтрумента, ÑкÑтрудер " -"будет опуÑкатьÑÑ Ð²Ð½Ð¸Ð· до верхней чаÑти черновой башни, чтобы напечатать её. Так как " -"PrusaSlicer в наÑтоÑщее Ð²Ñ€ÐµÐ¼Ñ Ð½Ðµ проверÑет ÑÑ‚Ð¾Ð»ÐºÐ½Ð¾Ð²ÐµÐ½Ð¸Ñ ÑкÑтрудера Ñ Ð½Ð°Ð¿ÐµÑ‡Ð°Ñ‚Ð°Ð½Ð½Ñ‹Ð¼ " -"объектом при опуÑкании его вниз до верхней чаÑти черновой башни, Ñта Ñ„ÑƒÐ½ÐºÑ†Ð¸Ñ " -"помечена как ÑкÑпериментальнаÑ. Пользователь неÑÑ‘Ñ‚ ответÑтвенноÑÑ‚ÑŒ за то, чтобы " -"избежать ÑÑ‚Ð¾Ð»ÐºÐ½Ð¾Ð²ÐµÐ½Ð¸Ñ Ñ Ð½Ð°Ð¿ÐµÑ‡Ð°Ñ‚Ð°Ð½Ð½Ñ‹Ð¼." - -#: src/libslic3r/PrintConfig.cpp:2092 -msgid "Generate support material" -msgstr "Ð“ÐµÐ½ÐµÑ€Ð°Ñ†Ð¸Ñ Ð²Ñпомогательных Ñтруктур" - -#: src/libslic3r/PrintConfig.cpp:2094 -======= "ЕÑли Ñтот параметр включён, Ñ‡ÐµÑ€Ð½Ð¾Ð²Ð°Ñ Ð±Ð°ÑˆÐ½Ñ Ð½Ðµ будет печататьÑÑ Ð½Ð° ÑлоÑÑ… где " "не проиÑходит Ñмена инÑтрумента. Ðа ÑлоÑÑ…, где проиÑходит Ñмена инÑтрумента, " "ÑкÑтрудер будет опуÑкатьÑÑ Ð²Ð½Ð¸Ð· до верхней чаÑти черновой башни, чтобы " @@ -22443,42 +13754,21 @@ msgid "Generate support material" msgstr "Ð“ÐµÐ½ÐµÑ€Ð°Ñ†Ð¸Ñ Ð²Ñпомогательных Ñтруктур" #: src/libslic3r/PrintConfig.cpp:2505 ->>>>>>> master msgid "Enable support material generation." msgstr "" -"Включение печати вÑпомогательных Ñтруктур, поддерживающих выÑтупающие и ÑвиÑающие " -"Ñлементы печатаемой модели." +"Включение печати вÑпомогательных Ñтруктур, поддерживающих выÑтупающие и " +"ÑвиÑающие Ñлементы печатаемой модели." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2098 -msgid "Auto generated supports" -msgstr "ÐвтоматичеÑки Ñозданные поддержки" - -#: src/libslic3r/PrintConfig.cpp:2100 -======= #: src/libslic3r/PrintConfig.cpp:2509 msgid "Auto generated supports" msgstr "ÐвтоматичеÑки Ñозданные поддержки" #: src/libslic3r/PrintConfig.cpp:2511 ->>>>>>> master msgid "" "If checked, supports will be generated automatically based on the overhang " -"threshold value. If unchecked, supports will be generated inside the \"Support " -"Enforcer\" volumes only." +"threshold value. If unchecked, supports will be generated inside the " +"\"Support Enforcer\" volumes only." msgstr "" -<<<<<<< HEAD -"ЕÑли флажок уÑтановлен, поддержка будет генерироватьÑÑ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑки в завиÑимоÑти " -"от нижеÑтоÑщего Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ \"Угол навиÑÐ°Ð½Ð¸Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ¸\". ЕÑли флажок не уÑтановлен, " -"поддержка будет генерироватьÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ внутри Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¸Ð½ÑƒÐ´Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ð¹ поддержки " -"заданной ниже." - -#: src/libslic3r/PrintConfig.cpp:2106 -msgid "XY separation between an object and its support" -msgstr "Зазор между моделью и поддержкой по оÑÑм XY" - -#: src/libslic3r/PrintConfig.cpp:2108 -======= "ЕÑли флажок уÑтановлен, поддержка будет генерироватьÑÑ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑки в " "завиÑимоÑти от нижеÑтоÑщего Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Â«Ð£Ð³Ð¾Ð» навиÑÐ°Ð½Ð¸Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ¸Â». ЕÑли флажок " "не уÑтановлен, поддержка будет генерироватьÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ внутри Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ " @@ -22489,21 +13779,11 @@ msgid "XY separation between an object and its support" msgstr "Зазор между моделью и поддержкой по оÑÑм XY" #: src/libslic3r/PrintConfig.cpp:2519 ->>>>>>> master msgid "" -"XY separation between an object and its support. If expressed as percentage (for " -"example 50%), it will be calculated over external perimeter width." +"XY separation between an object and its support. If expressed as percentage " +"(for example 50%), it will be calculated over external perimeter width." msgstr "" "РаÑÑтоÑние между поддержкой и печатаемой моделью по оÑÑм XY. ЕÑли задано в " -<<<<<<< HEAD -"процентах, то раÑÑтоÑние будет раÑÑчитано иÑÑ…Ð¾Ð´Ñ Ð¾Ñ‚ ширины внешнего периметра." - -#: src/libslic3r/PrintConfig.cpp:2118 -msgid "Pattern angle" -msgstr "Угол печати поддержки и подложки" - -#: src/libslic3r/PrintConfig.cpp:2120 -======= "процентах, то раÑÑтоÑние будет раÑÑчитано иÑÑ…Ð¾Ð´Ñ Ð¾Ñ‚ ширины внешнего " "периметра." @@ -22512,24 +13792,13 @@ msgid "Pattern angle" msgstr "Угол печати поддержки и подложки" #: src/libslic3r/PrintConfig.cpp:2532 ->>>>>>> master msgid "" -"Use this setting to rotate the support material pattern on the horizontal plane." +"Use this setting to rotate the support material pattern on the horizontal " +"plane." msgstr "" -"ИÑпользуйте Ñтот параметр Ð´Ð»Ñ Ð¿Ð¾Ð²Ð¾Ñ€Ð¾Ñ‚Ð° риÑунка поддержки в горизонтальной плоÑкоÑти." - -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2130 src/libslic3r/PrintConfig.cpp:2925 -msgid "" -"Only create support if it lies on a build plate. Don't create support on a print." -msgstr "Создавать поддержки только от Ñтола. Поддержки от модели поÑтроены не будут." +"ИÑпользуйте Ñтот параметр Ð´Ð»Ñ Ð¿Ð¾Ð²Ð¾Ñ€Ð¾Ñ‚Ð° риÑунка поддержки в горизонтальной " +"плоÑкоÑти." -#: src/libslic3r/PrintConfig.cpp:2136 -msgid "Contact Z distance" -msgstr "РаÑÑтоÑние от поддержки до модели по вертикали" - -#: src/libslic3r/PrintConfig.cpp:2138 -======= #: src/libslic3r/PrintConfig.cpp:2542 src/libslic3r/PrintConfig.cpp:3501 msgid "" "Only create support if it lies on a build plate. Don't create support on a " @@ -22542,31 +13811,11 @@ msgid "Top contact Z distance" msgstr "Зазор поддержки Ñверху (по оÑи Z)" #: src/libslic3r/PrintConfig.cpp:2550 ->>>>>>> master msgid "" -"The vertical distance between object and support material interface. Setting this " -"to 0 will also prevent Slic3r from using bridge flow and speed for the first object " -"layer." +"The vertical distance between object and support material interface. Setting " +"this to 0 will also prevent Slic3r from using bridge flow and speed for the " +"first object layer." msgstr "" -<<<<<<< HEAD -"Вертикальное раÑÑтоÑние между моделью и ÑвÑзующим Ñлоем поддержки. ЕÑли уÑтановить " -"0, то PrusaSlicer не будет иÑпользовать функцию \"Соотношение потока при печати " -"моÑтов\" и \"СкороÑÑ‚ÑŒ печати первого ÑлоÑ\" модели." - -#: src/libslic3r/PrintConfig.cpp:2145 -msgid "0 (soluble)" -msgstr "0 (раÑтворимые)" - -#: src/libslic3r/PrintConfig.cpp:2146 -msgid "0.2 (detachable)" -msgstr "0.2 (нераÑтворимые)" - -#: src/libslic3r/PrintConfig.cpp:2151 -msgid "Enforce support for the first" -msgstr "ÐŸÑ€Ð¸Ð½ÑƒÐ´Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ° Ð´Ð»Ñ Ð¿ÐµÑ€Ð²Ñ‹Ñ…" - -#: src/libslic3r/PrintConfig.cpp:2153 -======= "Вертикальное раÑÑтоÑние между моделью и ÑвÑзующим Ñлоем поддержки. ЕÑли " "уÑтановить 0, то PrusaSlicer не будет иÑпользовать функцию «Соотношение " "потока при печати моÑтов» и «СкороÑÑ‚ÑŒ печати первого ÑлоÑ» модели." @@ -22608,29 +13857,12 @@ msgid "Enforce support for the first" msgstr "ÐŸÑ€Ð¸Ð½ÑƒÐ´Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ° Ð´Ð»Ñ Ð¿ÐµÑ€Ð²Ñ‹Ñ…" #: src/libslic3r/PrintConfig.cpp:2585 ->>>>>>> master msgid "" -"Generate support material for the specified number of layers counting from bottom, " -"regardless of whether normal support material is enabled or not and regardless of " -"any angle threshold. This is useful for getting more adhesion of objects having a " -"very thin or poor footprint on the build plate." +"Generate support material for the specified number of layers counting from " +"bottom, regardless of whether normal support material is enabled or not and " +"regardless of any angle threshold. This is useful for getting more adhesion " +"of objects having a very thin or poor footprint on the build plate." msgstr "" -<<<<<<< HEAD -"Ð“ÐµÐ½ÐµÑ€Ð°Ñ†Ð¸Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ¸ Ð´Ð»Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ð³Ð¾ количеÑтва Ñлоёв Ð½Ð°Ñ‡Ð¸Ð½Ð°Ñ Ñо дна модели, вне " -"завиÑимоÑти от порога ÑвеÑа и Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð¾Ð¿Ñ†Ð¸Ð¸ \"Создавать поддержки\". Ðто полезно " -"Ð´Ð»Ñ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ð»ÑƒÑ‡ÑˆÐµÐ³Ð¾ Ð¿Ñ€Ð¸Ð»Ð¸Ð¿Ð°Ð½Ð¸Ñ Ð¼Ð¾Ð´ÐµÐ»ÐµÐ¹, имеющих очень тонкий или плохой контакт " -"Ñо Ñтолом." - -#: src/libslic3r/PrintConfig.cpp:2158 -msgid "Enforce support for the first n layers" -msgstr "ÐŸÑ€Ð¸Ð½ÑƒÐ´Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ° Ð´Ð»Ñ Ð¿ÐµÑ€Ð²Ñ‹Ñ… n Ñлоёв" - -#: src/libslic3r/PrintConfig.cpp:2164 -msgid "Support material/raft/skirt extruder" -msgstr "ÐкÑтрудер, печатающий поддержки/подложки/юбки" - -#: src/libslic3r/PrintConfig.cpp:2166 -======= "Ð“ÐµÐ½ÐµÑ€Ð°Ñ†Ð¸Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ¸ Ð´Ð»Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ð³Ð¾ количеÑтва Ñлоёв Ð½Ð°Ñ‡Ð¸Ð½Ð°Ñ Ñо дна модели, " "вне завиÑимоÑти от порога ÑвеÑа и Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð¾Ð¿Ñ†Ð¸Ð¸ «Создавать поддержки». Ðто " "полезно Ð´Ð»Ñ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ð»ÑƒÑ‡ÑˆÐµÐ³Ð¾ Ð¿Ñ€Ð¸Ð»Ð¸Ð¿Ð°Ð½Ð¸Ñ Ð¼Ð¾Ð´ÐµÐ»ÐµÐ¹, имеющих очень тонкий или " @@ -22645,46 +13877,21 @@ msgid "Support material/raft/skirt extruder" msgstr "ÐкÑтрудер, печатающий поддержки/подложки/юбки" #: src/libslic3r/PrintConfig.cpp:2598 ->>>>>>> master msgid "" -"The extruder to use when printing support material, raft and skirt (1+, 0 to use " -"the current extruder to minimize tool changes)." +"The extruder to use when printing support material, raft and skirt (1+, 0 to " +"use the current extruder to minimize tool changes)." msgstr "" "Ðомер ÑкÑтрудера, которым печатаютÑÑ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ°, подложка и юбка (1+, 0 Ð´Ð»Ñ " "иÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Ñ‚ÐµÐºÑƒÑ‰ÐµÐ³Ð¾ ÑкÑтрудера Ð´Ð»Ñ Ð¼Ð¸Ð½Ð¸Ð¼Ð¸Ð·Ð°Ñ†Ð¸Ð¸ Ñмены инÑтрумента)." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2175 -======= #: src/libslic3r/PrintConfig.cpp:2607 ->>>>>>> master msgid "" -"Set this to a non-zero value to set a manual extrusion width for support material. " -"If left zero, default extrusion width will be used if set, otherwise nozzle " -"diameter will be used. If expressed as percentage (for example 90%) it will be " -"computed over layer height." +"Set this to a non-zero value to set a manual extrusion width for support " +"material. If left zero, default extrusion width will be used if set, " +"otherwise nozzle diameter will be used. If expressed as percentage (for " +"example 90%) it will be computed over layer height." msgstr "" "УÑтановите значение отличное от 0, чтобы вручную задать ширину ÑкÑтрузии Ð´Ð»Ñ " -<<<<<<< HEAD -"поддержки. ЕÑли оÑтавить 0, будет иÑпользоватьÑÑ \"Ширина ÑкÑтрузии по умолчанию\" " -"- еÑли она задана, в противном Ñлучае будет иÑпользоватьÑÑ Ð´Ð¸Ð°Ð¼ÐµÑ‚Ñ€ Ñопла. ЕÑли " -"задано в процентах, параметр вычиÑлÑетÑÑ Ð¾Ñ‚Ð½Ð¾Ñительно выÑоты ÑлоÑ." - -#: src/libslic3r/PrintConfig.cpp:2184 -msgid "Interface loops" -msgstr "СвÑзующий Ñлой петлÑми" - -#: src/libslic3r/PrintConfig.cpp:2186 -msgid "Cover the top contact layer of the supports with loops. Disabled by default." -msgstr "Печатать верхний ÑвÑзующий Ñлой петлÑми. По умолчанию отключено." - -#: src/libslic3r/PrintConfig.cpp:2191 -msgid "Support material/raft interface extruder" -msgstr "" -"ÐкÑтрудер, печатающий ÑвÑзующий Ñлой поддержки/подложки" - -#: src/libslic3r/PrintConfig.cpp:2193 -======= "поддержки. ЕÑли оÑтавить 0, будет иÑпользоватьÑÑ Â«Ð¨Ð¸Ñ€Ð¸Ð½Ð° ÑкÑтрузии по " "умолчанию» - еÑли она задана, в противном Ñлучае будет иÑпользоватьÑÑ " "диаметр Ñопла. ЕÑли задано в процентах, параметр вычиÑлÑетÑÑ Ð¾Ñ‚Ð½Ð¾Ñительно " @@ -22706,35 +13913,24 @@ msgstr "" "Ñлой поддержки/подложки" #: src/libslic3r/PrintConfig.cpp:2626 ->>>>>>> master msgid "" -"The extruder to use when printing support material interface (1+, 0 to use the " -"current extruder to minimize tool changes). This affects raft too." +"The extruder to use when printing support material interface (1+, 0 to use " +"the current extruder to minimize tool changes). This affects raft too." msgstr "" "Ðомер ÑкÑтрудера, которым печатаютÑÑ ÑвÑзующие Ñлой поддержки (1+, 0 Ð´Ð»Ñ " -"иÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Ñ‚ÐµÐºÑƒÑ‰ÐµÐ³Ð¾ ÑкÑтрудера Ð´Ð»Ñ Ð¼Ð¸Ð½Ð¸Ð¼Ð¸Ð·Ð°Ñ†Ð¸Ð¸ Ñмены инÑтрумента). Ðто также " -"влиÑет на печать подложки." - -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2200 -msgid "Interface layers" -msgstr "СвÑзующих Ñлоёв" +"иÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Ñ‚ÐµÐºÑƒÑ‰ÐµÐ³Ð¾ ÑкÑтрудера Ð´Ð»Ñ Ð¼Ð¸Ð½Ð¸Ð¼Ð¸Ð·Ð°Ñ†Ð¸Ð¸ Ñмены инÑтрумента). Ðто " +"также влиÑет на печать подложки." -#: src/libslic3r/PrintConfig.cpp:2202 -======= #: src/libslic3r/PrintConfig.cpp:2634 msgid "Top interface layers" msgstr "КоличеÑтво ÑвÑзующих Ñлоёв Ñверху" #: src/libslic3r/PrintConfig.cpp:2636 ->>>>>>> master msgid "" -"Number of interface layers to insert between the object(s) and support material." +"Number of interface layers to insert between the object(s) and support " +"material." msgstr "КоличеÑтво ÑвÑзующих Ñлоёв между моделью и материалом поддержки." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2209 -======= #: src/libslic3r/PrintConfig.cpp:2643 msgid "0 (off)" msgstr "0 (откл.)" @@ -22777,18 +13973,9 @@ msgstr "" "закрытиÑ, будут заполнены." #: src/libslic3r/PrintConfig.cpp:2677 ->>>>>>> master msgid "Interface pattern spacing" msgstr "РаÑÑтоÑние между линиÑми ÑвÑзующей поддержки" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2211 -msgid "Spacing between interface lines. Set zero to get a solid interface." -msgstr "" -"РаÑÑтоÑние между ÑвÑзующими линиÑми. УÑтановите 0, чтобы получить Ñплошной Ñлой." - -#: src/libslic3r/PrintConfig.cpp:2220 -======= #: src/libslic3r/PrintConfig.cpp:2679 msgid "Spacing between interface lines. Set zero to get a solid interface." msgstr "" @@ -22796,45 +13983,14 @@ msgstr "" "Ñплошной Ñлой." #: src/libslic3r/PrintConfig.cpp:2688 ->>>>>>> master msgid "" -"Speed for printing support material interface layers. If expressed as percentage " -"(for example 50%) it will be calculated over support material speed." +"Speed for printing support material interface layers. If expressed as " +"percentage (for example 50%) it will be calculated over support material " +"speed." msgstr "" -"СкороÑÑ‚ÑŒ печати ÑвÑзующих Ñлоёв поддержки. ЕÑли она выражена в процентах, то будет " -"раÑÑчитана отноÑительно ÑкороÑти печати поддержки указанной выше." - -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2229 -msgid "Pattern" -msgstr "Шаблон поддержки и подложки" +"СкороÑÑ‚ÑŒ печати ÑвÑзующих Ñлоёв поддержки. ЕÑли она выражена в процентах, то " +"будет раÑÑчитана отноÑительно ÑкороÑти печати поддержки указанной выше." -#: src/libslic3r/PrintConfig.cpp:2231 -msgid "Pattern used to generate support material." -msgstr "Шаблон, по которому будет проиÑходить печать поддержки." - -#: src/libslic3r/PrintConfig.cpp:2237 -msgid "Rectilinear grid" -msgstr "ПрÑÐ¼Ð¾Ð»Ð¸Ð½ÐµÐ¹Ð½Ð°Ñ Ñетка" - -#: src/libslic3r/PrintConfig.cpp:2243 -msgid "Pattern spacing" -msgstr "ПлотноÑÑ‚ÑŒ поддержки" - -#: src/libslic3r/PrintConfig.cpp:2245 -msgid "Spacing between support material lines." -msgstr "РаÑÑтоÑние между линиÑми поддержки." - -#: src/libslic3r/PrintConfig.cpp:2254 -msgid "Speed for printing support material." -msgstr "СкороÑÑ‚ÑŒ печати поддержки." - -#: src/libslic3r/PrintConfig.cpp:2261 -msgid "Synchronize with object layers" -msgstr "Ð¡Ð¸Ð½Ñ…Ñ€Ð¾Ð½Ð¸Ð·Ð°Ñ†Ð¸Ñ Ñо ÑлоÑми модели" - -#: src/libslic3r/PrintConfig.cpp:2263 -======= #: src/libslic3r/PrintConfig.cpp:2697 msgid "Pattern" msgstr "Шаблон поддержки и подложки" @@ -22896,81 +14052,47 @@ msgid "Synchronize with object layers" msgstr "Ð¡Ð¸Ð½Ñ…Ñ€Ð¾Ð½Ð¸Ð·Ð°Ñ†Ð¸Ñ Ñо ÑлоÑми модели" #: src/libslic3r/PrintConfig.cpp:2761 ->>>>>>> master msgid "" -"Synchronize support layers with the object print layers. This is useful with multi-" -"material printers, where the extruder switch is expensive." +"Synchronize support layers with the object print layers. This is useful with " +"multi-material printers, where the extruder switch is expensive." msgstr "" "Синхронизирует Ñлои поддержки Ñо ÑлоÑми печатаемой модели. Ðто полезно Ð´Ð»Ñ " "мультиматериальных принтеров, которые требуют больших затрат на Ñмену одного " "ÑкÑтрудера на другой." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2269 -msgid "Overhang threshold" -msgstr "Угол навиÑÐ°Ð½Ð¸Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ¸" - -#: src/libslic3r/PrintConfig.cpp:2271 -======= #: src/libslic3r/PrintConfig.cpp:2767 msgid "Overhang threshold" msgstr "Угол навиÑÐ°Ð½Ð¸Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ¸" #: src/libslic3r/PrintConfig.cpp:2769 ->>>>>>> master msgid "" -"Support material will not be generated for overhangs whose slope angle (90° = " -"vertical) is above the given threshold. In other words, this value represent the " -"most horizontal slope (measured from the horizontal plane) that you can print " -"without support material. Set to zero for automatic detection (recommended)." +"Support material will not be generated for overhangs whose slope angle (90° " +"= vertical) is above the given threshold. In other words, this value " +"represent the most horizontal slope (measured from the horizontal plane) " +"that you can print without support material. Set to zero for automatic " +"detection (recommended)." msgstr "" -"ЗадаётÑÑ ÑƒÐ³Ð¾Ð» навиÑаниÑ, при превышении которого будут иÑпользоватьÑÑ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ¸ " -"(угол задаётÑÑ Ð¾Ñ‚Ð½Ð¾Ñительно вертикальной оÑи). УÑтановите 0 Ð´Ð»Ñ Ñ„Ð¾Ñ€Ð¼Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ " -"поддержки в автоматичеÑком режиме." - -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2283 -msgid "With sheath around the support" -msgstr "Оболочка вокруг поддержки" +"ЗадаётÑÑ ÑƒÐ³Ð¾Ð» навиÑаниÑ, при превышении которого будут иÑпользоватьÑÑ " +"поддержки (угол задаётÑÑ Ð¾Ñ‚Ð½Ð¾Ñительно вертикальной оÑи). УÑтановите 0 Ð´Ð»Ñ " +"Ñ„Ð¾Ñ€Ð¼Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ¸ в автоматичеÑком режиме." -#: src/libslic3r/PrintConfig.cpp:2285 -======= #: src/libslic3r/PrintConfig.cpp:2781 msgid "With sheath around the support" msgstr "Оболочка вокруг поддержки" #: src/libslic3r/PrintConfig.cpp:2783 ->>>>>>> master msgid "" -"Add a sheath (a single perimeter line) around the base support. This makes the " -"support more reliable, but also more difficult to remove." +"Add a sheath (a single perimeter line) around the base support. This makes " +"the support more reliable, but also more difficult to remove." msgstr "" -"Добавить оболочку (одну линию периметра) вокруг базовой поддержки. Ðто делает " -"поддержку более надёжной, но её труднее удалить." +"Добавить оболочку (одну линию периметра) вокруг базовой поддержки. Ðто " +"делает поддержку более надёжной, но её труднее удалить." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2292 -======= #: src/libslic3r/PrintConfig.cpp:2790 ->>>>>>> master msgid "" -"Nozzle temperature for layers after the first one. Set this to zero to disable " -"temperature control commands in the output G-code." +"Nozzle temperature for layers after the first one. Set this to zero to " +"disable temperature control commands in the output G-code." msgstr "" -<<<<<<< HEAD -"Температура Ñопла при печати Ð´Ð»Ñ Ñлоёв поÑле первого. УÑтановите 0 Ð´Ð»Ñ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ " -"команд ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ñ‚ÐµÐ¼Ð¿ÐµÑ€Ð°Ñ‚ÑƒÑ€Ð¾Ð¹ в выходом G-коде." - -#: src/libslic3r/PrintConfig.cpp:2295 -msgid "Nozzle temperature" -msgstr "Температура Ñопла" - -#: src/libslic3r/PrintConfig.cpp:2301 -msgid "Detect thin walls" -msgstr "Обнаружение тонких Ñтенок" - -#: src/libslic3r/PrintConfig.cpp:2303 -======= "Температура Ñопла при печати Ð´Ð»Ñ Ñлоёв поÑле первого. УÑтановите 0 Ð´Ð»Ñ " "Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´ ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ñ‚ÐµÐ¼Ð¿ÐµÑ€Ð°Ñ‚ÑƒÑ€Ð¾Ð¹ в выходом G-коде." @@ -22997,53 +14119,22 @@ msgid "Detect thin walls" msgstr "Обнаружение тонких Ñтенок" #: src/libslic3r/PrintConfig.cpp:2809 ->>>>>>> master msgid "" -"Detect single-width walls (parts where two extrusions don't fit and we need to " -"collapse them into a single trace)." +"Detect single-width walls (parts where two extrusions don't fit and we need " +"to collapse them into a single trace)." msgstr "" "Данный параметр ищет тонкие Ñтенки (Ñтенки одинарной ширины), которые можно " "напечатать только в один проход ÑкÑтрудера, и производит нарезку правильно." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2309 -msgid "Threads" -msgstr "Потоков" - -#: src/libslic3r/PrintConfig.cpp:2310 -======= #: src/libslic3r/PrintConfig.cpp:2815 msgid "Threads" msgstr "Потоков" #: src/libslic3r/PrintConfig.cpp:2816 ->>>>>>> master msgid "" -"Threads are used to parallelize long-running tasks. Optimal threads number is " -"slightly above the number of available cores/processors." +"Threads are used to parallelize long-running tasks. Optimal threads number " +"is slightly above the number of available cores/processors." msgstr "" -<<<<<<< HEAD -"КоличеÑтво потоков Ð´Ð»Ñ Ñ€Ð°ÑÐ¿Ð°Ñ€Ð°Ð»Ð»ÐµÐ»Ð¸Ð²Ð°Ð½Ð¸Ñ Ð´Ð»Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ñ… задач. Оптимальное количеÑтво " -"потоков неÑколько превышает количеÑтво доÑтупных Ñдер/процеÑÑоров." - -#: src/libslic3r/PrintConfig.cpp:2322 -msgid "" -"This custom code is inserted before every toolchange. Placeholder variables for all " -"PrusaSlicer settings as well as {previous_extruder} and {next_extruder} can be " -"used. When a tool-changing command which changes to the correct extruder is " -"included (such as T{next_extruder}), PrusaSlicer will emit no other such command. " -"It is therefore possible to script custom behaviour both before and after the " -"toolchange." -msgstr "" -"Ðтот пользовательÑкий код вÑтавлÑетÑÑ Ð¿ÐµÑ€ÐµÐ´ каждой Ñменой инÑтрумента. Ð’Ñ‹ можете " -"иÑпользовать шаблонные переменные Ð´Ð»Ñ Ð²Ñех параметров PrusaSlicer в том чиÑле " -"{previous_extruder} и {next_extruder}. При включении команды Ñмены инÑтрумента, " -"ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð·Ð°Ð¼ÐµÐ½Ñет правильный ÑкÑтрудер (например T{next_extruder}), PrusaSlicer не " -"будет запуÑкать никакие другие подобные команды. Таким образом, можно Ñоздавать " -"ÑобÑтвенные Ñценарии Ð¿Ð¾Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð´Ð¾ и поÑле Ñмены инÑтрумента.???" - -#: src/libslic3r/PrintConfig.cpp:2335 -======= "КоличеÑтво потоков Ð´Ð»Ñ Ñ€Ð°ÑÐ¿Ð°Ñ€Ð°Ð»Ð»ÐµÐ»Ð¸Ð²Ð°Ð½Ð¸Ñ Ð´Ð»Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ñ… задач. Оптимальное " "количеÑтво потоков неÑколько превышает количеÑтво доÑтупных Ñдер/процеÑÑоров." @@ -23065,24 +14156,14 @@ msgstr "" "так и поÑле Ñмены инÑтрумента." #: src/libslic3r/PrintConfig.cpp:2841 ->>>>>>> master msgid "" -"Set this to a non-zero value to set a manual extrusion width for infill for top " -"surfaces. You may want to use thinner extrudates to fill all narrow regions and get " -"a smoother finish. If left zero, default extrusion width will be used if set, " -"otherwise nozzle diameter will be used. If expressed as percentage (for example " -"90%) it will be computed over layer height." +"Set this to a non-zero value to set a manual extrusion width for infill for " +"top surfaces. You may want to use thinner extrudates to fill all narrow " +"regions and get a smoother finish. If left zero, default extrusion width " +"will be used if set, otherwise nozzle diameter will be used. If expressed as " +"percentage (for example 90%) it will be computed over layer height." msgstr "" "УÑтановите значение отличное от 0, чтобы вручную задать ширину ÑкÑтрузии Ð´Ð»Ñ " -<<<<<<< HEAD -"Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð²ÐµÑ€Ñ…Ð½ÐµÐ¹ поверхноÑти. Ð’Ñ‹ можете иÑпользовать более тонкие Ñопла, чтобы " -"заполнить вÑе узкие облаÑти и получить более гладкую поверхноÑÑ‚ÑŒ. ЕÑли оÑтавить 0, " -"будет иÑпользоватьÑÑ \"Ширина ÑкÑтрузии по умолчанию\" - еÑли она задана, в " -"противном Ñлучае будет иÑпользоватьÑÑ Ð´Ð¸Ð°Ð¼ÐµÑ‚Ñ€ Ñопла. ЕÑли задано в процентах, " -"параметр вычиÑлÑетÑÑ Ð¾Ñ‚Ð½Ð¾Ñительно выÑоты ÑлоÑ." - -#: src/libslic3r/PrintConfig.cpp:2347 -======= "Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð²ÐµÑ€Ñ…Ð½ÐµÐ¹ поверхноÑти. Ð’Ñ‹ можете иÑпользовать более тонкие Ñопла, " "чтобы заполнить вÑе узкие облаÑти и получить более гладкую поверхноÑÑ‚ÑŒ. ЕÑли " "оÑтавить 0, будет иÑпользоватьÑÑ Â«Ð¨Ð¸Ñ€Ð¸Ð½Ð° ÑкÑтрузии по умолчанию» - еÑли она " @@ -23090,29 +14171,18 @@ msgstr "" "процентах, параметр вычиÑлÑетÑÑ Ð¾Ñ‚Ð½Ð¾Ñительно выÑоты ÑлоÑ." #: src/libslic3r/PrintConfig.cpp:2854 ->>>>>>> master msgid "" -"Speed for printing top solid layers (it only applies to the uppermost external " -"layers and not to their internal solid layers). You may want to slow down this to " -"get a nicer surface finish. This can be expressed as a percentage (for example: " -"80%) over the solid infill speed above. Set to zero for auto." +"Speed for printing top solid layers (it only applies to the uppermost " +"external layers and not to their internal solid layers). You may want to " +"slow down this to get a nicer surface finish. This can be expressed as a " +"percentage (for example: 80%) over the solid infill speed above. Set to zero " +"for auto." msgstr "" -"СкороÑÑ‚ÑŒ печати верхних Ñплошных Ñлоёв. Ð’Ñ‹ можете Ñнизить ÑкороÑÑ‚ÑŒ, чтобы получить " -"более качеÑтвенную поверхноÑÑ‚ÑŒ. ЕÑли задано в процентах, параметр вычиÑлÑетÑÑ " -"отноÑительно ÑкороÑти Ñплошного Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ð¹ выше. УÑтановите 0 Ð´Ð»Ñ " -"автонаÑтройки." - -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2362 -msgid "Number of solid layers to generate on top surfaces." -msgstr "КоличеÑтво Ñплошных Ñлоёв при печати верхней поверхноÑти модели." - -#: src/libslic3r/PrintConfig.cpp:2363 -msgid "Top solid layers" -msgstr "Верхних Ñплошных Ñлоёв" +"СкороÑÑ‚ÑŒ печати верхних Ñплошных Ñлоёв. Ð’Ñ‹ можете Ñнизить ÑкороÑÑ‚ÑŒ, чтобы " +"получить более качеÑтвенную поверхноÑÑ‚ÑŒ. ЕÑли задано в процентах, параметр " +"вычиÑлÑетÑÑ Ð¾Ñ‚Ð½Ð¾Ñительно ÑкороÑти Ñплошного Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ð¹ выше. " +"УÑтановите 0 Ð´Ð»Ñ Ð°Ð²Ñ‚Ð¾Ð½Ð°Ñтройки." -#: src/libslic3r/PrintConfig.cpp:2371 -======= #: src/libslic3r/PrintConfig.cpp:2869 msgid "Number of solid layers to generate on top surfaces." msgstr "КоличеÑтво Ñплошных Ñлоёв при печати верхней поверхноÑти модели." @@ -23122,33 +14192,11 @@ msgid "Top solid layers" msgstr "Верхних Ñплошных Ñлоёв" #: src/libslic3r/PrintConfig.cpp:2878 ->>>>>>> master msgid "" -"The number of top solid layers is increased above top_solid_layers if necessary to " -"satisfy minimum thickness of top shell. This is useful to prevent pillowing effect " -"when printing with variable layer height." +"The number of top solid layers is increased above top_solid_layers if " +"necessary to satisfy minimum thickness of top shell. This is useful to " +"prevent pillowing effect when printing with variable layer height." msgstr "" -<<<<<<< HEAD -"При необходимоÑти количеÑтво верхних Ñплошных Ñлоёв увеличиваетÑÑ Ð²Ñ‹ÑˆÐµ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ " -"top_solid_layers (\"Сплошных Ñлоёв Ñверху\") Ð´Ð»Ñ ÑƒÐ´Ð¾Ð²Ð»ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð¸Ñ Ð¼Ð¸Ð½Ð¸Ð¼Ð°Ð»ÑŒÐ½Ð¾Ð¹ толщины " -"оболочки Ñверху. Полезно Ð´Ð»Ñ Ð¿Ñ€ÐµÐ´Ð¾Ñ‚Ð²Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ñффекта \"дырÑвой подушки\" (верхнÑÑ " -"поверхноÑÑ‚ÑŒ не полноÑтью закрыта или имеет неровноÑти) при печати Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð¾Ð¹ " -"выÑотой ÑлоÑ." - -#: src/libslic3r/PrintConfig.cpp:2374 -msgid "Minimum top shell thickness" -msgstr "ÐœÐ¸Ð½Ð¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ Ñ‚Ð¾Ð»Ñ‰Ð¸Ð½Ð° оболочки Ñверху" - -#: src/libslic3r/PrintConfig.cpp:2381 -msgid "Speed for travel moves (jumps between distant extrusion points)." -msgstr "СкороÑÑ‚ÑŒ Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰ÐµÐ½Ð¸Ñ ÑкÑтрудера при позиционировании без печати." - -#: src/libslic3r/PrintConfig.cpp:2389 -msgid "Use firmware retraction" -msgstr "ИÑпользовать ретракт из прошивки" - -#: src/libslic3r/PrintConfig.cpp:2390 -======= "При необходимоÑти количеÑтво верхних Ñплошных Ñлоёв увеличиваетÑÑ Ð²Ñ‹ÑˆÐµ " "Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ top_solid_layers («Сплошных Ñлоёв Ñверху») Ð´Ð»Ñ ÑƒÐ´Ð¾Ð²Ð»ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð¸Ñ " "минимальной толщины оболочки Ñверху. Полезно Ð´Ð»Ñ Ð¿Ñ€ÐµÐ´Ð¾Ñ‚Ð²Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ñффекта " @@ -23182,70 +14230,40 @@ msgid "Use firmware retraction" msgstr "ИÑпользовать ретракт из прошивки" #: src/libslic3r/PrintConfig.cpp:2906 ->>>>>>> master msgid "" -"This experimental setting uses G10 and G11 commands to have the firmware handle the " -"retraction. This is only supported in recent Marlin." +"This experimental setting uses G10 and G11 commands to have the firmware " +"handle the retraction. This is only supported in recent Marlin." msgstr "" "Ðта ÑкÑÐ¿ÐµÑ€Ð¸Ð¼ÐµÐ½Ñ‚Ð°Ð»ÑŒÐ½Ð°Ñ Ð¾Ð¿Ñ†Ð¸Ñ Ð¸Ñпользует команды G10 и G11, чтобы прошивка " "обрабатывала ретракт. ПоддерживаетÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ в поÑледних верÑиÑÑ… Marlin. " -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2396 -msgid "Use relative E distances" -msgstr "ИÑпользовать отноÑительные координаты Ð´Ð»Ñ ÑкÑтрудера (E)" - -#: src/libslic3r/PrintConfig.cpp:2397 -======= #: src/libslic3r/PrintConfig.cpp:2912 msgid "Use relative E distances" msgstr "ИÑпользовать отноÑительные координаты Ð´Ð»Ñ ÑкÑтрудера (E)" #: src/libslic3r/PrintConfig.cpp:2913 ->>>>>>> master msgid "" "If your firmware requires relative E values, check this, otherwise leave it " "unchecked. Most firmwares use absolute values." msgstr "" "Движение ÑкÑтрудера (E) по отношению к предыдущей позиции не в абÑолютном " -"выражении, а в отноÑительном. БольшинÑтво прошивок иÑпользуют абÑолютные Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ " -"при позиционировании. ЕÑли вы не знаете - иÑпользует ли ваша прошивка Ñту функцию, " -"то не отмечайте Ñто значение." - -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2403 -msgid "Use volumetric E" -msgstr "ИÑпользовать объёмные Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð´Ð»Ñ ÑкÑтрудера (E)" +"выражении, а в отноÑительном. БольшинÑтво прошивок иÑпользуют абÑолютные " +"Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¸ позиционировании. ЕÑли вы не знаете - иÑпользует ли ваша " +"прошивка Ñту функцию, то не отмечайте Ñто значение." -#: src/libslic3r/PrintConfig.cpp:2404 -======= #: src/libslic3r/PrintConfig.cpp:2919 msgid "Use volumetric E" msgstr "ИÑпользовать объёмные Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð´Ð»Ñ ÑкÑтрудера (E)" #: src/libslic3r/PrintConfig.cpp:2920 ->>>>>>> master -msgid "" -"This experimental setting uses outputs the E values in cubic millimeters instead of " -"linear millimeters. If your firmware doesn't already know filament diameter(s), you " -"can put commands like 'M200 D[filament_diameter_0] T0' in your start G-code in " -"order to turn volumetric mode on and use the filament diameter associated to the " -"filament selected in Slic3r. This is only supported in recent Marlin." -msgstr "" -<<<<<<< HEAD -"Ðта ÑкÑÐ¿ÐµÑ€Ð¸Ð¼ÐµÐ½Ñ‚Ð°Ð»ÑŒÐ½Ð°Ñ Ð¾Ð¿Ñ†Ð¸Ñ Ð¸Ñпользует выходные Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ ÑкÑтрудера в кубичеÑких " -"миллиметрах вмеÑто линейных миллиметров. ЕÑли в вашей прошивке ещё не задан диаметр " -"прутка, вы можете пропиÑать в Ñвой Ñтартовый G-код команды, например такую как 'M200 " -"D [filament_diameter_0] T0', чтобы включить объёмный режим и иÑпользовать диаметр " -"прутка указанный в PrusaSlicer. Ðто Ñ„ÑƒÐ½ÐºÑ†Ð¸Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶Ð¸Ð²Ð°ÐµÑ‚ÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ в поÑледних верÑиÑÑ… " -"Marlin." - -#: src/libslic3r/PrintConfig.cpp:2414 -msgid "Enable variable layer height feature" -msgstr "Включить функцию переменной выÑоты Ñлоёв" - -#: src/libslic3r/PrintConfig.cpp:2415 -======= +msgid "" +"This experimental setting uses outputs the E values in cubic millimeters " +"instead of linear millimeters. If your firmware doesn't already know " +"filament diameter(s), you can put commands like 'M200 D[filament_diameter_0] " +"T0' in your start G-code in order to turn volumetric mode on and use the " +"filament diameter associated to the filament selected in Slic3r. This is " +"only supported in recent Marlin." +msgstr "" "Ðта ÑкÑÐ¿ÐµÑ€Ð¸Ð¼ÐµÐ½Ñ‚Ð°Ð»ÑŒÐ½Ð°Ñ Ð¾Ð¿Ñ†Ð¸Ñ Ð¸Ñпользует выходные Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ ÑкÑтрудера в " "кубичеÑких миллиметрах вмеÑто линейных миллиметров. ЕÑли в вашей прошивке " "ещё не задан диаметр прутка, вы можете пропиÑать в Ñвой Ñтартовый G-код " @@ -23258,79 +14276,44 @@ msgid "Enable variable layer height feature" msgstr "Включить функцию переменной выÑоты Ñлоёв" #: src/libslic3r/PrintConfig.cpp:2931 ->>>>>>> master msgid "" -"Some printers or printer setups may have difficulties printing with a variable " -"layer height. Enabled by default." +"Some printers or printer setups may have difficulties printing with a " +"variable layer height. Enabled by default." msgstr "" -"Ðекоторые принтеры (или из-за наÑтроек принтера) могут иÑпытывать трудноÑти при " -"печати Ñ Ñ„ÑƒÐ½ÐºÑ†Ð¸ÐµÐ¹ переменной выÑотой Ñлоёв. По умолчанию включено." +"Ðекоторые принтеры (или из-за наÑтроек принтера) могут иÑпытывать трудноÑти " +"при печати Ñ Ñ„ÑƒÐ½ÐºÑ†Ð¸ÐµÐ¹ переменной выÑотой Ñлоёв. По умолчанию включено." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2421 -msgid "Wipe while retracting" -msgstr "ОчиÑтка Ñопла при ретракте" - -#: src/libslic3r/PrintConfig.cpp:2422 -======= #: src/libslic3r/PrintConfig.cpp:2937 msgid "Wipe while retracting" msgstr "ОчиÑтка Ñопла при ретракте" #: src/libslic3r/PrintConfig.cpp:2938 ->>>>>>> master msgid "" -"This flag will move the nozzle while retracting to minimize the possible blob on " -"leaky extruders." +"This flag will move the nozzle while retracting to minimize the possible " +"blob on leaky extruders." msgstr "" -<<<<<<< HEAD -"ПозволÑет Ñоплу Ñовершать разглаживавшее движение во Ð²Ñ€ÐµÐ¼Ñ Ñ€ÐµÑ‚Ñ€Ð°ÐºÑ‚Ð°, чтобы ÑвеÑти к " -"минимуму возможное образование пупырышек в начале/конце ÑÐ»Ð¾Ñ Ð½Ð° ÑкÑтрудерах, " -"которые имеют тенденцию к течи." - -#: src/libslic3r/PrintConfig.cpp:2429 -======= "ПозволÑет Ñоплу Ñовершать разглаживавшее движение во Ð²Ñ€ÐµÐ¼Ñ Ñ€ÐµÑ‚Ñ€Ð°ÐºÑ‚Ð°, чтобы " "ÑвеÑти к минимуму возможное образование пупырышек в начале/конце ÑÐ»Ð¾Ñ Ð½Ð° " "ÑкÑтрудерах, которые имеют тенденцию к течи." #: src/libslic3r/PrintConfig.cpp:2945 ->>>>>>> master msgid "" -"Multi material printers may need to prime or purge extruders on tool changes. " -"Extrude the excess material into the wipe tower." +"Multi material printers may need to prime or purge extruders on tool " +"changes. Extrude the excess material into the wipe tower." msgstr "" "Ð”Ð»Ñ Ð¼ÑƒÐ»ÑŒÑ‚Ð¸Ð¼Ð°Ñ‚ÐµÑ€Ð¸Ð°Ð»ÑŒÐ½Ñ‹Ñ… принтеров может потребоватьÑÑ Ð¿Ñ€ÐµÐ´Ð·Ð°Ñ€Ñдка и Ñмена " "инÑтрумента. Избыточный материал будет выдавливатьÑÑ Ð½Ð° черновую башню." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2435 -msgid "Purging volumes - load/unload volumes" -msgstr "Очищающие объёмы - загрузка/выгрузка объёмов" - -#: src/libslic3r/PrintConfig.cpp:2436 -======= #: src/libslic3r/PrintConfig.cpp:2951 msgid "Purging volumes - load/unload volumes" msgstr "Очищающие объёмы - загрузка/выгрузка объёмов" #: src/libslic3r/PrintConfig.cpp:2952 ->>>>>>> master msgid "" -"This vector saves required volumes to change from/to each tool used on the wipe " -"tower. These values are used to simplify creation of the full purging volumes below." +"This vector saves required volumes to change from/to each tool used on the " +"wipe tower. These values are used to simplify creation of the full purging " +"volumes below." msgstr "" -<<<<<<< HEAD -"Ðтот параметр задаёт объём материала, который будет выдавлен на черновую башню Ð´Ð»Ñ " -"прочиÑтки Ñопла при Ñмене ÑкÑтрудеров/инÑтрументов. Ðти Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð¸ÑпользуютÑÑ Ð´Ð»Ñ " -"ÑƒÐ¿Ñ€Ð¾Ñ‰ÐµÐ½Ð¸Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¿Ð¾Ð»Ð½Ð¾Ñ‚Ñ‹ объёмов очиÑтки указанной ниже." - -#: src/libslic3r/PrintConfig.cpp:2442 -msgid "Purging volumes - matrix" -msgstr "Таблица очищающих объёмов" - -#: src/libslic3r/PrintConfig.cpp:2443 -======= "Ðтот параметр задаёт объём материала, который будет выдавлен на черновую " "башню Ð´Ð»Ñ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñтки Ñопла при Ñмене ÑкÑтрудеров/инÑтрументов. Ðти Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ " "иÑпользуютÑÑ Ð´Ð»Ñ ÑƒÐ¿Ñ€Ð¾Ñ‰ÐµÐ½Ð¸Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¿Ð¾Ð»Ð½Ð¾Ñ‚Ñ‹ объёмов очиÑтки указанной ниже." @@ -23340,62 +14323,10 @@ msgid "Purging volumes - matrix" msgstr "Таблица очищающих объёмов" #: src/libslic3r/PrintConfig.cpp:2959 ->>>>>>> master msgid "" -"This matrix describes volumes (in cubic milimetres) required to purge the new " -"filament on the wipe tower for any given pair of tools." +"This matrix describes volumes (in cubic milimetres) required to purge the " +"new filament on the wipe tower for any given pair of tools." msgstr "" -<<<<<<< HEAD -"Ðта таблица опиÑывает объёмы (в кубичеÑких миллиметрах), необходимые Ð´Ð»Ñ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñтки " -"нового прутка на черновой башне Ð´Ð»Ñ Ð»ÑŽÐ±Ð¾Ð¹ пары Ñопел\\ÑкÑтрудеров." - -#: src/libslic3r/PrintConfig.cpp:2452 -msgid "Position X" -msgstr "Ð¥ Ð¿Ð¾Ð·Ð¸Ñ†Ð¸Ñ Ð±Ð°ÑˆÐ½Ð¸" - -#: src/libslic3r/PrintConfig.cpp:2453 -msgid "X coordinate of the left front corner of a wipe tower" -msgstr "X координата левого переднего угла черновой башни" - -#: src/libslic3r/PrintConfig.cpp:2459 -msgid "Position Y" -msgstr "Y Ð¿Ð¾Ð·Ð¸Ñ†Ð¸Ñ Ð±Ð°ÑˆÐ½Ð¸" - -#: src/libslic3r/PrintConfig.cpp:2460 -msgid "Y coordinate of the left front corner of a wipe tower" -msgstr "Y координата левого переднего угла черновой башне" - -#: src/libslic3r/PrintConfig.cpp:2467 -msgid "Width of a wipe tower" -msgstr "Ширина черновой башни" - -#: src/libslic3r/PrintConfig.cpp:2473 -msgid "Wipe tower rotation angle" -msgstr "Угол поворота черновой башни" - -#: src/libslic3r/PrintConfig.cpp:2474 -msgid "Wipe tower rotation angle with respect to x-axis." -msgstr "Угол поворота черновой башни отноÑительно оÑи X." - -#: src/libslic3r/PrintConfig.cpp:2481 -msgid "Wipe into this object's infill" -msgstr "ОчиÑтка в заполнение модели" - -#: src/libslic3r/PrintConfig.cpp:2482 -msgid "" -"Purging after toolchange will done inside this object's infills. This lowers the " -"amount of waste but may result in longer print time due to additional travel moves." -msgstr "" -"ОчиÑтка поÑле замены инÑтрумента будет выполнÑÑ‚ÑŒÑÑ Ð²Ð½ÑƒÑ‚Ñ€Ð¸ Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð¼Ð¾Ð´ÐµÐ»Ð¸. ÐžÐ¿Ñ†Ð¸Ñ " -"уменьшает количеÑтво отходов, но может привеÑти к увеличению времени печати из-за " -"дополнительных перемещений." - -#: src/libslic3r/PrintConfig.cpp:2489 -msgid "Wipe into this object" -msgstr "ОчиÑтка в модель" - -#: src/libslic3r/PrintConfig.cpp:2490 -======= "Ðта таблица опиÑывает объёмы (в кубичеÑких миллиметрах), необходимые Ð´Ð»Ñ " "прочиÑтки нового прутка на черновой башне Ð´Ð»Ñ Ð»ÑŽÐ±Ð¾Ð¹ пары Ñопел\\ÑкÑтрудеров." @@ -23450,23 +14381,11 @@ msgid "Wipe into this object" msgstr "ОчиÑтка в модель" #: src/libslic3r/PrintConfig.cpp:3014 ->>>>>>> master msgid "" -"Object will be used to purge the nozzle after a toolchange to save material that " -"would otherwise end up in the wipe tower and decrease print time. Colours of the " -"objects will be mixed as a result." +"Object will be used to purge the nozzle after a toolchange to save material " +"that would otherwise end up in the wipe tower and decrease print time. " +"Colours of the objects will be mixed as a result." msgstr "" -<<<<<<< HEAD -"ОчиÑтка Ñопла поÑле Ñмены инÑтрумента будет выполнÑÑ‚ÑŒÑÑ Ð² модель, чтобы Ñохранить " -"материал (который иначе попал бы на черновую башню) и Ñократить Ð²Ñ€ÐµÐ¼Ñ Ð¿ÐµÑ‡Ð°Ñ‚Ð¸. Ð’ " -"результате цвета моделей будут Ñмешаны." - -#: src/libslic3r/PrintConfig.cpp:2496 -msgid "Maximal bridging distance" -msgstr "МакÑимальное длина моÑта" - -#: src/libslic3r/PrintConfig.cpp:2497 -======= "ОчиÑтка Ñопла поÑле Ñмены инÑтрумента будет выполнÑÑ‚ÑŒÑÑ Ð² модель, чтобы " "Ñохранить материал (который иначе попал бы на черновую башню) и Ñократить " "Ð²Ñ€ÐµÐ¼Ñ Ð¿ÐµÑ‡Ð°Ñ‚Ð¸. Ð’ результате цвета моделей будут Ñмешаны." @@ -23476,39 +14395,20 @@ msgid "Maximal bridging distance" msgstr "МакÑимальное длина моÑта" #: src/libslic3r/PrintConfig.cpp:3021 ->>>>>>> master msgid "Maximal distance between supports on sparse infill sections." -msgstr "МакÑимальное раÑÑтоÑние между опорами на разрÑженных учаÑтках заполнениÑ." - -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2503 -msgid "XY Size Compensation" -msgstr "ÐšÐ¾Ñ€Ñ€ÐµÐºÑ†Ð¸Ñ Ð³Ð¾Ñ€Ð¸Ð·Ð¾Ð½Ñ‚Ð°Ð»ÑŒÐ½Ñ‹Ñ… размеров модели" +msgstr "" +"МакÑимальное раÑÑтоÑние между опорами на разрÑженных учаÑтках заполнениÑ." -#: src/libslic3r/PrintConfig.cpp:2505 -======= #: src/libslic3r/PrintConfig.cpp:3027 msgid "XY Size Compensation" msgstr "ÐšÐ¾Ñ€Ñ€ÐµÐºÑ†Ð¸Ñ Ð³Ð¾Ñ€Ð¸Ð·Ð¾Ð½Ñ‚Ð°Ð»ÑŒÐ½Ñ‹Ñ… размеров модели" #: src/libslic3r/PrintConfig.cpp:3029 ->>>>>>> master msgid "" -"The object will be grown/shrunk in the XY plane by the configured value (negative = " -"inwards, positive = outwards). This might be useful for fine-tuning hole sizes." +"The object will be grown/shrunk in the XY plane by the configured value " +"(negative = inwards, positive = outwards). This might be useful for fine-" +"tuning hole sizes." msgstr "" -<<<<<<< HEAD -"Параметр отвечает за Ñмещение границы контура печатаемой модели в плоÑкоÑти XY на " -"заданное значение. Отрицательное значение - во внутрь, положительный - наружу. " -"Может быть полезно Ð´Ð»Ñ Ñ‚Ð¾Ñ‡Ð½Ð¾Ð¹ наÑтройки размеров отверÑтий при печати шевронных " -"подшипников." - -#: src/libslic3r/PrintConfig.cpp:2513 -msgid "Z offset" -msgstr "Смещение Ñтола по оÑи Z" - -#: src/libslic3r/PrintConfig.cpp:2514 -======= "Параметр отвечает за Ñмещение границы контура печатаемой модели в плоÑкоÑти " "XY на заданное значение. Отрицательное значение - во внутрь, положительный - " "наружу. Может быть полезно Ð´Ð»Ñ Ñ‚Ð¾Ñ‡Ð½Ð¾Ð¹ наÑтройки размеров отверÑтий при " @@ -23519,75 +14419,12 @@ msgid "Z offset" msgstr "Смещение Ñтола по оÑи Z" #: src/libslic3r/PrintConfig.cpp:3038 ->>>>>>> master msgid "" -"This value will be added (or subtracted) from all the Z coordinates in the output G-" -"code. It is used to compensate for bad Z endstop position: for example, if your " -"endstop zero actually leaves the nozzle 0.3mm far from the print bed, set this to " -"-0.3 (or fix your endstop)." +"This value will be added (or subtracted) from all the Z coordinates in the " +"output G-code. It is used to compensate for bad Z endstop position: for " +"example, if your endstop zero actually leaves the nozzle 0.3mm far from the " +"print bed, set this to -0.3 (or fix your endstop)." msgstr "" -<<<<<<< HEAD -"Смещение Ñтола по вертикальной оÑи Z при ошибках работы концевого датчика. Ðто " -"значение будет прибавлено (или вычтено) из вÑех Z координат в выходном G-коде." - -#: src/libslic3r/PrintConfig.cpp:2581 -msgid "Display width" -msgstr "Ширина диÑплеÑ" - -#: src/libslic3r/PrintConfig.cpp:2582 -msgid "Width of the display" -msgstr "Ð’Ñ‹Ñота диÑплеÑ." - -#: src/libslic3r/PrintConfig.cpp:2587 -msgid "Display height" -msgstr "Ð’Ñ‹Ñота диÑплеÑ" - -#: src/libslic3r/PrintConfig.cpp:2588 -msgid "Height of the display" -msgstr "Ð’Ñ‹Ñота диÑплеÑ." - -#: src/libslic3r/PrintConfig.cpp:2593 -msgid "Number of pixels in" -msgstr "КоличеÑтво пикÑелей" - -#: src/libslic3r/PrintConfig.cpp:2595 -msgid "Number of pixels in X" -msgstr "КоличеÑтво пикÑелей по X." - -#: src/libslic3r/PrintConfig.cpp:2601 -msgid "Number of pixels in Y" -msgstr "КоличеÑтво пикÑелей по Y." - -#: src/libslic3r/PrintConfig.cpp:2606 -msgid "Display horizontal mirroring" -msgstr "Горизонтальное зеркалирование диÑплеÑ" - -#: src/libslic3r/PrintConfig.cpp:2607 -msgid "Mirror horizontally" -msgstr "Зеркалировать по горизонтали" - -#: src/libslic3r/PrintConfig.cpp:2608 -msgid "Enable horizontal mirroring of output images" -msgstr "Включение горизонтального Ð·ÐµÑ€ÐºÐ°Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð²Ñ‹Ñ…Ð¾Ð´Ð½Ñ‹Ñ… изображений." - -#: src/libslic3r/PrintConfig.cpp:2613 -msgid "Display vertical mirroring" -msgstr "Вертикальное зеркалирование диÑплеÑ" - -#: src/libslic3r/PrintConfig.cpp:2614 -msgid "Mirror vertically" -msgstr "Зеркалировать по вертикали" - -#: src/libslic3r/PrintConfig.cpp:2615 -msgid "Enable vertical mirroring of output images" -msgstr "Включение вертикального Ð·ÐµÑ€ÐºÐ°Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð²Ñ‹Ñ…Ð¾Ð´Ð½Ñ‹Ñ… изображений." - -#: src/libslic3r/PrintConfig.cpp:2620 -msgid "Display orientation" -msgstr "ÐžÑ€Ð¸ÐµÐ½Ñ‚Ð°Ñ†Ð¸Ñ Ð´Ð¸ÑплеÑ" - -#: src/libslic3r/PrintConfig.cpp:2621 -======= "Смещение Ñтола по вертикальной оÑи Z при ошибках работы концевого датчика. " "Ðто значение будет прибавлено (или вычтено) из вÑех Z координат в выходном G-" "коде." @@ -23649,55 +14486,11 @@ msgid "Display orientation" msgstr "ÐžÑ€Ð¸ÐµÐ½Ñ‚Ð°Ñ†Ð¸Ñ Ð´Ð¸ÑплеÑ" #: src/libslic3r/PrintConfig.cpp:3145 ->>>>>>> master msgid "" -"Set the actual LCD display orientation inside the SLA printer. Portrait mode will " -"flip the meaning of display width and height parameters and the output images will " -"be rotated by 90 degrees." +"Set the actual LCD display orientation inside the SLA printer. Portrait mode " +"will flip the meaning of display width and height parameters and the output " +"images will be rotated by 90 degrees." msgstr "" -<<<<<<< HEAD -"УÑтановите фактичеÑкую ориентацию ЖК-диÑÐ¿Ð»ÐµÑ Ð²Ð½ÑƒÑ‚Ñ€Ð¸ SLA принтера. Портретный режим " -"перевернёт Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¾Ð² ширины и выÑоты диÑплеÑ, а выходные Ð¸Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ " -"будут повёрнуты на 90 градуÑов." - -#: src/libslic3r/PrintConfig.cpp:2627 -msgid "Landscape" -msgstr "ÐльбомнаÑ" - -#: src/libslic3r/PrintConfig.cpp:2628 -msgid "Portrait" -msgstr "ПортретнаÑ" - -#: src/libslic3r/PrintConfig.cpp:2633 -msgid "Fast" -msgstr "БыÑтро" - -#: src/libslic3r/PrintConfig.cpp:2634 -msgid "Fast tilt" -msgstr "БыÑтрый наклон" - -#: src/libslic3r/PrintConfig.cpp:2635 -msgid "Time of the fast tilt" -msgstr "Ð’Ñ€ÐµÐ¼Ñ Ð±Ñ‹Ñтрого наклона." - -#: src/libslic3r/PrintConfig.cpp:2642 -msgid "Slow" -msgstr "Медленно" - -#: src/libslic3r/PrintConfig.cpp:2643 -msgid "Slow tilt" -msgstr "Медленный наклон" - -#: src/libslic3r/PrintConfig.cpp:2644 -msgid "Time of the slow tilt" -msgstr "Ð’Ñ€ÐµÐ¼Ñ Ð¼ÐµÐ´Ð»ÐµÐ½Ð½Ð¾Ð³Ð¾ наклона." - -#: src/libslic3r/PrintConfig.cpp:2651 -msgid "Area fill" -msgstr "Площадь заполнениÑ" - -#: src/libslic3r/PrintConfig.cpp:2652 -======= "УÑтановите фактичеÑкую ориентацию ЖК-диÑÐ¿Ð»ÐµÑ Ð²Ð½ÑƒÑ‚Ñ€Ð¸ SLA принтера. Портретный " "режим перевернёт Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¾Ð² ширины и выÑоты диÑплеÑ, а выходные " "Ð¸Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ Ð±ÑƒÐ´ÑƒÑ‚ повёрнуты на 90 градуÑов." @@ -23739,27 +14532,11 @@ msgid "Area fill" msgstr "Площадь заполнениÑ" #: src/libslic3r/PrintConfig.cpp:3176 ->>>>>>> master msgid "" "The percentage of the bed area. \n" "If the print area exceeds the specified value, \n" "then a slow tilt will be used, otherwise - a fast tilt" msgstr "" -<<<<<<< HEAD -"Процент от площади Ñтола. ЕÑли облаÑÑ‚ÑŒ печати превышает указанное значение, то " -"будет иÑпользоватьÑÑ Ð¼ÐµÐ´Ð»ÐµÐ½Ð½Ñ‹Ð¹ наклон, в противном Ñлучае - быÑтрый наклон." - -#: src/libslic3r/PrintConfig.cpp:2659 src/libslic3r/PrintConfig.cpp:2660 -#: src/libslic3r/PrintConfig.cpp:2661 -msgid "Printer scaling correction" -msgstr "Корректировка маÑштабированиÑ" - -#: src/libslic3r/PrintConfig.cpp:2667 src/libslic3r/PrintConfig.cpp:2668 -msgid "Printer absolute correction" -msgstr "ÐбÑÐ¾Ð»ÑŽÑ‚Ð½Ð°Ñ ÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð¸Ñ€Ð¾Ð²ÐºÐ° принтера" - -#: src/libslic3r/PrintConfig.cpp:2669 -======= "Процент от площади Ñтола. ЕÑли облаÑÑ‚ÑŒ печати превышает указанное значение, " "то будет иÑпользоватьÑÑ Ð¼ÐµÐ´Ð»ÐµÐ½Ð½Ñ‹Ð¹ наклон, в противном Ñлучае - быÑтрый " "наклон." @@ -23798,7 +14575,6 @@ msgid "Printer absolute correction" msgstr "ÐбÑÐ¾Ð»ÑŽÑ‚Ð½Ð°Ñ ÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð¸Ñ€Ð¾Ð²ÐºÐ° принтера" #: src/libslic3r/PrintConfig.cpp:3217 ->>>>>>> master msgid "" "Will inflate or deflate the sliced 2D polygons according to the sign of the " "correction." @@ -23806,22 +14582,6 @@ msgstr "" "Будет надувать или Ñдувать нарезанные 2D-полигоны в ÑоответÑтвии Ñо знаком " "коррекции." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2675 -msgid "Elephant foot minimum width" -msgstr "ÐœÐ¸Ð½Ð¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ ÑˆÐ¸Ñ€Ð¸Ð½Ð° \"Ñлоновьей ноги\"" - -#: src/libslic3r/PrintConfig.cpp:2677 -msgid "Minimum width of features to maintain when doing elephant foot compensation." -msgstr "" -"ÐœÐ¸Ð½Ð¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ ÑˆÐ¸Ñ€Ð¸Ð½Ð°, которую нужно поддерживать Ð´Ð»Ñ ÐºÐ¾Ð¼Ð¿ÐµÐ½Ñации \"Ñлоновьей ноги\"." - -#: src/libslic3r/PrintConfig.cpp:2684 src/libslic3r/PrintConfig.cpp:2685 -msgid "Printer gamma correction" -msgstr "Корректировка гаммы-коррекции" - -#: src/libslic3r/PrintConfig.cpp:2686 -======= #: src/libslic3r/PrintConfig.cpp:3223 msgid "Elephant foot minimum width" msgstr "ÐœÐ¸Ð½Ð¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ ÑˆÐ¸Ñ€Ð¸Ð½Ð° «Ñлоновьей ноги»" @@ -23838,55 +14598,11 @@ msgid "Printer gamma correction" msgstr "Корректировка гаммы-коррекции" #: src/libslic3r/PrintConfig.cpp:3234 ->>>>>>> master msgid "" -"This will apply a gamma correction to the rasterized 2D polygons. A gamma value of " -"zero means thresholding with the threshold in the middle. This behaviour eliminates " -"antialiasing without losing holes in polygons." +"This will apply a gamma correction to the rasterized 2D polygons. A gamma " +"value of zero means thresholding with the threshold in the middle. This " +"behaviour eliminates antialiasing without losing holes in polygons." msgstr "" -<<<<<<< HEAD -"Будет применена гамма-ÐºÐ¾Ñ€Ñ€ÐµÐºÑ†Ð¸Ñ Ðº раÑтрированным 2D-полигонам. Ðулевое значение " -"гаммы означает пороговое значение Ñ Ð¿Ð¾Ñ€Ð¾Ð³Ð¾Ð¼ поÑередине. Такое поведение убирает " -"Ñглаживание без потери отверÑтий в полигонах." - -#: src/libslic3r/PrintConfig.cpp:2698 src/libslic3r/PrintConfig.cpp:2699 -msgid "SLA material type" -msgstr "Тип SLA материала" - -#: src/libslic3r/PrintConfig.cpp:2710 src/libslic3r/PrintConfig.cpp:2711 -msgid "Initial layer height" -msgstr "ÐÐ°Ñ‡Ð°Ð»ÑŒÐ½Ð°Ñ Ð²Ñ‹Ñота ÑлоÑ" - -#: src/libslic3r/PrintConfig.cpp:2717 src/libslic3r/PrintConfig.cpp:2718 -msgid "Bottle volume" -msgstr "Объём бутылки" - -#: src/libslic3r/PrintConfig.cpp:2719 -msgid "ml" -msgstr "мл" - -#: src/libslic3r/PrintConfig.cpp:2724 src/libslic3r/PrintConfig.cpp:2725 -msgid "Bottle weight" -msgstr "Ð’ÐµÑ Ð±ÑƒÑ‚Ñ‹Ð»ÐºÐ¸" - -#: src/libslic3r/PrintConfig.cpp:2726 -msgid "kg" -msgstr "кг" - -#: src/libslic3r/PrintConfig.cpp:2733 -msgid "g/ml" -msgstr "г/мл" - -#: src/libslic3r/PrintConfig.cpp:2740 -msgid "money/bottle" -msgstr "цена/бутылка" - -#: src/libslic3r/PrintConfig.cpp:2745 -msgid "Faded layers" -msgstr "Ðачальных Ñлоёв" - -#: src/libslic3r/PrintConfig.cpp:2746 -======= "Будет применена гамма-ÐºÐ¾Ñ€Ñ€ÐµÐºÑ†Ð¸Ñ Ðº раÑтрированным 2D-полигонам. Ðулевое " "значение гаммы означает пороговое значение Ñ Ð¿Ð¾Ñ€Ð¾Ð³Ð¾Ð¼ поÑередине. Такое " "поведение убирает Ñглаживание без потери отверÑтий в полигонах." @@ -23928,103 +14644,10 @@ msgid "Faded layers" msgstr "Ðачальных Ñлоёв" #: src/libslic3r/PrintConfig.cpp:3301 ->>>>>>> master msgid "" -"Number of the layers needed for the exposure time fade from initial exposure time " -"to the exposure time" -msgstr "" -<<<<<<< HEAD -"КоличеÑтво начальных Ñлоёв, необходимых Ð´Ð»Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð²Ñ€ÐµÐ¼ÐµÐ½Ð¸ заÑветки от \"Ð’Ñ€ÐµÐ¼Ñ " -"заÑветки начальных Ñлоёв\" до \"Ð’Ñ€ÐµÐ¼Ñ Ð·Ð°Ñветки оÑновных Ñлоёв\"." - -#: src/libslic3r/PrintConfig.cpp:2753 src/libslic3r/PrintConfig.cpp:2754 -msgid "Minimum exposure time" -msgstr "Мин. Ð²Ñ€ÐµÐ¼Ñ Ð·Ð°Ñветки оÑновных Ñлоёв" - -#: src/libslic3r/PrintConfig.cpp:2761 src/libslic3r/PrintConfig.cpp:2762 -msgid "Maximum exposure time" -msgstr "МакÑ. Ð²Ñ€ÐµÐ¼Ñ Ð·Ð°Ñветки оÑновных Ñлоёв" - -#: src/libslic3r/PrintConfig.cpp:2769 src/libslic3r/PrintConfig.cpp:2770 -msgid "Exposure time" -msgstr "Ð’Ñ€ÐµÐ¼Ñ Ð·Ð°Ñветки обычных Ñлоёв" - -#: src/libslic3r/PrintConfig.cpp:2776 src/libslic3r/PrintConfig.cpp:2777 -msgid "Minimum initial exposure time" -msgstr "Мин. Ð²Ñ€ÐµÐ¼Ñ Ð·Ð°Ñветки начальных Ñлоёв" - -#: src/libslic3r/PrintConfig.cpp:2784 src/libslic3r/PrintConfig.cpp:2785 -msgid "Maximum initial exposure time" -msgstr "МакÑ. Ð²Ñ€ÐµÐ¼Ñ Ð·Ð°Ñветки начальных Ñлоёв" - -#: src/libslic3r/PrintConfig.cpp:2792 src/libslic3r/PrintConfig.cpp:2793 -msgid "Initial exposure time" -msgstr "Ð’Ñ€ÐµÐ¼Ñ Ð·Ð°Ñветки начальных Ñлоёв" - -#: src/libslic3r/PrintConfig.cpp:2799 src/libslic3r/PrintConfig.cpp:2800 -msgid "Correction for expansion" -msgstr "ÐšÐ¾Ñ€Ñ€ÐµÐºÑ†Ð¸Ñ Ñ€Ð°ÑширениÑ" - -#: src/libslic3r/PrintConfig.cpp:2806 -msgid "SLA print material notes" -msgstr "Примечание к SLA материалу" - -#: src/libslic3r/PrintConfig.cpp:2807 -msgid "You can put your notes regarding the SLA print material here." -msgstr "" -"ЗдеÑÑŒ вы можете размеÑтить Ñвои заметки отноÑительно SLA материала Ð´Ð»Ñ Ð¿ÐµÑ‡Ð°Ñ‚Ð¸." - -#: src/libslic3r/PrintConfig.cpp:2819 src/libslic3r/PrintConfig.cpp:2830 -msgid "Default SLA material profile" -msgstr "Профиль SLA материала по умолчанию" - -#: src/libslic3r/PrintConfig.cpp:2841 -msgid "Generate supports" -msgstr "Генерировать поддержку" - -#: src/libslic3r/PrintConfig.cpp:2843 -msgid "Generate supports for the models" -msgstr "Ð“ÐµÐ½ÐµÑ€Ð°Ñ†Ð¸Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ¸ Ð´Ð»Ñ Ð¼Ð¾Ð´ÐµÐ»ÐµÐ¹." - -#: src/libslic3r/PrintConfig.cpp:2848 -msgid "Pinhead front diameter" -msgstr "Диаметр ноÑика поддержки" - -#: src/libslic3r/PrintConfig.cpp:2850 -msgid "Diameter of the pointing side of the head" -msgstr "Диаметр ноÑика поддержки." - -#: src/libslic3r/PrintConfig.cpp:2857 -msgid "Head penetration" -msgstr "Глубина Ð¿Ñ€Ð¾Ð½Ð¸ÐºÐ½Ð¾Ð²ÐµÐ½Ð¸Ñ Ð½Ð¾Ñика поддержки" - -#: src/libslic3r/PrintConfig.cpp:2859 -msgid "How much the pinhead has to penetrate the model surface" -msgstr "Задаёт, как глубоко ноÑик поддержки будет проникать в модель." - -#: src/libslic3r/PrintConfig.cpp:2866 -msgid "Pinhead width" -msgstr "Длина ноÑика поддержки" - -#: src/libslic3r/PrintConfig.cpp:2868 -msgid "Width from the back sphere center to the front sphere center" +"Number of the layers needed for the exposure time fade from initial exposure " +"time to the exposure time" msgstr "" -"Длина ноÑика поддержки (ширина от центра задней Ñферы до центра передней Ñферы)." - -#: src/libslic3r/PrintConfig.cpp:2876 -msgid "Pillar diameter" -msgstr "Диаметр тела поддержки" - -#: src/libslic3r/PrintConfig.cpp:2878 -msgid "Diameter in mm of the support pillars" -msgstr "Диаметр тела поддержки в мм." - -#: src/libslic3r/PrintConfig.cpp:2886 -msgid "Small pillar diameter percent" -msgstr "Диаметр маленьких тел поддержки в процентах" - -#: src/libslic3r/PrintConfig.cpp:2888 -======= "КоличеÑтво начальных Ñлоёв, необходимых Ð´Ð»Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð²Ñ€ÐµÐ¼ÐµÐ½Ð¸ заÑветки от " "Â«Ð’Ñ€ÐµÐ¼Ñ Ð·Ð°Ñветки начальных Ñлоёв» до Â«Ð’Ñ€ÐµÐ¼Ñ Ð·Ð°Ñветки оÑновных Ñлоёв»." @@ -24129,22 +14752,10 @@ msgid "Small pillar diameter percent" msgstr "Диаметр маленьких тел поддержки в процентах" #: src/libslic3r/PrintConfig.cpp:3464 ->>>>>>> master msgid "" -"The percentage of smaller pillars compared to the normal pillar diameter which are " -"used in problematic areas where a normal pilla cannot fit." +"The percentage of smaller pillars compared to the normal pillar diameter " +"which are used in problematic areas where a normal pilla cannot fit." msgstr "" -<<<<<<< HEAD -"Размер тел поддержки меньшего размера в процентах по Ñравнению Ñ Ð¾Ð±Ñ‹Ñ‡Ð½Ñ‹Ð¼ диаметром " -"тел поддержки, которые иÑпользуютÑÑ Ð² проблемных облаÑÑ‚ÑÑ…, где нормальный Ñтолбик " -"поддержки не может помеÑтитьÑÑ." - -#: src/libslic3r/PrintConfig.cpp:2897 -msgid "Max bridges on a pillar" -msgstr "МакÑ. количеÑтво моÑтов на теле поддержки" - -#: src/libslic3r/PrintConfig.cpp:2899 -======= "Размер тел поддержки меньшего размера в процентах по Ñравнению Ñ Ð¾Ð±Ñ‹Ñ‡Ð½Ñ‹Ð¼ " "диаметром тел поддержки, которые иÑпользуютÑÑ Ð² проблемных облаÑÑ‚ÑÑ…, где " "нормальный Ñтолбик поддержки не может помеÑтитьÑÑ." @@ -24154,22 +14765,10 @@ msgid "Max bridges on a pillar" msgstr "МакÑ. количеÑтво моÑтов на теле поддержки" #: src/libslic3r/PrintConfig.cpp:3475 ->>>>>>> master msgid "" -"Maximum number of bridges that can be placed on a pillar. Bridges hold support " -"point pinheads and connect to pillars as small branches." +"Maximum number of bridges that can be placed on a pillar. Bridges hold " +"support point pinheads and connect to pillars as small branches." msgstr "" -<<<<<<< HEAD -"МакÑимальное количеÑтво моÑтов, которые можно размеÑтить на теле поддержки. МоÑÑ‚Ñ‹ " -"удерживают ноÑики поддержки и ÑоединÑÑŽÑ‚ÑÑ Ñ Ñ‚ÐµÐ»Ð°Ð¼Ð¸ поддержки в виде небольших " -"ветвей." - -#: src/libslic3r/PrintConfig.cpp:2907 -msgid "Pillar connection mode" -msgstr "Тип ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ñ‚ÐµÐ»Ð° поддержки" - -#: src/libslic3r/PrintConfig.cpp:2908 -======= "МакÑимальное количеÑтво моÑтов, которые можно размеÑтить на теле поддержки. " "МоÑÑ‚Ñ‹ удерживают ноÑики поддержки и ÑоединÑÑŽÑ‚ÑÑ Ñ Ñ‚ÐµÐ»Ð°Ð¼Ð¸ поддержки в виде " "небольших ветвей." @@ -24179,36 +14778,11 @@ msgid "Pillar connection mode" msgstr "Тип ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ñ‚ÐµÐ»Ð° поддержки" #: src/libslic3r/PrintConfig.cpp:3484 ->>>>>>> master msgid "" -"Controls the bridge type between two neighboring pillars. Can be zig-zag, cross " -"(double zig-zag) or dynamic which will automatically switch between the first two " -"depending on the distance of the two pillars." +"Controls the bridge type between two neighboring pillars. Can be zig-zag, " +"cross (double zig-zag) or dynamic which will automatically switch between " +"the first two depending on the distance of the two pillars." msgstr "" -<<<<<<< HEAD -"УправлÑет типом моÑтов, которые ÑоединÑÑŽÑ‚ ÑоÑедние тела поддержки. Может быть " -"зигзагообразным, перекрёÑтным (двойной зигзаг) или динамичеÑким, который " -"автоматичеÑки переключаетÑÑ Ð¼ÐµÐ¶Ð´Ñƒ первыми двумÑ, в завиÑимоÑти от раÑÑтоÑÐ½Ð¸Ñ Ð¼ÐµÐ¶Ð´Ñƒ " -"телами поддержки." - -#: src/libslic3r/PrintConfig.cpp:2916 -msgid "Zig-Zag" -msgstr "Зигзагообразный" - -#: src/libslic3r/PrintConfig.cpp:2917 -msgid "Cross" -msgstr "ПерекрёÑтный" - -#: src/libslic3r/PrintConfig.cpp:2918 -msgid "Dynamic" -msgstr "ДинамичеÑкий" - -#: src/libslic3r/PrintConfig.cpp:2930 -msgid "Pillar widening factor" -msgstr "КоÑффициент раÑÑˆÐ¸Ñ€ÐµÐ½Ð¸Ñ Ñ‚ÐµÐ»Ð° поддержки" - -#: src/libslic3r/PrintConfig.cpp:2932 -======= "УправлÑет типом моÑтов, которые ÑоединÑÑŽÑ‚ ÑоÑедние тела поддержки. Может " "быть зигзагообразным, перекрёÑтным (двойной зигзаг) или динамичеÑким, " "который автоматичеÑки переключаетÑÑ Ð¼ÐµÐ¶Ð´Ñƒ первыми двумÑ, в завиÑимоÑти от " @@ -24231,37 +14805,10 @@ msgid "Pillar widening factor" msgstr "КоÑффициент раÑÑˆÐ¸Ñ€ÐµÐ½Ð¸Ñ Ñ‚ÐµÐ»Ð° поддержки" #: src/libslic3r/PrintConfig.cpp:3508 ->>>>>>> master msgid "" -"Merging bridges or pillars into another pillars can increase the radius. Zero means " -"no increase, one means full increase." +"Merging bridges or pillars into another pillars can increase the radius. " +"Zero means no increase, one means full increase." msgstr "" -<<<<<<< HEAD -"СлиÑние моÑтов или тел поддержки в другие тела поддержки может увеличить их радиуÑ. " -"0 - отÑутÑтвие увеличениÑ, 1 - полное увеличение." - -#: src/libslic3r/PrintConfig.cpp:2941 -msgid "Support base diameter" -msgstr "Диаметр оÑÐ½Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ¸" - -#: src/libslic3r/PrintConfig.cpp:2943 -msgid "Diameter in mm of the pillar base" -msgstr "Диаметр оÑÐ½Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ¸ в мм." - -#: src/libslic3r/PrintConfig.cpp:2951 -msgid "Support base height" -msgstr "Ð’Ñ‹Ñота оÑÐ½Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ¸" - -#: src/libslic3r/PrintConfig.cpp:2953 -msgid "The height of the pillar base cone" -msgstr "Ð’Ñ‹Ñота конуÑообразного оÑÐ½Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ¸." - -#: src/libslic3r/PrintConfig.cpp:2960 -msgid "Support base safety distance" -msgstr "БезопаÑное раÑÑтоÑние оÑÐ½Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ¸" - -#: src/libslic3r/PrintConfig.cpp:2963 -======= "СлиÑние моÑтов или тел поддержки в другие тела поддержки может увеличить их " "радиуÑ. 0 - отÑутÑтвие увеличениÑ, 1 - полное увеличение." @@ -24286,39 +14833,11 @@ msgid "Support base safety distance" msgstr "БезопаÑное раÑÑтоÑние оÑÐ½Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ¸" #: src/libslic3r/PrintConfig.cpp:3539 ->>>>>>> master msgid "" -"The minimum distance of the pillar base from the model in mm. Makes sense in zero " -"elevation mode where a gap according to this parameter is inserted between the " -"model and the pad." +"The minimum distance of the pillar base from the model in mm. Makes sense in " +"zero elevation mode where a gap according to this parameter is inserted " +"between the model and the pad." msgstr "" -<<<<<<< HEAD -"Минимальное раÑÑтоÑние между оÑнованием поддержки и моделью в мм. Имеет ÑмыÑл в " -"режиме нулевой выÑоты подъёма, когда между моделью и подложкой вÑтавлÑетÑÑ Ð·Ð°Ð·Ð¾Ñ€ " -"заданный Ñтим параметром." - -#: src/libslic3r/PrintConfig.cpp:2973 -msgid "Critical angle" -msgstr "КритичеÑкий угол" - -#: src/libslic3r/PrintConfig.cpp:2975 -msgid "The default angle for connecting support sticks and junctions." -msgstr "Угол ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð¾Ð¿Ð¾Ñ€ поддержки Ñо ÑвÑзующим узлом." - -#: src/libslic3r/PrintConfig.cpp:2983 -msgid "Max bridge length" -msgstr "МакÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ Ð´Ð»Ð¸Ð½Ð° моÑта" - -#: src/libslic3r/PrintConfig.cpp:2985 -msgid "The max length of a bridge" -msgstr "МакÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ Ð´Ð»Ð¸Ð½Ð° моÑта." - -#: src/libslic3r/PrintConfig.cpp:2992 -msgid "Max pillar linking distance" -msgstr "МакÑимальное раÑÑтоÑние между телом поддержки" - -#: src/libslic3r/PrintConfig.cpp:2994 -======= "Минимальное раÑÑтоÑние между оÑнованием поддержки и моделью в мм. Имеет " "ÑмыÑл в режиме нулевой выÑоты подъёма, когда между моделью и подложкой " "вÑтавлÑетÑÑ Ð·Ð°Ð·Ð¾Ñ€ заданный Ñтим параметром." @@ -24344,64 +14863,18 @@ msgid "Max pillar linking distance" msgstr "МакÑимальное раÑÑтоÑние между телом поддержки" #: src/libslic3r/PrintConfig.cpp:3570 ->>>>>>> master msgid "" -"The max distance of two pillars to get linked with each other. A zero value will " -"prohibit pillar cascading." +"The max distance of two pillars to get linked with each other. A zero value " +"will prohibit pillar cascading." msgstr "" -<<<<<<< HEAD -"МакÑимальное раÑÑтоÑние между Ð´Ð²ÑƒÐ¼Ñ Ñ‚ÐµÐ»Ð°Ð¼Ð¸ поддержки Ð´Ð»Ñ ÑвÑзи друг Ñ Ð´Ñ€ÑƒÐ³Ð¾Ð¼. " -"Ðулевое значение - запрет на Ñоединение тел поддержки каÑкадом." - -#: src/libslic3r/PrintConfig.cpp:3004 -======= "МакÑимальное раÑÑтоÑние между Ð´Ð²ÑƒÐ¼Ñ Ñ‚ÐµÐ»Ð°Ð¼Ð¸ поддержки Ð´Ð»Ñ ÑвÑзи друг Ñ " "другом. Ðулевое значение - запрет на Ñоединение тел поддержки каÑкадом." #: src/libslic3r/PrintConfig.cpp:3580 ->>>>>>> master msgid "" -"How much the supports should lift up the supported object. If \"Pad around object\" " -"is enabled, this value is ignored." +"How much the supports should lift up the supported object. If \"Pad around " +"object\" is enabled, this value is ignored." msgstr "" -<<<<<<< HEAD -"ОпределÑет наÑколько опоры должны поднимать поддерживаемую модель. ЕÑли включёно " -"\"Подложка вокруг модели\", Ñто значение игнорируетÑÑ." - -#: src/libslic3r/PrintConfig.cpp:3015 -msgid "This is a relative measure of support points density." -msgstr "ОтноÑительный показатель плотноÑти точек поддержки." - -#: src/libslic3r/PrintConfig.cpp:3021 -msgid "Minimal distance of the support points" -msgstr "Минимальное раÑÑтоÑние между точками поддержки" - -#: src/libslic3r/PrintConfig.cpp:3023 -msgid "No support points will be placed closer than this threshold." -msgstr "Точки поддержки не будут размещены ближе Ñтого порогового значениÑ." - -#: src/libslic3r/PrintConfig.cpp:3029 -msgid "Use pad" -msgstr "ИÑпользовать подложку" - -#: src/libslic3r/PrintConfig.cpp:3031 -msgid "Add a pad underneath the supported model" -msgstr "ДобавлÑет подложку под поддерживаемую модель." - -#: src/libslic3r/PrintConfig.cpp:3036 -msgid "Pad wall thickness" -msgstr "Толщина Ñтенки подложки" - -#: src/libslic3r/PrintConfig.cpp:3038 -msgid "The thickness of the pad and its optional cavity walls." -msgstr "Толщина подложки и её дополнительных Ñтенок полоÑти." - -#: src/libslic3r/PrintConfig.cpp:3046 -msgid "Pad wall height" -msgstr "Ð’Ñ‹Ñота Ñтенки подложки" - -#: src/libslic3r/PrintConfig.cpp:3047 -======= "ОпределÑет наÑколько опоры должны поднимать поддерживаемую модель. ЕÑли " "включёно «Подложка вокруг модели», Ñто значение игнорируетÑÑ." @@ -24438,31 +14911,12 @@ msgid "Pad wall height" msgstr "Ð’Ñ‹Ñота Ñтенки подложки" #: src/libslic3r/PrintConfig.cpp:3623 ->>>>>>> master msgid "" -"Defines the pad cavity depth. Set to zero to disable the cavity. Be careful when " -"enabling this feature, as some resins may produce an extreme suction effect inside " -"the cavity, which makes peeling the print off the vat foil difficult." +"Defines the pad cavity depth. Set to zero to disable the cavity. Be careful " +"when enabling this feature, as some resins may produce an extreme suction " +"effect inside the cavity, which makes peeling the print off the vat foil " +"difficult." msgstr "" -<<<<<<< HEAD -"ОпределÑет глубину полоÑти в подложке. УÑтановите нулевое значение, чтобы не делать " -"полоÑÑ‚ÑŒ. Будьте оÑторожны при включении Ñтой функции, так как некоторые Ñмолы могут " -"Ñоздавать чрезмерный Ñффект вÑаÑÑ‹Ð²Ð°Ð½Ð¸Ñ Ð²Ð½ÑƒÑ‚Ñ€Ð¸ полоÑти, что затруднÑет ÑнÑтие модели." - -#: src/libslic3r/PrintConfig.cpp:3060 -msgid "Pad brim size" -msgstr "Размер каймы подложки" - -#: src/libslic3r/PrintConfig.cpp:3061 -msgid "How far should the pad extend around the contained geometry" -msgstr "Как далеко должна проÑтиратьÑÑ Ð¿Ð¾Ð´Ð»Ð¾Ð¶ÐºÐ° вокруг ÑущеÑтвующей геометрии." - -#: src/libslic3r/PrintConfig.cpp:3071 -msgid "Max merge distance" -msgstr "МакÑимальное раÑÑтоÑние ÑлиÑниÑ" - -#: src/libslic3r/PrintConfig.cpp:3073 -======= "ОпределÑет глубину полоÑти в подложке. УÑтановите нулевое значение, чтобы не " "делать полоÑÑ‚ÑŒ. Будьте оÑторожны при включении Ñтой функции, так как " "некоторые Ñмолы могут Ñоздавать чрезмерный Ñффект вÑаÑÑ‹Ð²Ð°Ð½Ð¸Ñ Ð²Ð½ÑƒÑ‚Ñ€Ð¸ полоÑти, " @@ -24481,23 +14935,11 @@ msgid "Max merge distance" msgstr "МакÑимальное раÑÑтоÑние ÑлиÑниÑ" #: src/libslic3r/PrintConfig.cpp:3649 ->>>>>>> master msgid "" -"Some objects can get along with a few smaller pads instead of a single big one. " -"This parameter defines how far the center of two smaller pads should be. If theyare " -"closer, they will get merged into one pad." +"Some objects can get along with a few smaller pads instead of a single big " +"one. This parameter defines how far the center of two smaller pads should " +"be. If theyare closer, they will get merged into one pad." msgstr "" -<<<<<<< HEAD -"Ðекоторые модели могут помеÑтитьÑÑ Ð½Ð° неÑкольких маленьких подложках вмеÑто одной " -"большой. Ðтот параметр определÑет, как далеко должен находитьÑÑ Ñ†ÐµÐ½Ñ‚Ñ€ двух меньших " -"подложек. ЕÑли они находÑÑ‚ÑÑ Ñлишком близко, то будут объединены в одну подложку." - -#: src/libslic3r/PrintConfig.cpp:3093 -msgid "Pad wall slope" -msgstr "Ðаклон Ñтенки подложки" - -#: src/libslic3r/PrintConfig.cpp:3095 -======= "Ðекоторые модели могут помеÑтитьÑÑ Ð½Ð° неÑкольких маленьких подложках вмеÑто " "одной большой. Ðтот параметр определÑет, как далеко должен находитьÑÑ Ñ†ÐµÐ½Ñ‚Ñ€ " "двух меньших подложек. ЕÑли они находÑÑ‚ÑÑ Ñлишком близко, то будут " @@ -24508,33 +14950,10 @@ msgid "Pad wall slope" msgstr "Ðаклон Ñтенки подложки" #: src/libslic3r/PrintConfig.cpp:3671 ->>>>>>> master msgid "" -"The slope of the pad wall relative to the bed plane. 90 degrees means straight " -"walls." +"The slope of the pad wall relative to the bed plane. 90 degrees means " +"straight walls." msgstr "" -<<<<<<< HEAD -"Ðаклон Ñтенки подложки отноÑительно плоÑкоÑти Ñтола. 90 градуÑов означает прÑмые " -"Ñтены." - -#: src/libslic3r/PrintConfig.cpp:3106 -msgid "Create pad around object and ignore the support elevation" -msgstr "Создаёт подложку вокруг модели, Ð¸Ð³Ð½Ð¾Ñ€Ð¸Ñ€ÑƒÑ Ð²Ñ‹Ñоту подъёма поддержкой." - -#: src/libslic3r/PrintConfig.cpp:3111 -msgid "Pad around object everywhere" -msgstr "Подложка вокруг модели везде" - -#: src/libslic3r/PrintConfig.cpp:3113 -msgid "Force pad around object everywhere" -msgstr "Принудительное Ñоздание подложки вокруг модели везде." - -#: src/libslic3r/PrintConfig.cpp:3118 -msgid "Pad object gap" -msgstr "Зазор между дном модели и подложкой" - -#: src/libslic3r/PrintConfig.cpp:3120 -======= "Ðаклон Ñтенки подложки отноÑительно плоÑкоÑти Ñтола. 90 градуÑов означает " "прÑмые Ñтены." @@ -24555,19 +14974,10 @@ msgid "Pad object gap" msgstr "Зазор между дном модели и подложкой" #: src/libslic3r/PrintConfig.cpp:3696 ->>>>>>> master msgid "" -"The gap between the object bottom and the generated pad in zero elevation mode." +"The gap between the object bottom and the generated pad in zero elevation " +"mode." msgstr "" -<<<<<<< HEAD -"Зазор между дном модели и Ñгенерированной подложкой в режиме нулевой выÑоты подъёма." - -#: src/libslic3r/PrintConfig.cpp:3129 -msgid "Pad object connector stride" -msgstr "Шаг Ñоединительного Ñлемента подложки модели" - -#: src/libslic3r/PrintConfig.cpp:3131 -======= "Зазор между дном модели и Ñгенерированной подложкой в режиме нулевой выÑоты " "подъёма." @@ -24576,54 +14986,13 @@ msgid "Pad object connector stride" msgstr "Шаг Ñоединительного Ñлемента подложки модели" #: src/libslic3r/PrintConfig.cpp:3707 ->>>>>>> master msgid "" -"Distance between two connector sticks which connect the object and the generated " -"pad." +"Distance between two connector sticks which connect the object and the " +"generated pad." msgstr "" "РаÑÑтоÑние между Ð´Ð²ÑƒÐ¼Ñ Ñоединительными опорами, которые ÑоединÑÑŽÑ‚ модель и " "Ñгенерированную подложку." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:3138 -msgid "Pad object connector width" -msgstr "Ширина Ñоединительного Ñлемента подложки модели" - -#: src/libslic3r/PrintConfig.cpp:3140 -msgid "Width of the connector sticks which connect the object and the generated pad." -msgstr "" -"Ширина Ñоединительных опор, которые ÑоединÑÑŽÑ‚ модель Ñо Ñгенерированной подложкой." - -#: src/libslic3r/PrintConfig.cpp:3147 -msgid "Pad object connector penetration" -msgstr "Глубина Ð¿Ñ€Ð¾Ð½Ð¸ÐºÐ½Ð¾Ð²ÐµÐ½Ð¸Ñ Ñоединительного Ñлемента в модель" - -#: src/libslic3r/PrintConfig.cpp:3150 -msgid "How much should the tiny connectors penetrate into the model body." -msgstr "Задаёт как глубоко Ñоединительные Ñлементы должны проникают в тело модели." - -#: src/libslic3r/PrintConfig.cpp:3157 -msgid "Enable hollowing" -msgstr "Создавать полоÑÑ‚ÑŒ" - -#: src/libslic3r/PrintConfig.cpp:3159 -msgid "Hollow out a model to have an empty interior" -msgstr "Создание пуÑтотелой модели." - -#: src/libslic3r/PrintConfig.cpp:3164 -msgid "Wall thickness" -msgstr "Толщина Ñтенки" - -#: src/libslic3r/PrintConfig.cpp:3166 -msgid "Minimum wall thickness of a hollowed model." -msgstr "ÐœÐ¸Ð½Ð¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ Ñ‚Ð¾Ð»Ñ‰Ð¸Ð½Ð° Ñтенки полой модели." - -#: src/libslic3r/PrintConfig.cpp:3174 -msgid "Accuracy" -msgstr "ТочноÑÑ‚ÑŒ" - -#: src/libslic3r/PrintConfig.cpp:3176 -======= #: src/libslic3r/PrintConfig.cpp:3714 msgid "Pad object connector width" msgstr "Ширина Ñоединительного Ñлемента подложки модели" @@ -24665,90 +15034,22 @@ msgid "Accuracy" msgstr "ТочноÑÑ‚ÑŒ" #: src/libslic3r/PrintConfig.cpp:3752 ->>>>>>> master msgid "" -"Performance vs accuracy of calculation. Lower values may produce unwanted artifacts." +"Performance vs accuracy of calculation. Lower values may produce unwanted " +"artifacts." msgstr "" "БыÑтродейÑтвие раÑчёта против точноÑти раÑчёта. \n" "Ðизкие Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ñтого параметра могут привеÑти к нежелательным артефактам." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:3186 -======= #: src/libslic3r/PrintConfig.cpp:3762 ->>>>>>> master msgid "" -"Hollowing is done in two steps: first, an imaginary interior is calculated deeper " -"(offset plus the closing distance) in the object and then it's inflated back to the " -"specified offset. A greater closing distance makes the interior more rounded. At " -"zero, the interior will resemble the exterior the most." +"Hollowing is done in two steps: first, an imaginary interior is calculated " +"deeper (offset plus the closing distance) in the object and then it's " +"inflated back to the specified offset. A greater closing distance makes the " +"interior more rounded. At zero, the interior will resemble the exterior the " +"most." msgstr "" "ПолоÑÑ‚ÑŒ в модели формуетÑÑ Ð² два Ñтапа: Ñначала воображаемое внутреннее " -<<<<<<< HEAD -"проÑтранÑтво проÑчитывает глубину в объекте (Ñмещение, Ð¿Ð»ÑŽÑ Ñ€Ð°ÑÑтоÑние ÑмыканиÑ), а " -"затем раздуваетÑÑ Ð¾Ð±Ñ€Ð°Ñ‚Ð½Ð¾ до указанного ÑмещениÑ. Большое значение раÑÑтоÑÐ½Ð¸Ñ " -"Ñшивки делает внутреннее проÑтранÑтво более округлым. При нулевом значении " -"внутреннее проÑтранÑтво будет больше вÑего напоминать наружную Ñторону модели." - -#: src/libslic3r/PrintConfig.cpp:3602 -msgid "Export OBJ" -msgstr "ÐкÑпорт в OBJ" - -#: src/libslic3r/PrintConfig.cpp:3603 -msgid "Export the model(s) as OBJ." -msgstr "ÐкÑпортировать модель(и) в формат OBJ." - -#: src/libslic3r/PrintConfig.cpp:3614 -msgid "Export SLA" -msgstr "ÐкÑпорт Ð´Ð»Ñ SLA печати" - -#: src/libslic3r/PrintConfig.cpp:3615 -msgid "Slice the model and export SLA printing layers as PNG." -msgstr "Ðарезать модель и ÑкÑпортировать Ñлои печати Ð´Ð»Ñ SLA в формат PNG." - -#: src/libslic3r/PrintConfig.cpp:3620 -msgid "Export 3MF" -msgstr "ÐкÑпорт в 3MF" - -#: src/libslic3r/PrintConfig.cpp:3621 -msgid "Export the model(s) as 3MF." -msgstr "ÐкÑпортировать модель(и) в формат 3MF." - -#: src/libslic3r/PrintConfig.cpp:3625 -msgid "Export AMF" -msgstr "ÐкÑпорт в AMF" - -#: src/libslic3r/PrintConfig.cpp:3626 -msgid "Export the model(s) as AMF." -msgstr "ÐкÑпортировать модель(и) в формат AMF." - -#: src/libslic3r/PrintConfig.cpp:3630 -msgid "Export STL" -msgstr "ÐкÑпорт в STL" - -#: src/libslic3r/PrintConfig.cpp:3631 -msgid "Export the model(s) as STL." -msgstr "ÐкÑпортировать модель(и) в формат STL." - -#: src/libslic3r/PrintConfig.cpp:3636 -msgid "Slice the model and export toolpaths as G-code." -msgstr "" -"Ðарезать модель и ÑкÑпортировать траекторию Ð´Ð²Ð¸Ð¶ÐµÐ½Ð¸Ñ Ð¸Ð½Ñтрумента в G-код файл." - -#: src/libslic3r/PrintConfig.cpp:3641 -msgid "G-code viewer" -msgstr "ПроÑмотрщик G-кода" - -#: src/libslic3r/PrintConfig.cpp:3642 -msgid "Visualize an already sliced and saved G-code" -msgstr "Ð’Ð¸Ð·ÑƒÐ°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñ ÑƒÐ¶Ðµ нарезанного и Ñохраненного G-кода" - -#: src/libslic3r/PrintConfig.cpp:3647 -msgid "Slice" -msgstr "Ðарезать" - -#: src/libslic3r/PrintConfig.cpp:3648 -======= "проÑтранÑтво проÑчитывает глубину в объекте (Ñмещение, Ð¿Ð»ÑŽÑ Ñ€Ð°ÑÑтоÑние " "ÑмыканиÑ), а затем раздуваетÑÑ Ð¾Ð±Ñ€Ð°Ñ‚Ð½Ð¾ до указанного ÑмещениÑ. Большое " "значение раÑÑтоÑÐ½Ð¸Ñ Ñшивки делает внутреннее проÑтранÑтво более округлым. " @@ -24828,80 +15129,10 @@ msgid "Slice" msgstr "Ðарезать" #: src/libslic3r/PrintConfig.cpp:4284 ->>>>>>> master msgid "" -"Slice the model as FFF or SLA based on the printer_technology configuration value." +"Slice the model as FFF or SLA based on the printer_technology configuration " +"value." msgstr "" -<<<<<<< HEAD -"Ðарезает модель в завиÑимоÑти от типа печати (FFF или SLA) на оÑнове Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ " -"конфигурации printer_technology." - -#: src/libslic3r/PrintConfig.cpp:3653 -msgid "Help" -msgstr "Помощь" - -#: src/libslic3r/PrintConfig.cpp:3654 -msgid "Show this help." -msgstr "Показать помощь." - -#: src/libslic3r/PrintConfig.cpp:3659 -msgid "Help (FFF options)" -msgstr "Помощь (FFF наÑтройки)" - -#: src/libslic3r/PrintConfig.cpp:3660 -msgid "Show the full list of print/G-code configuration options." -msgstr "Показать полный ÑпиÑок параметров конфигурации печати/G-кода." - -#: src/libslic3r/PrintConfig.cpp:3664 -msgid "Help (SLA options)" -msgstr "Помощь (SLA наÑтройки)" - -#: src/libslic3r/PrintConfig.cpp:3665 -msgid "Show the full list of SLA print configuration options." -msgstr "Показать полный ÑпиÑок параметров конфигурации SLA печати." - -#: src/libslic3r/PrintConfig.cpp:3669 -msgid "Output Model Info" -msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ выходной модели" - -#: src/libslic3r/PrintConfig.cpp:3670 -msgid "Write information about the model to the console." -msgstr "ЗапиÑать информацию о модели в конÑоль." - -#: src/libslic3r/PrintConfig.cpp:3674 -msgid "Save config file" -msgstr "Сохранить конфигурацию" - -#: src/libslic3r/PrintConfig.cpp:3675 -msgid "Save configuration to the specified file." -msgstr "Сохраните конфигурацию в указанный файл." - -#: src/libslic3r/PrintConfig.cpp:3685 -msgid "Align XY" -msgstr "ВыровнÑÑ‚ÑŒ по XY" - -#: src/libslic3r/PrintConfig.cpp:3686 -msgid "Align the model to the given point." -msgstr "ВыровнÑÑ‚ÑŒ модель по заданной точке." - -#: src/libslic3r/PrintConfig.cpp:3691 -msgid "Cut model at the given Z." -msgstr "Разрезать модель по Z." - -#: src/libslic3r/PrintConfig.cpp:3712 -msgid "Center" -msgstr "По центру" - -#: src/libslic3r/PrintConfig.cpp:3713 -msgid "Center the print around the given center." -msgstr "Центрировать печать вокруг данного центра." - -#: src/libslic3r/PrintConfig.cpp:3717 -msgid "Don't arrange" -msgstr "Ðе раÑÑтавлÑÑ‚ÑŒ" - -#: src/libslic3r/PrintConfig.cpp:3718 -======= "Ðарезает модель в завиÑимоÑти от типа печати (FFF или SLA) на оÑнове " "Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¸ printer_technology." @@ -24970,7 +15201,6 @@ msgid "Don't arrange" msgstr "Ðе раÑÑтавлÑÑ‚ÑŒ" #: src/libslic3r/PrintConfig.cpp:4354 ->>>>>>> master msgid "" "Do not rearrange the given models before merging and keep their original XY " "coordinates." @@ -24978,25 +15208,6 @@ msgstr "" "Ðе переÑтавлÑÑ‚ÑŒ данные модели перед объединением и ÑохранÑÑ‚ÑŒ их иÑходные XY " "координаты." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:3721 -msgid "Duplicate" -msgstr "Дубликат" - -#: src/libslic3r/PrintConfig.cpp:3722 -msgid "Multiply copies by this factor." -msgstr "Увеличить количеÑтво копий на Ñтот коÑффициент." - -#: src/libslic3r/PrintConfig.cpp:3726 -msgid "Duplicate by grid" -msgstr "Дублировать по Ñетке" - -#: src/libslic3r/PrintConfig.cpp:3727 -msgid "Multiply copies by creating a grid." -msgstr "Увеличить количеÑтво копий путём ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ñетки." - -#: src/libslic3r/PrintConfig.cpp:3731 -======= #: src/libslic3r/PrintConfig.cpp:4357 msgid "Ensure on bed" msgstr "ОбеÑпечивать размещение на Ñтоле" @@ -25026,56 +15237,18 @@ msgid "Multiply copies by creating a grid." msgstr "Увеличить количеÑтво копий путём ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ñетки." #: src/libslic3r/PrintConfig.cpp:4372 ->>>>>>> master msgid "" -"Arrange the supplied models in a plate and merge them in a single model in order to " -"perform actions once." +"Arrange the supplied models in a plate and merge them in a single model in " +"order to perform actions once." msgstr "" -<<<<<<< HEAD -"РаÑÑтавьте предÑтавленные модели на Ñтоле и объединить их в одну модель, чтобы " -"выполнить дейÑÑ‚Ð²Ð¸Ñ Ð¾Ð´Ð¸Ð½ раз." - -#: src/libslic3r/PrintConfig.cpp:3736 -======= "РаÑÑтавьте предÑтавленные модели на Ñтоле и объединить их в одну модель, " "чтобы выполнить дейÑÑ‚Ð²Ð¸Ñ Ð¾Ð´Ð¸Ð½ раз." #: src/libslic3r/PrintConfig.cpp:4377 ->>>>>>> master msgid "" -"Try to repair any non-manifold meshes (this option is implicitly added whenever we " -"need to slice the model to perform the requested action)." +"Try to repair any non-manifold meshes (this option is implicitly added " +"whenever we need to slice the model to perform the requested action)." msgstr "" -<<<<<<< HEAD -"Попробуйте отремонтировать любые нецелоÑтные Ñетки (Ñта Ð¾Ð¿Ñ†Ð¸Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÑетÑÑ Ð²ÑÑкий " -"раз, когда нужно нарезать модель Ð´Ð»Ñ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð·Ð°Ð¿Ñ€Ð¾ÑˆÐµÐ½Ð½Ð¾Ð³Ð¾ дейÑтвиÑ)." - -#: src/libslic3r/PrintConfig.cpp:3740 -msgid "Rotation angle around the Z axis in degrees." -msgstr "Угол поворота вокруг оÑи Z в градуÑах." - -#: src/libslic3r/PrintConfig.cpp:3744 -msgid "Rotate around X" -msgstr "Поворот вокруг оÑи X" - -#: src/libslic3r/PrintConfig.cpp:3745 -msgid "Rotation angle around the X axis in degrees." -msgstr "Угол поворота вокруг оÑи X в градуÑах." - -#: src/libslic3r/PrintConfig.cpp:3749 -msgid "Rotate around Y" -msgstr "Поворот вокруг оÑи Y" - -#: src/libslic3r/PrintConfig.cpp:3750 -msgid "Rotation angle around the Y axis in degrees." -msgstr "Угол поворота вокруг оÑи Y в градуÑах." - -#: src/libslic3r/PrintConfig.cpp:3755 -msgid "Scaling factor or percentage." -msgstr "КоÑффициент маÑÑˆÑ‚Ð°Ð±Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¸Ð»Ð¸ процент." - -#: src/libslic3r/PrintConfig.cpp:3760 -======= "Попробуйте отремонтировать любые нецелоÑтные Ñетки (Ñта Ð¾Ð¿Ñ†Ð¸Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÑетÑÑ " "вÑÑкий раз, когда нужно нарезать модель Ð´Ð»Ñ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð·Ð°Ð¿Ñ€Ð¾ÑˆÐµÐ½Ð½Ð¾Ð³Ð¾ " "дейÑтвиÑ)." @@ -25105,36 +15278,10 @@ msgid "Scaling factor or percentage." msgstr "КоÑффициент маÑÑˆÑ‚Ð°Ð±Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¸Ð»Ð¸ процент." #: src/libslic3r/PrintConfig.cpp:4401 ->>>>>>> master msgid "" -"Detect unconnected parts in the given model(s) and split them into separate objects." +"Detect unconnected parts in the given model(s) and split them into separate " +"objects." msgstr "" -<<<<<<< HEAD -"Обнаружение неÑвÑзанных чаÑтей в выбранных моделÑÑ… и разделение их на отдельные " -"объекты." - -#: src/libslic3r/PrintConfig.cpp:3763 -msgid "Scale to Fit" -msgstr "ОтмаÑштабировать под облаÑÑ‚ÑŒ печати" - -#: src/libslic3r/PrintConfig.cpp:3764 -msgid "Scale to fit the given volume." -msgstr "МаÑштабировать в ÑоответÑтвии Ñ Ð·Ð°Ð´Ð°Ð½Ð½Ñ‹Ð¼ объёмом." - -#: src/libslic3r/PrintConfig.cpp:3773 -msgid "Ignore non-existent config files" -msgstr "Игнорировать неÑущеÑтвующие конфигурационные файлы" - -#: src/libslic3r/PrintConfig.cpp:3774 -msgid "Do not fail if a file supplied to --load does not exist." -msgstr "Ðе терпеть неудачу, еÑли файла, предоÑтавленного Ð´Ð»Ñ --load, не ÑущеÑтвует." - -#: src/libslic3r/PrintConfig.cpp:3777 -msgid "Load config file" -msgstr "Загрузить конфигурацию" - -#: src/libslic3r/PrintConfig.cpp:3778 -======= "Обнаружение неÑвÑзанных чаÑтей в выбранных моделÑÑ… и разделение их на " "отдельные объекты." @@ -25201,21 +15348,10 @@ msgid "Load config file" msgstr "Загрузить конфигурацию" #: src/libslic3r/PrintConfig.cpp:4433 ->>>>>>> master msgid "" -"Load configuration from the specified file. It can be used more than once to load " -"options from multiple files." +"Load configuration from the specified file. It can be used more than once to " +"load options from multiple files." msgstr "" -<<<<<<< HEAD -"Загрузить конфигурацию из указанного файла. Его можно иÑпользовать более одного " -"раза Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸ параметров из неÑкольких файлов." - -#: src/libslic3r/PrintConfig.cpp:3781 -msgid "Output File" -msgstr "Выходной файл" - -#: src/libslic3r/PrintConfig.cpp:3782 -======= "Загрузить конфигурацию из указанного файла. Его можно иÑпользовать более " "одного раза Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸ параметров из неÑкольких файлов." @@ -25224,21 +15360,10 @@ msgid "Output File" msgstr "Выходной файл" #: src/libslic3r/PrintConfig.cpp:4437 ->>>>>>> master msgid "" -"The file where the output will be written (if not specified, it will be based on " -"the input file)." +"The file where the output will be written (if not specified, it will be " +"based on the input file)." msgstr "" -<<<<<<< HEAD -"Файл, в который будут запиÑыватьÑÑ Ð²Ñ‹Ñ…Ð¾Ð´Ð½Ñ‹Ðµ данные (еÑли он не указан, то будет " -"оÑнован на входном файле)." - -#: src/libslic3r/PrintConfig.cpp:3786 -msgid "Single instance mode" -msgstr "Одни ÑкземплÑÑ€ программы" - -#: src/libslic3r/PrintConfig.cpp:3787 -======= "Файл, в который будут запиÑыватьÑÑ Ð²Ñ‹Ñ…Ð¾Ð´Ð½Ñ‹Ðµ данные (еÑли он не указан, то " "будет оÑнован на входном файле)." @@ -25247,23 +15372,11 @@ msgid "Single instance mode" msgstr "Одни ÑкземплÑÑ€ программы" #: src/libslic3r/PrintConfig.cpp:4442 ->>>>>>> master msgid "" -"If enabled, the command line arguments are sent to an existing instance of GUI " -"PrusaSlicer, or an existing PrusaSlicer window is activated. Overrides the " -"\"single_instance\" configuration value from application preferences." +"If enabled, the command line arguments are sent to an existing instance of " +"GUI PrusaSlicer, or an existing PrusaSlicer window is activated. Overrides " +"the \"single_instance\" configuration value from application preferences." msgstr "" -<<<<<<< HEAD -"ЕÑли включено, аргументы командной Ñтроки поÑылаютÑÑ Ð² ÑущеÑтвующий ÑкземплÑÑ€ GUI " -"PrusaSlicer, либо активируетÑÑ ÑущеÑтвующее окно PrusaSlicer. ПереопределÑет " -"значение конфигурации \"single_instance\" из наÑтроек приложениÑ." - -#: src/libslic3r/PrintConfig.cpp:3798 -msgid "Data directory" -msgstr "Папка конфигурации пользователÑ" - -#: src/libslic3r/PrintConfig.cpp:3799 -======= "ЕÑли включено, аргументы командной Ñтроки поÑылаютÑÑ Ð² ÑущеÑтвующий " "ÑкземплÑÑ€ GUI PrusaSlicer, либо активируетÑÑ ÑущеÑтвующее окно PrusaSlicer. " "ПереопределÑет значение конфигурации \"single_instance\" из наÑтроек " @@ -25274,21 +15387,11 @@ msgid "Data directory" msgstr "Папка конфигурации пользователÑ" #: src/libslic3r/PrintConfig.cpp:4454 ->>>>>>> master msgid "" -"Load and store settings at the given directory. This is useful for maintaining " -"different profiles or including configurations from a network storage." +"Load and store settings at the given directory. This is useful for " +"maintaining different profiles or including configurations from a network " +"storage." msgstr "" -<<<<<<< HEAD -"Загрузите и Ñохраните наÑтройки в данном каталоге. Ðто полезно Ð´Ð»Ñ ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ " -"различных профилей или конфигураций из Ñетевого хранилища." - -#: src/libslic3r/PrintConfig.cpp:3802 -msgid "Logging level" -msgstr "Уровень Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¶ÑƒÑ€Ð½Ð°Ð»Ð°" - -#: src/libslic3r/PrintConfig.cpp:3803 -======= "Загрузите и Ñохраните наÑтройки в данном каталоге. Ðто полезно Ð´Ð»Ñ " "ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ñ€Ð°Ð·Ð»Ð¸Ñ‡Ð½Ñ‹Ñ… профилей или конфигураций из Ñетевого хранилища." @@ -25297,23 +15400,12 @@ msgid "Logging level" msgstr "Уровень Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¶ÑƒÑ€Ð½Ð°Ð»Ð°" #: src/libslic3r/PrintConfig.cpp:4458 ->>>>>>> master msgid "" -"Sets logging sensitivity. 0:fatal, 1:error, 2:warning, 3:info, 4:debug, 5:trace\n" +"Sets logging sensitivity. 0:fatal, 1:error, 2:warning, 3:info, 4:debug, 5:" +"trace\n" "For example. loglevel=2 logs fatal, error and warning level messages." msgstr "" "Задаёт параметр чувÑтвительноÑти запиÑи Ñобытий в журнал. \n" -<<<<<<< HEAD -"0: ÐеуÑÑ‚Ñ€Ð°Ð½Ð¸Ð¼Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°, 1: Ошибка, 2: Предупреждение, 3: ИнформациÑ, 4: Отладка, 5: " -"ТраÑÑировка\n" -"Ðапример, loglevel=2 региÑтрирует неуÑтранимые ошибки, ошибки и предупреждениÑ." - -#: src/libslic3r/PrintConfig.cpp:3809 -msgid "Render with a software renderer" -msgstr "Ð’Ð¸Ð·ÑƒÐ°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñ Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ программного рендеринга" - -#: src/libslic3r/PrintConfig.cpp:3810 -======= "0: ÐеуÑÑ‚Ñ€Ð°Ð½Ð¸Ð¼Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°, 1: Ошибка, 2: Предупреждение, 3: ИнформациÑ, 4: " "Отладка, 5: ТраÑÑировка\n" "Ðапример, loglevel=2 региÑтрирует неуÑтранимые ошибки, ошибки и " @@ -25324,28 +15416,16 @@ msgid "Render with a software renderer" msgstr "Ð’Ð¸Ð·ÑƒÐ°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñ Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ программного рендеринга" #: src/libslic3r/PrintConfig.cpp:4465 ->>>>>>> master msgid "" -"Render with a software renderer. The bundled MESA software renderer is loaded " -"instead of the default OpenGL driver." +"Render with a software renderer. The bundled MESA software renderer is " +"loaded instead of the default OpenGL driver." msgstr "" -<<<<<<< HEAD -"ВмеÑто Ñтандартного драйвера OpenGL будет иÑпользоватьÑÑ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð½Ñ‹Ð¹ рендеринг MESA." -======= "ВмеÑто Ñтандартного драйвера OpenGL будет иÑпользоватьÑÑ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð½Ñ‹Ð¹ " "рендеринг MESA." ->>>>>>> master #: src/libslic3r/Zipper.cpp:27 msgid "Error with zip archive" msgstr "Ошибка Ñ zip-архивом" -<<<<<<< HEAD - -#: src/libslic3r/PrintObject.cpp:112 -msgid "Processing triangulated mesh" -msgstr "Обработка триангулированной Ñетки" -======= ->>>>>>> master #: src/libslic3r/PrintObject.cpp:125 msgid "Generating perimeters" @@ -25358,53 +15438,6 @@ msgstr "Подготовка к заполнению" #: src/libslic3r/PrintObject.cpp:401 msgid "Generating support material" msgstr "Ð“ÐµÐ½ÐµÑ€Ð°Ñ†Ð¸Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐµÐº" -<<<<<<< HEAD - -msgid "1 mm" -msgstr "1 мм" - -msgid "2 mm" -msgstr "2 мм" - -msgid "5 mm" -msgstr "5 мм" - -msgid "10 mm" -msgstr "10 мм" - -msgid "Enable rotations" -msgstr "Разрешить вращение" - -msgid "Gap size" -msgstr "Зазор между моделÑми" - -msgid "Jump to height %s or Set ruler mode" -msgstr "Перейти к заданной выÑоте %s или задать режимы линейки" - -msgid "You will not be asked about it again on label hovering." -msgstr "Ð’Ð°Ñ Ð±Ð¾Ð»ÑŒÑˆÐµ не будут Ñпрашивать об Ñтом при нажатии на параметры." - -msgid "Should we suppress to use hyperlinks in PrusaSlicer?" -msgstr "Хотите запретить иÑпользование гиперÑÑылок в PrusaSlicer?" - -msgid "time" -msgstr "ВремÑ" - -msgid "PrusaSlicer: Open hyperlink" -msgstr "PrusaSlicer: открытие гиперÑÑылки" - -msgid "Should we open this hyperlink in your default browser?" -msgstr "Открыть Ñту гиперÑÑылку в браузере по умолчанию?" - -msgid "During the other layers, fan" -msgstr "Во Ð²Ñ€ÐµÐ¼Ñ Ð¿ÐµÑ‡Ð°Ñ‚Ð¸ других Ñлоёв, вентилÑтор" - -msgid "Fan speed will be ramped from zero at layer %1% to %2%%% at layer %3%" -msgstr "СкороÑÑ‚ÑŒ вентилÑтора будет увеличена Ñ Ð½ÑƒÐ»Ñ Ð½Ð° %1% Ñлое до %2%%% на %3% Ñлое." - -msgid "Select a file" -msgstr "Выберите файл" -======= #: resources/data/hints.ini: [hint:Fuzzy skin] msgid "" @@ -34282,4 +24315,3 @@ msgstr "ошибка zlib %d" #: ../src/richtext/richtextbulletspage.cpp:288 msgid "~" msgstr "~" ->>>>>>> master diff --git a/resources/localization/tr/PrusaSlicer.mo b/resources/localization/tr/PrusaSlicer.mo Binary files differindex 1af023872..af7848eb3 100644 --- a/resources/localization/tr/PrusaSlicer.mo +++ b/resources/localization/tr/PrusaSlicer.mo diff --git a/resources/localization/uk/PrusaSlicer.mo b/resources/localization/uk/PrusaSlicer.mo Binary files differindex 4dd82bbc4..d12fe4188 100644 --- a/resources/localization/uk/PrusaSlicer.mo +++ b/resources/localization/uk/PrusaSlicer.mo diff --git a/resources/localization/uk/PrusaSlicer_uk.po b/resources/localization/uk/PrusaSlicer_uk.po index 845aed648..af0d1ad58 100644 --- a/resources/localization/uk/PrusaSlicer_uk.po +++ b/resources/localization/uk/PrusaSlicer_uk.po @@ -2,13 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -"POT-Creation-Date: 2021-07-07 13:33+0200\n" -"PO-Revision-Date: 2021-07-07 13:37+0200\n" -======= "POT-Creation-Date: 2022-01-25 17:28+0100\n" "PO-Revision-Date: 2021-02-03 17:15+0100\n" ->>>>>>> master "Last-Translator: Oleksandra Iushchenko <yusanka@gmail.com>\n" "Language-Team: \n" "Language: uk\n" @@ -19,28 +14,16 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -<<<<<<< HEAD -#: src/slic3r/GUI/AboutDialog.cpp:45 src/slic3r/GUI/AboutDialog.cpp:299 -msgid "Portions copyright" -msgstr "ВикориÑтані розробки" - -#: src/slic3r/GUI/AboutDialog.cpp:135 src/slic3r/GUI/AboutDialog.cpp:263 -======= #: src/slic3r/GUI/AboutDialog.cpp:45 src/slic3r/GUI/AboutDialog.cpp:303 msgid "Portions copyright" msgstr "ВикориÑтані розробки" #: src/slic3r/GUI/AboutDialog.cpp:139 src/slic3r/GUI/AboutDialog.cpp:267 ->>>>>>> master msgid "Copyright" msgstr "Копірайт" #. TRN "Slic3r _is licensed under the_ License" -<<<<<<< HEAD -#: src/slic3r/GUI/AboutDialog.cpp:137 -======= #: src/slic3r/GUI/AboutDialog.cpp:141 ->>>>>>> master msgid "" "License agreements of all following programs (libraries) are part of " "application license agreement" @@ -48,15 +31,6 @@ msgstr "" "Ліцензійні угоди вÑÑ–Ñ… наÑтупних програм (бібліотек) Ñ” чаÑтиною ліцензійної " "угоди програми" -<<<<<<< HEAD -#: src/slic3r/GUI/AboutDialog.cpp:206 -#, c-format -msgid "About %s" -msgstr "О %s" - -#: src/slic3r/GUI/AboutDialog.cpp:238 src/slic3r/GUI/AboutDialog.cpp:361 -#: src/slic3r/GUI/GUI_App.cpp:243 src/slic3r/GUI/MainFrame.cpp:151 -======= #: src/slic3r/GUI/AboutDialog.cpp:210 #, c-format, boost-format msgid "About %s" @@ -64,22 +38,10 @@ msgstr "О %s" #: src/slic3r/GUI/AboutDialog.cpp:242 src/slic3r/GUI/AboutDialog.cpp:367 #: src/slic3r/GUI/GUI_App.cpp:262 ->>>>>>> master msgid "Version" msgstr "ВерÑÑ–Ñ" #. TRN "Slic3r _is licensed under the_ License" -<<<<<<< HEAD -#: src/slic3r/GUI/AboutDialog.cpp:265 src/slic3r/GUI/GUI_App.cpp:248 -msgid "is licensed under the" -msgstr "ліцензовано згідно" - -#: src/slic3r/GUI/AboutDialog.cpp:266 src/slic3r/GUI/GUI_App.cpp:248 -msgid "GNU Affero General Public License, version 3" -msgstr "Загальна публічна Ð»Ñ–Ñ†ÐµÐ½Ð·Ñ–Ñ GNU Affero, верÑÑ–Ñ 3" - -#: src/slic3r/GUI/AboutDialog.cpp:267 -======= #: src/slic3r/GUI/AboutDialog.cpp:269 src/slic3r/GUI/GUI_App.cpp:268 msgid "is licensed under the" msgstr "ліцензовано згідно" @@ -89,7 +51,6 @@ msgid "GNU Affero General Public License, version 3" msgstr "Загальна публічна Ð»Ñ–Ñ†ÐµÐ½Ð·Ñ–Ñ GNU Affero, верÑÑ–Ñ 3" #: src/slic3r/GUI/AboutDialog.cpp:271 ->>>>>>> master msgid "" "PrusaSlicer is based on Slic3r by Alessandro Ranellucci and the RepRap " "community." @@ -97,11 +58,7 @@ msgstr "" "PrusaSlicer заÑнований на Slic3r від Alessandro Ranellucci та Ñпільноти " "RepRap." -<<<<<<< HEAD -#: src/slic3r/GUI/AboutDialog.cpp:268 -======= #: src/slic3r/GUI/AboutDialog.cpp:272 ->>>>>>> master msgid "" "Contributions by Henrik Brix Andersen, Nicolas Dandrimont, Mark Hindess, " "Petr Ledvina, Joseph Lenox, Y. Sapir, Mike Sheldrake, Vojtech Bubnik and " @@ -111,21 +68,12 @@ msgstr "" "Ledvina, Joseph Lenox, Y. Sapir, Mike Sheldrake, Vojtech Bubnik та багатьох " "інших." -<<<<<<< HEAD -#: src/slic3r/GUI/AboutDialog.cpp:304 -msgid "Copy Version Info" -msgstr "Скопіювати інформацію про верÑÑ–ÑŽ" - -#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:78 -#, c-format -======= #: src/slic3r/GUI/AboutDialog.cpp:308 msgid "Copy Version Info" msgstr "Скопіювати інформацію про верÑÑ–ÑŽ" #: src/slic3r/GUI/BackgroundSlicingProcess.cpp:79 #, c-format, boost-format ->>>>>>> master msgid "" "%s has encountered an error. It was likely caused by running out of memory. " "If you are sure you have enough RAM on your system, this may also be a bug " @@ -135,14 +83,6 @@ msgstr "" "ви впевнені, що у вашій ÑиÑтемі доÑтатньо оперативної пам'ÑÑ‚Ñ–, це також може " "бути помилкою, Ñ– ми будемо раді, Ñкщо ви нам про це повідомите." -<<<<<<< HEAD -#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:163 -#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:183 -msgid "Unknown error occured during exporting G-code." -msgstr "Під Ñ‡Ð°Ñ ÐµÐºÑпорту G-коду ÑталаÑÑ Ð½ÐµÐ²Ñ–Ð´Ð¾Ð¼Ð° помилка." - -#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:168 -======= #: src/slic3r/GUI/BackgroundSlicingProcess.cpp:84 #, boost-format msgid "PrusaSlicer has encountered a fatal error: \"%1%\"" @@ -204,7 +144,6 @@ msgstr "Під Ñ‡Ð°Ñ ÐµÐºÑпорту G-коду ÑталаÑÑ Ð½ÐµÐ²Ñ–Ð´Ð¾Ð¼Ð #: src/slic3r/GUI/BackgroundSlicingProcess.cpp:695 #, boost-format ->>>>>>> master msgid "" "Copying of the temporary G-code to the output G-code failed. Maybe the SD " "card is write locked?\n" @@ -214,12 +153,8 @@ msgstr "" "заблокована?\n" "ÐŸÐ¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ помилку: %1%" -<<<<<<< HEAD -#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:171 -======= #: src/slic3r/GUI/BackgroundSlicingProcess.cpp:698 #, boost-format ->>>>>>> master msgid "" "Copying of the temporary G-code to the output G-code failed. There might be " "problem with target device, please try exporting again or using different " @@ -229,12 +164,8 @@ msgstr "" "цільовим приÑтроєм, Ñпробуйте екÑпортувати ще раз або викориÑтати інший " "приÑтрій. Пошкоджений вихідний G-код - %1% .tmp." -<<<<<<< HEAD -#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:174 -======= #: src/slic3r/GUI/BackgroundSlicingProcess.cpp:701 #, boost-format ->>>>>>> master msgid "" "Renaming of the G-code after copying to the selected destination folder has " "failed. Current path is %1%.tmp. Please try exporting again." @@ -242,12 +173,8 @@ msgstr "" "Ðе вдалоÑÑ Ð¿ÐµÑ€ÐµÐ¹Ð¼ÐµÐ½ÑƒÐ²Ð°Ñ‚Ð¸ G-код піÑÐ»Ñ ÐºÐ¾Ð¿Ñ–ÑŽÐ²Ð°Ð½Ð½Ñ Ñƒ вибрану папку призначеннÑ. " "Поточний шлÑÑ… - %1%.tmp. Спробуйте екÑпортувати ще раз." -<<<<<<< HEAD -#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:177 -======= #: src/slic3r/GUI/BackgroundSlicingProcess.cpp:704 #, boost-format ->>>>>>> master msgid "" "Copying of the temporary G-code has finished but the original code at %1% " "couldn't be opened during copy check. The output G-code is at %2%.tmp." @@ -255,44 +182,14 @@ msgstr "" "ÐšÐ¾Ð¿Ñ–ÑŽÐ²Ð°Ð½Ð½Ñ Ñ‚Ð¸Ð¼Ñ‡Ð°Ñового G-коду закінчено, але оригінальний код на рівні %1% " "не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ під Ñ‡Ð°Ñ Ð¿ÐµÑ€ÐµÐ²Ñ–Ñ€ÐºÐ¸ копії. Вихідний G-код - %2% .tmp." -<<<<<<< HEAD -#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:180 -======= #: src/slic3r/GUI/BackgroundSlicingProcess.cpp:707 #, boost-format ->>>>>>> master msgid "" "Copying of the temporary G-code has finished but the exported code couldn't " "be opened during copy check. The output G-code is at %1%.tmp." msgstr "" "ÐšÐ¾Ð¿Ñ–ÑŽÐ²Ð°Ð½Ð½Ñ Ñ‚Ð¸Ð¼Ñ‡Ð°Ñового G-коду завершено, але екÑпортований код не вдалоÑÑ " "відкрити під Ñ‡Ð°Ñ Ð¿ÐµÑ€ÐµÐ²Ñ–Ñ€ÐºÐ¸ копії. Вихідний G-код - %1% .tmp." -<<<<<<< HEAD - -#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:187 -#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:536 -msgid "Running post-processing scripts" -msgstr "ЗапуÑк Ñкриптів поÑÑ‚-обробки" - -#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:189 -msgid "G-code file exported to %1%" -msgstr "Файл G-коду екÑпортуєтьÑÑ Ð´Ð¾ %1%" - -#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:194 -#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:243 -msgid "Slicing complete" -msgstr "ÐÐ°Ñ€Ñ–Ð·Ð°Ð½Ð½Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¾" - -#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:238 -msgid "Masked SLA file exported to %1%" -msgstr "Файл SLA екÑпортовано до %1%" - -#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:539 -msgid "Copying of the temporary G-code to the output G-code failed" -msgstr "Ðе вдалоÑÑ Ñкопіювати тимчаÑовий G-код у вихідний G-код" - -#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:562 -======= #: src/slic3r/GUI/BackgroundSlicingProcess.cpp:715 #, boost-format @@ -305,33 +202,11 @@ msgstr "Ðе вдалоÑÑ Ñкопіювати тимчаÑовий G-код Ñ #: src/slic3r/GUI/BackgroundSlicingProcess.cpp:751 #, boost-format ->>>>>>> master msgid "Scheduling upload to `%1%`. See Window -> Print Host Upload Queue" msgstr "" "ÐŸÐ»Ð°Ð½ÑƒÐ²Ð°Ð½Ð½Ñ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð´Ð¾ `%1%`. Див. Вікно -> Черга Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ñ…Ð¾Ñта " "друку" -<<<<<<< HEAD -#: src/slic3r/GUI/BedShapeDialog.cpp:93 -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:240 src/slic3r/GUI/Plater.cpp:163 -#: src/slic3r/GUI/Tab.cpp:2543 -msgid "Size" -msgstr "Розмір" - -#: src/slic3r/GUI/BedShapeDialog.cpp:94 -msgid "Origin" -msgstr "Початок координат" - -#: src/slic3r/GUI/BedShapeDialog.cpp:95 src/libslic3r/PrintConfig.cpp:771 -msgid "Diameter" -msgstr "Діаметр" - -#: src/slic3r/GUI/BedShapeDialog.cpp:110 -msgid "Size in X and Y of the rectangular plate." -msgstr "Розмір прÑмокутної подложки за X та Y." - -#: src/slic3r/GUI/BedShapeDialog.cpp:121 -======= #: src/slic3r/GUI/BedShapeDialog.cpp:31 #: src/slic3r/GUI/GUI_ObjectManipulation.cpp:218 src/slic3r/GUI/Plater.cpp:204 #: src/slic3r/GUI/Tab.cpp:2755 @@ -351,60 +226,11 @@ msgid "Size in X and Y of the rectangular plate." msgstr "Розмір прÑмокутної подложки за X та Y." #: src/slic3r/GUI/BedShapeDialog.cpp:58 ->>>>>>> master msgid "" "Distance of the 0,0 G-code coordinate from the front left corner of the " "rectangle." msgstr "ВідÑтань координат 0,0 G-коду від нижнього лівого кута прÑмокутника." -<<<<<<< HEAD -#: src/slic3r/GUI/BedShapeDialog.cpp:129 src/slic3r/GUI/ConfigWizard.cpp:246 -#: src/slic3r/GUI/ConfigWizard.cpp:1372 src/slic3r/GUI/ConfigWizard.cpp:1386 -#: src/slic3r/GUI/ExtruderSequenceDialog.cpp:88 -#: src/slic3r/GUI/GCodeViewer.cpp:3986 src/slic3r/GUI/GCodeViewer.cpp:3992 -#: src/slic3r/GUI/GCodeViewer.cpp:4000 src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:179 -#: src/slic3r/GUI/GUI_ObjectLayers.cpp:145 -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:341 -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:418 -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:486 -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:487 -#: src/slic3r/GUI/ObjectDataViewModel.cpp:96 -#: src/slic3r/GUI/WipeTowerDialog.cpp:85 src/libslic3r/PrintConfig.cpp:77 -#: src/libslic3r/PrintConfig.cpp:84 src/libslic3r/PrintConfig.cpp:95 -#: src/libslic3r/PrintConfig.cpp:135 src/libslic3r/PrintConfig.cpp:244 -#: src/libslic3r/PrintConfig.cpp:302 src/libslic3r/PrintConfig.cpp:377 -#: src/libslic3r/PrintConfig.cpp:385 src/libslic3r/PrintConfig.cpp:435 -#: src/libslic3r/PrintConfig.cpp:565 src/libslic3r/PrintConfig.cpp:576 -#: src/libslic3r/PrintConfig.cpp:594 src/libslic3r/PrintConfig.cpp:774 -#: src/libslic3r/PrintConfig.cpp:1258 src/libslic3r/PrintConfig.cpp:1439 -#: src/libslic3r/PrintConfig.cpp:1500 src/libslic3r/PrintConfig.cpp:1518 -#: src/libslic3r/PrintConfig.cpp:1536 src/libslic3r/PrintConfig.cpp:1596 -#: src/libslic3r/PrintConfig.cpp:1606 src/libslic3r/PrintConfig.cpp:1731 -#: src/libslic3r/PrintConfig.cpp:1739 src/libslic3r/PrintConfig.cpp:1780 -#: src/libslic3r/PrintConfig.cpp:1788 src/libslic3r/PrintConfig.cpp:1798 -#: src/libslic3r/PrintConfig.cpp:1806 src/libslic3r/PrintConfig.cpp:1814 -#: src/libslic3r/PrintConfig.cpp:1877 src/libslic3r/PrintConfig.cpp:2143 -#: src/libslic3r/PrintConfig.cpp:2214 src/libslic3r/PrintConfig.cpp:2248 -#: src/libslic3r/PrintConfig.cpp:2377 src/libslic3r/PrintConfig.cpp:2456 -#: src/libslic3r/PrintConfig.cpp:2463 src/libslic3r/PrintConfig.cpp:2470 -#: src/libslic3r/PrintConfig.cpp:2500 src/libslic3r/PrintConfig.cpp:2510 -#: src/libslic3r/PrintConfig.cpp:2520 src/libslic3r/PrintConfig.cpp:2680 -#: src/libslic3r/PrintConfig.cpp:2714 src/libslic3r/PrintConfig.cpp:2853 -#: src/libslic3r/PrintConfig.cpp:2862 src/libslic3r/PrintConfig.cpp:2871 -#: src/libslic3r/PrintConfig.cpp:2881 src/libslic3r/PrintConfig.cpp:2946 -#: src/libslic3r/PrintConfig.cpp:2956 src/libslic3r/PrintConfig.cpp:2968 -#: src/libslic3r/PrintConfig.cpp:2988 src/libslic3r/PrintConfig.cpp:2998 -#: src/libslic3r/PrintConfig.cpp:3008 src/libslic3r/PrintConfig.cpp:3026 -#: src/libslic3r/PrintConfig.cpp:3041 src/libslic3r/PrintConfig.cpp:3055 -#: src/libslic3r/PrintConfig.cpp:3066 src/libslic3r/PrintConfig.cpp:3079 -#: src/libslic3r/PrintConfig.cpp:3124 src/libslic3r/PrintConfig.cpp:3134 -#: src/libslic3r/PrintConfig.cpp:3143 src/libslic3r/PrintConfig.cpp:3153 -#: src/libslic3r/PrintConfig.cpp:3169 src/libslic3r/PrintConfig.cpp:3193 -msgid "mm" -msgstr "мм" - -#: src/slic3r/GUI/BedShapeDialog.cpp:131 -======= #: src/slic3r/GUI/BedShapeDialog.cpp:64 src/slic3r/GUI/ConfigWizard.cpp:262 #: src/slic3r/GUI/ConfigWizard.cpp:1476 src/slic3r/GUI/ConfigWizard.cpp:1490 #: src/slic3r/GUI/ExtruderSequenceDialog.cpp:100 @@ -457,7 +283,6 @@ msgid "mm" msgstr "мм" #: src/slic3r/GUI/BedShapeDialog.cpp:66 ->>>>>>> master msgid "" "Diameter of the print bed. It is assumed that origin (0,0) is located in the " "center." @@ -465,77 +290,6 @@ msgstr "" "Діаметр подложки. ПередбачаєтьÑÑ, що початок координат (0,0) знаходитьÑÑ Ð² " "центрі." -<<<<<<< HEAD -#: src/slic3r/GUI/BedShapeDialog.cpp:141 -msgid "Rectangular" -msgstr "ПрÑмокутний" - -#: src/slic3r/GUI/BedShapeDialog.cpp:142 -msgid "Circular" -msgstr "Круговий" - -#: src/slic3r/GUI/BedShapeDialog.cpp:143 src/slic3r/GUI/GUI_Preview.cpp:243 -#: src/libslic3r/ExtrusionEntity.cpp:323 src/libslic3r/ExtrusionEntity.cpp:358 -msgid "Custom" -msgstr "КориÑтувацький" - -#: src/slic3r/GUI/BedShapeDialog.cpp:145 -msgid "Invalid" -msgstr "ÐедійÑний" - -#: src/slic3r/GUI/BedShapeDialog.cpp:156 src/slic3r/GUI/BedShapeDialog.cpp:222 -#: src/slic3r/GUI/GUI_ObjectList.cpp:2292 -msgid "Shape" -msgstr "Форма" - -#: src/slic3r/GUI/BedShapeDialog.cpp:243 -msgid "Load shape from STL..." -msgstr "Завантажте форму з STL ..." - -#: src/slic3r/GUI/BedShapeDialog.cpp:292 src/slic3r/GUI/MainFrame.cpp:1836 -msgid "Settings" -msgstr "ÐалаштуваннÑ" - -#: src/slic3r/GUI/BedShapeDialog.cpp:315 -msgid "Texture" -msgstr "ТекÑтура" - -#: src/slic3r/GUI/BedShapeDialog.cpp:325 src/slic3r/GUI/BedShapeDialog.cpp:405 -msgid "Load..." -msgstr "Завантажити..." - -#: src/slic3r/GUI/BedShapeDialog.cpp:333 src/slic3r/GUI/BedShapeDialog.cpp:413 -#: src/slic3r/GUI/Tab.cpp:3491 -msgid "Remove" -msgstr "Видалити" - -#: src/slic3r/GUI/BedShapeDialog.cpp:366 src/slic3r/GUI/BedShapeDialog.cpp:446 -msgid "Not found:" -msgstr "Ðе знайдено:" - -#: src/slic3r/GUI/BedShapeDialog.cpp:395 -msgid "Model" -msgstr "Модель" - -#: src/slic3r/GUI/BedShapeDialog.cpp:563 -msgid "Choose an STL file to import bed shape from:" -msgstr "Виберіть STL-файл Ð´Ð»Ñ Ñ–Ð¼Ð¿Ð¾Ñ€Ñ‚Ñƒ форми Ñтолу з:" - -#: src/slic3r/GUI/BedShapeDialog.cpp:570 src/slic3r/GUI/BedShapeDialog.cpp:619 -#: src/slic3r/GUI/BedShapeDialog.cpp:642 -msgid "Invalid file format." -msgstr "ÐедійÑний формат файлу." - -#: src/slic3r/GUI/BedShapeDialog.cpp:581 -msgid "Error! Invalid model" -msgstr "Помилка! ÐедійÑна модель" - -#: src/slic3r/GUI/BedShapeDialog.cpp:589 -msgid "The selected file contains no geometry." -msgstr "Обраний файл не міÑтить геометрії." - -#: src/slic3r/GUI/BedShapeDialog.cpp:593 -======= #: src/slic3r/GUI/BedShapeDialog.cpp:79 msgid "Rectangular" msgstr "ПрÑмокутний" @@ -602,22 +356,10 @@ msgid "The selected file contains no geometry." msgstr "Обраний файл не міÑтить геометрії." #: src/slic3r/GUI/BedShapeDialog.cpp:537 ->>>>>>> master msgid "" "The selected file contains several disjoint areas. This is not supported." msgstr "Обраний файл міÑтить декілька непереÑічних облаÑтей. Ðе підтримуєтьÑÑ." -<<<<<<< HEAD -#: src/slic3r/GUI/BedShapeDialog.cpp:608 -msgid "Choose a file to import bed texture from (PNG/SVG):" -msgstr "Виберіть файл Ð´Ð»Ñ Ñ–Ð¼Ð¿Ð¾Ñ€Ñ‚Ñƒ текÑтури Ñтолу (PNG / SVG):" - -#: src/slic3r/GUI/BedShapeDialog.cpp:631 -msgid "Choose an STL file to import bed model from:" -msgstr "Виберіть STL-файл Ð´Ð»Ñ Ñ–Ð¼Ð¿Ð¾Ñ€Ñ‚Ñƒ моделі Ñтолу з:" - -#: src/slic3r/GUI/BedShapeDialog.hpp:98 src/slic3r/GUI/ConfigWizard.cpp:1331 -======= #: src/slic3r/GUI/BedShapeDialog.cpp:552 msgid "Choose a file to import bed texture from (PNG/SVG):" msgstr "Виберіть файл Ð´Ð»Ñ Ñ–Ð¼Ð¿Ð¾Ñ€Ñ‚Ñƒ текÑтури Ñтолу (PNG / SVG):" @@ -627,7 +369,6 @@ msgid "Choose an STL file to import bed model from:" msgstr "Виберіть STL-файл Ð´Ð»Ñ Ñ–Ð¼Ð¿Ð¾Ñ€Ñ‚Ñƒ моделі Ñтолу з:" #: src/slic3r/GUI/BedShapeDialog.hpp:95 src/slic3r/GUI/ConfigWizard.cpp:1396 ->>>>>>> master msgid "Bed Shape" msgstr "Форма Ñтолу" @@ -659,17 +400,6 @@ msgstr "Пошук приÑтроїв" msgid "Finished" msgstr "Завершено" -<<<<<<< HEAD -#: src/slic3r/GUI/ButtonsDescription.cpp:16 -msgid "Buttons And Text Colors Description" -msgstr "ÐžÐ¿Ð¸Ñ ÐºÐ½Ð¾Ð¿Ð¾Ðº та кольорів текÑту" - -#: src/slic3r/GUI/ButtonsDescription.cpp:36 -msgid "Value is the same as the system value" -msgstr "Ð—Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ñ‚Ð°ÐºÐµ ж, Ñк ÑиÑтемне" - -#: src/slic3r/GUI/ButtonsDescription.cpp:53 -======= #: src/slic3r/GUI/ButtonsDescription.cpp:42 msgid "Revert color to default" msgstr "" @@ -679,7 +409,6 @@ msgid "Value is the same as the system value" msgstr "Ð—Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ñ‚Ð°ÐºÐµ ж, Ñк ÑиÑтемне" #: src/slic3r/GUI/ButtonsDescription.cpp:58 ->>>>>>> master msgid "" "Value was changed and is not equal to the system value or the last saved " "preset" @@ -687,11 +416,6 @@ msgstr "" "Ð—Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð±ÑƒÐ»Ð¾ змінено Ñ– не дорівнює ÑиÑтемному значенню або оÑтанньому " "збереженому преÑету" -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigManipulation.cpp:48 -msgid "" -"Zero layer height is not valid.\n" -======= #: src/slic3r/GUI/ButtonsDescription.cpp:62 msgid "Buttons And Text Colors Description" msgstr "ÐžÐ¿Ð¸Ñ ÐºÐ½Ð¾Ð¿Ð¾Ðº та кольорів текÑту" @@ -699,25 +423,10 @@ msgstr "ÐžÐ¿Ð¸Ñ ÐºÐ½Ð¾Ð¿Ð¾Ðº та кольорів текÑту" #: src/slic3r/GUI/ConfigManipulation.cpp:49 msgid "" "Layer height is not valid.\n" ->>>>>>> master "\n" "The layer height will be reset to 0.01." msgstr "" -"Ðульового виÑота шару Ñ” недійÑною.\n" -"\n" -"ВиÑота шару буде Ñкинута до 0,01." -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigManipulation.cpp:49 -#: src/slic3r/GUI/GUI_ObjectLayers.cpp:29 src/slic3r/GUI/Tab.cpp:1394 -#: src/libslic3r/PrintConfig.cpp:73 -msgid "Layer height" -msgstr "ВиÑота шару" - -#: src/slic3r/GUI/ConfigManipulation.cpp:60 -msgid "" -"Zero first layer height is not valid.\n" -======= #: src/slic3r/GUI/ConfigManipulation.cpp:50 #: src/slic3r/GUI/GUI_ObjectLayers.cpp:29 src/slic3r/GUI/Tab.cpp:1453 #: src/libslic3r/PrintConfig.cpp:263 @@ -727,27 +436,15 @@ msgstr "ВиÑота шару" #: src/slic3r/GUI/ConfigManipulation.cpp:61 msgid "" "First layer height is not valid.\n" ->>>>>>> master "\n" "The first layer height will be reset to 0.01." msgstr "" -"Ðульового виÑота першого шару Ñ” недійÑною.\n" -"\n" -"ВиÑота першого шару буде Ñкинута до 0,01." -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigManipulation.cpp:61 src/libslic3r/PrintConfig.cpp:969 -msgid "First layer height" -msgstr "ВиÑота першого шару" - -#: src/slic3r/GUI/ConfigManipulation.cpp:81 -======= #: src/slic3r/GUI/ConfigManipulation.cpp:62 src/libslic3r/PrintConfig.cpp:1208 msgid "First layer height" msgstr "ВиÑота першого шару" #: src/slic3r/GUI/ConfigManipulation.cpp:82 ->>>>>>> master msgid "" "The Spiral Vase mode requires:\n" "- one perimeter\n" @@ -765,253 +462,22 @@ msgstr "" "- \"Ð—Ð°Ð±ÐµÐ·Ð¿ÐµÑ‡ÐµÐ½Ð½Ñ Ñ‚Ð¾Ð²Ñ‰Ð¸Ð½Ð¸ вертикальної оболонки\" увімкнено\n" "- \"ВиÑÐ²Ð»ÐµÐ½Ð½Ñ Ñ‚Ð¾Ð½ÐºÐ¸Ñ… Ñтінок\" вимкнено" -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigManipulation.cpp:89 -======= #: src/slic3r/GUI/ConfigManipulation.cpp:90 ->>>>>>> master msgid "Shall I adjust those settings in order to enable Spiral Vase?" msgstr "" "Чи потрібно змінити ці налаштуваннÑ, щоб увімкнути режим Спіральної вази?" -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigManipulation.cpp:90 -msgid "Spiral Vase" -msgstr "Спіральна ваза" - -#: src/slic3r/GUI/ConfigManipulation.cpp:115 -======= #: src/slic3r/GUI/ConfigManipulation.cpp:91 msgid "Spiral Vase" msgstr "Спіральна ваза" #: src/slic3r/GUI/ConfigManipulation.cpp:121 ->>>>>>> master msgid "" "The Wipe Tower currently supports the non-soluble supports only\n" "if they are printed with the current extruder without triggering a tool " "change.\n" "(both support_material_extruder and support_material_interface_extruder need " "to be set to 0)." -<<<<<<< HEAD -msgstr "" -"Вежа Ð²Ð¸Ñ‚Ð¸Ñ€Ð°Ð½Ð½Ñ Ð² даний момент підтримує лише нерозчинні підтримки,\n" -"Ñкщо вони друкуютьÑÑ Ð· поточним екÑтрудером, не запуÑкаючи зміну " -"інÑтрументу.\n" -"(обидва Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ support_material_extruder Ñ– " -"support_material_interface_extruder повинні бути вÑтановлені на 0)." - -#: src/slic3r/GUI/ConfigManipulation.cpp:119 -msgid "Shall I adjust those settings in order to enable the Wipe Tower?" -msgstr "Чи потрібно коригувати ці налаштуваннÑ, щоб увімкнути вежу витираннÑ?" - -#: src/slic3r/GUI/ConfigManipulation.cpp:120 -#: src/slic3r/GUI/ConfigManipulation.cpp:140 -msgid "Wipe Tower" -msgstr "Вежа витираннÑ" - -#: src/slic3r/GUI/ConfigManipulation.cpp:136 -msgid "" -"For the Wipe Tower to work with the soluble supports, the support layers\n" -"need to be synchronized with the object layers." -msgstr "" -"Ð”Ð»Ñ Ñ‚Ð¾Ð³Ð¾, щоб вежа Ð²Ð¸Ñ‚Ð¸Ñ€Ð°Ð½Ð½Ñ Ð¿Ñ€Ð°Ñ†ÑŽÐ²Ð°Ð»Ð° з розчинними підтримками, шари " -"підтримки\n" -"повинні бути Ñинхронізовані з шаром об'єкта." - -#: src/slic3r/GUI/ConfigManipulation.cpp:139 -msgid "Shall I synchronize support layers in order to enable the Wipe Tower?" -msgstr "" -"Чи потрібно Ñинхронізувати шари підтримки, щоб увімкнути вежу витираннÑ?" - -#: src/slic3r/GUI/ConfigManipulation.cpp:159 -msgid "" -"Supports work better, if the following feature is enabled:\n" -"- Detect bridging perimeters" -msgstr "" -"Підтримка працює краще, Ñкщо ввімкнена така функціÑ:\n" -"- ВиÑÐ²Ð»ÐµÐ½Ð½Ñ Ð½Ð°Ð²Ð¸Ñаючих периметрів(перемичок)" - -#: src/slic3r/GUI/ConfigManipulation.cpp:162 -msgid "Shall I adjust those settings for supports?" -msgstr "Чи потрібно змінити ці Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ð»Ñ Ð¿Ñ–Ð´Ñ‚Ñ€Ð¸Ð¼ÐºÐ¸?" - -#: src/slic3r/GUI/ConfigManipulation.cpp:163 -msgid "Support Generator" -msgstr "Ð¡Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð¿Ñ–Ð´Ñ‚Ñ€Ð¸Ð¼ÐºÐ¸" - -#: src/slic3r/GUI/ConfigManipulation.cpp:198 -msgid "The %1% infill pattern is not supposed to work at 100%% density." -msgstr "Шаблон Ð·Ð°Ð¿Ð¾Ð²Ð½ÐµÐ½Ð½Ñ %1% не підтримуєтьÑÑ Ð¿Ñ€Ð¸ щільноÑÑ‚Ñ– 100%%." - -#: src/slic3r/GUI/ConfigManipulation.cpp:201 -msgid "Shall I switch to rectilinear fill pattern?" -msgstr "Чи потрібно змінити його на прÑмолінійний шаблон заповненнÑ?" - -#: src/slic3r/GUI/ConfigManipulation.cpp:202 -#: src/slic3r/GUI/GUI_ObjectList.cpp:35 src/slic3r/GUI/GUI_ObjectList.cpp:93 -#: src/slic3r/GUI/GUI_ObjectList.cpp:668 src/slic3r/GUI/Plater.cpp:390 -#: src/slic3r/GUI/Tab.cpp:1439 src/slic3r/GUI/Tab.cpp:1441 -#: src/libslic3r/PrintConfig.cpp:259 src/libslic3r/PrintConfig.cpp:472 -#: src/libslic3r/PrintConfig.cpp:496 src/libslic3r/PrintConfig.cpp:848 -#: src/libslic3r/PrintConfig.cpp:862 src/libslic3r/PrintConfig.cpp:899 -#: src/libslic3r/PrintConfig.cpp:1076 src/libslic3r/PrintConfig.cpp:1086 -#: src/libslic3r/PrintConfig.cpp:1153 src/libslic3r/PrintConfig.cpp:1172 -#: src/libslic3r/PrintConfig.cpp:1191 src/libslic3r/PrintConfig.cpp:1930 -#: src/libslic3r/PrintConfig.cpp:1947 -msgid "Infill" -msgstr "ЗаповненнÑ" - -#: src/slic3r/GUI/ConfigManipulation.cpp:320 -msgid "Head penetration should not be greater than the head width." -msgstr "ÐŸÑ€Ð¾Ð½Ð¸ÐºÐ½ÐµÐ½Ð½Ñ Ð³Ð¾Ð»Ð¾Ð²ÐºÐ¸ не повинно бути більше Ñ—Ñ— ширини." - -#: src/slic3r/GUI/ConfigManipulation.cpp:322 -msgid "Invalid Head penetration" -msgstr "ÐеприпуÑтиме Ð¿Ñ€Ð¾Ð½Ð¸ÐºÐ½ÐµÐ½Ð½Ñ Ð³Ð¾Ð»Ð¾Ð²ÐºÐ¸" - -#: src/slic3r/GUI/ConfigManipulation.cpp:333 -msgid "Pinhead diameter should be smaller than the pillar diameter." -msgstr "Діаметр головки Ñтовпа повинен бути менше діаметра Ñтовпа." - -#: src/slic3r/GUI/ConfigManipulation.cpp:335 -msgid "Invalid pinhead diameter" -msgstr "ÐеприпуÑтимий діаметр головки" - -#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:19 -msgid "Upgrade" -msgstr "Оновити" - -#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:21 -msgid "Downgrade" -msgstr "Повернути до попередньої верÑÑ–Ñ—" - -#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:23 -msgid "Before roll back" -msgstr "Перед відкатом" - -#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:25 src/libslic3r/PrintConfig.cpp:143 -msgid "User" -msgstr "КориÑтувацький" - -#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:28 -#: src/slic3r/GUI/GUI_Preview.cpp:229 src/libslic3r/ExtrusionEntity.cpp:309 -msgid "Unknown" -msgstr "Ðевідомий" - -#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:44 -msgid "Active" -msgstr "Ðктивний" - -#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:51 -msgid "PrusaSlicer version" -msgstr "ВерÑÑ–Ñ PrusaSlicer" - -#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:55 src/libslic3r/Preset.cpp:1306 -msgid "print" -msgstr "друк" - -#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:56 -msgid "filaments" -msgstr "філаменти" - -#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:59 src/libslic3r/Preset.cpp:1308 -msgid "SLA print" -msgstr "SLA-друк" - -#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:60 src/slic3r/GUI/GUI.cpp:353 -#: src/slic3r/GUI/Plater.cpp:697 src/libslic3r/Preset.cpp:1309 -msgid "SLA material" -msgstr "SLA-матеріал" - -#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:62 src/libslic3r/Preset.cpp:1310 -msgid "printer" -msgstr "принтер" - -#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:66 src/slic3r/GUI/Tab.cpp:1311 -msgid "vendor" -msgstr "виробник" - -#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:66 -msgid "version" -msgstr "верÑÑ–Ñ" - -#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:67 -msgid "min PrusaSlicer version" -msgstr "мінімальна верÑÑ–Ñ PrusaSlicer" - -#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:69 -msgid "max PrusaSlicer version" -msgstr "макÑимальна верÑÑ–Ñ PrusaSlicer" - -#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:72 -msgid "model" -msgstr "модель" - -#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:72 -msgid "variants" -msgstr "варіанти" - -#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:84 -#, c-format -msgid "Incompatible with this %s" -msgstr "Є неÑуміÑним з цією верÑією %s" - -#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:87 -msgid "Activate" -msgstr "Ðктивувати" - -#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:113 -msgid "Configuration Snapshots" -msgstr "Знімки конфігурації" - -#: src/slic3r/GUI/ConfigWizard.cpp:246 -msgid "nozzle" -msgstr "Ñопло" - -#: src/slic3r/GUI/ConfigWizard.cpp:250 -msgid "Alternate nozzles:" -msgstr "Ðльтернативні Ñопла:" - -#: src/slic3r/GUI/ConfigWizard.cpp:314 -msgid "All standard" -msgstr "Ð’ÑÑ– Ñтандартні" - -#: src/slic3r/GUI/ConfigWizard.cpp:314 -msgid "Standard" -msgstr "Стандартний" - -#: src/slic3r/GUI/ConfigWizard.cpp:315 src/slic3r/GUI/ConfigWizard.cpp:609 -#: src/slic3r/GUI/Tab.cpp:3572 src/slic3r/GUI/UnsavedChangesDialog.cpp:933 -msgid "All" -msgstr "Ð’ÑÑ–" - -#: src/slic3r/GUI/ConfigWizard.cpp:316 src/slic3r/GUI/ConfigWizard.cpp:610 -#: src/slic3r/GUI/DoubleSlider.cpp:1879 src/slic3r/GUI/Plater.cpp:362 -#: src/slic3r/GUI/Plater.cpp:505 -msgid "None" -msgstr "Жодне" - -#: src/slic3r/GUI/ConfigWizard.cpp:456 -#, c-format -msgid "Welcome to the %s Configuration Assistant" -msgstr "ЛаÑкаво проÑимо до ÐÑиÑтента конфігурації %s" - -#: src/slic3r/GUI/ConfigWizard.cpp:458 -#, c-format -msgid "Welcome to the %s Configuration Wizard" -msgstr "ЛаÑкаво проÑимо до МайÑтру конфігурації %s" - -#: src/slic3r/GUI/ConfigWizard.cpp:460 -msgid "Welcome" -msgstr "ЛаÑкаво проÑимо" - -#: src/slic3r/GUI/ConfigWizard.cpp:462 -#, c-format -msgid "" -"Hello, welcome to %s! This %s helps you with the initial configuration; just " -"a few settings and you will be ready to print." -======= msgstr "" "Вежа Ð²Ð¸Ñ‚Ð¸Ñ€Ð°Ð½Ð½Ñ Ð² даний момент підтримує лише нерозчинні підтримки,\n" "Ñкщо вони друкуютьÑÑ Ð· поточним екÑтрудером, не запуÑкаючи зміну " @@ -1244,43 +710,8 @@ msgstr "Видалити профілі кориÑтувачів (знімок Ð msgid "" "Perform desktop integration (Sets this binary to be searchable by the " "system)." ->>>>>>> master msgstr "" -"Вітаємо, лаÑкаво проÑимо до %s! Цей %s допоможе вам в початковій " -"конфігурації; лише кілька налаштувань, Ñ– ви будете готові до друку." - -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigWizard.cpp:467 -msgid "Remove user profiles (a snapshot will be taken beforehand)" -msgstr "Видалити профілі кориÑтувачів (знімок буде зроблено заздалегідь)" - -#: src/slic3r/GUI/ConfigWizard.cpp:510 -#, c-format -msgid "%s Family" -msgstr "%s Родина" - -#: src/slic3r/GUI/ConfigWizard.cpp:598 -msgid "Printer:" -msgstr "Принтер:" - -#: src/slic3r/GUI/ConfigWizard.cpp:600 -msgid "Vendor:" -msgstr "Виробник:" - -#: src/slic3r/GUI/ConfigWizard.cpp:601 -msgid "Profile:" -msgstr "Профіль:" - -#: src/slic3r/GUI/ConfigWizard.cpp:673 src/slic3r/GUI/ConfigWizard.cpp:823 -#: src/slic3r/GUI/ConfigWizard.cpp:884 src/slic3r/GUI/ConfigWizard.cpp:1021 -msgid "(All)" -msgstr "(Ð’ÑÑ–)" -#: src/slic3r/GUI/ConfigWizard.cpp:702 -msgid "" -"Filaments marked with <b>*</b> are <b>not</b> compatible with some installed " -"printers." -======= #: src/slic3r/GUI/ConfigWizard.cpp:550 #, c-format, boost-format msgid "%s Family" @@ -1317,53 +748,8 @@ msgstr "Філаменти" #: src/slic3r/GUI/ConfigWizard.cpp:752 msgid "SLA materials" ->>>>>>> master msgstr "" -"Філаменти, позначені <b>*</b>, Ñ” <b>не</b>ÑуміÑні з деÑкими вÑтановленими " -"принтерами." - -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigWizard.cpp:705 -msgid "All installed printers are compatible with the selected filament." -msgstr "УÑÑ– вÑтановлені принтери ÑуміÑні з обраним філаментем." - -#: src/slic3r/GUI/ConfigWizard.cpp:725 -msgid "" -"Only the following installed printers are compatible with the selected " -"filament:" -msgstr "Тільки наÑтупні вÑтановлені принтери ÑуміÑні з обраним філаментом:" - -#: src/slic3r/GUI/ConfigWizard.cpp:1111 -msgid "Custom Printer Setup" -msgstr "КориÑтувацьке Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ñ€Ð¸Ð½Ñ‚ÐµÑ€Ð°" - -#: src/slic3r/GUI/ConfigWizard.cpp:1111 -msgid "Custom Printer" -msgstr "КориÑтувацький принтер" - -#: src/slic3r/GUI/ConfigWizard.cpp:1113 -msgid "Define a custom printer profile" -msgstr "Визначте влаÑний профіль принтера" - -#: src/slic3r/GUI/ConfigWizard.cpp:1115 -msgid "Custom profile name:" -msgstr "КориÑтувацьке ім'Ñ Ð¿Ñ€ÐµÑету:" - -#: src/slic3r/GUI/ConfigWizard.cpp:1140 -msgid "Automatic updates" -msgstr "Ðвтоматичні оновленнÑ" - -#: src/slic3r/GUI/ConfigWizard.cpp:1140 -msgid "Updates" -msgstr "ОновленнÑ" - -#: src/slic3r/GUI/ConfigWizard.cpp:1148 src/slic3r/GUI/Preferences.cpp:94 -msgid "Check for application updates" -msgstr "Перевірте наÑвніÑÑ‚ÑŒ оновлень програми" -#: src/slic3r/GUI/ConfigWizard.cpp:1152 -#, c-format -======= #: src/slic3r/GUI/ConfigWizard.cpp:755 #, boost-format msgid "All installed printers are compatible with the selected %1%." @@ -1415,7 +801,6 @@ msgstr "Перевірте наÑвніÑÑ‚ÑŒ оновлень програми" #: src/slic3r/GUI/ConfigWizard.cpp:1218 #, c-format, boost-format ->>>>>>> master msgid "" "If enabled, %s checks for new application versions online. When a new " "version becomes available, a notification is displayed at the next " @@ -1427,21 +812,12 @@ msgstr "" "наÑтупного запуÑку заÑтоÑÑƒÐ²Ð°Ð½Ð½Ñ (ніколи не під Ñ‡Ð°Ñ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ð½Ð½Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¸). " "Це лише механізми ÑповіщеннÑ, автоматична інÑталÑÑ†Ñ–Ñ Ð½Ðµ виконуєтьÑÑ." -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigWizard.cpp:1158 src/slic3r/GUI/Preferences.cpp:129 -msgid "Update built-in Presets automatically" -msgstr "Ðвтоматично оновлювати вбудовані преÑети" - -#: src/slic3r/GUI/ConfigWizard.cpp:1162 -#, c-format -======= #: src/slic3r/GUI/ConfigWizard.cpp:1224 src/slic3r/GUI/Preferences.cpp:175 msgid "Update built-in Presets automatically" msgstr "Ðвтоматично оновлювати вбудовані преÑети" #: src/slic3r/GUI/ConfigWizard.cpp:1228 #, c-format, boost-format ->>>>>>> master msgid "" "If enabled, %s downloads updates of built-in system presets in the " "background.These updates are downloaded into a separate temporary location." @@ -1453,11 +829,7 @@ msgstr "" "з’ÑвлÑєтьÑÑ Ð½Ð¾Ð²Ð° попередньо вÑтановлена верÑÑ–Ñ, вона пропонуєтьÑÑ Ð¿Ñ–Ð´ Ñ‡Ð°Ñ " "запуÑку програми." -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigWizard.cpp:1165 -======= #: src/slic3r/GUI/ConfigWizard.cpp:1231 ->>>>>>> master msgid "" "Updates are never applied without user's consent and never overwrite user's " "customized settings." @@ -1465,11 +837,7 @@ msgstr "" "ÐžÐ½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð½Ñ–ÐºÐ¾Ð»Ð¸ не заÑтоÑовуютьÑÑ Ð±ÐµÐ· згоди кориÑтувача та ніколи не " "перезапиÑують влаÑні Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ ÐºÐ¾Ñ€Ð¸Ñтувача." -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigWizard.cpp:1170 -======= #: src/slic3r/GUI/ConfigWizard.cpp:1236 ->>>>>>> master msgid "" "Additionally a backup snapshot of the whole configuration is created before " "an update is applied." @@ -1477,133 +845,6 @@ msgstr "" "Крім того, перед заÑтоÑуваннÑм Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ ÑтворюєтьÑÑ Ñ€ÐµÐ·ÐµÑ€Ð²Ð½Ð¸Ð¹ знімок вÑієї " "конфігурації." -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigWizard.cpp:1177 src/slic3r/GUI/GUI_ObjectList.cpp:1829 -#: src/slic3r/GUI/GUI_ObjectList.cpp:4573 src/slic3r/GUI/Plater.cpp:3124 -#: src/slic3r/GUI/Plater.cpp:4018 src/slic3r/GUI/Plater.cpp:4049 -msgid "Reload from disk" -msgstr "Перезавантажити з диÑка" - -#: src/slic3r/GUI/ConfigWizard.cpp:1180 -msgid "" -"Export full pathnames of models and parts sources into 3mf and amf files" -msgstr "" -"ЕкÑпортуйте повні назви шлÑхів джерел моделей та чаÑтей у файли 3MF та AMF" - -#: src/slic3r/GUI/ConfigWizard.cpp:1184 -msgid "" -"If enabled, allows the Reload from disk command to automatically find and " -"load the files when invoked.\n" -"If not enabled, the Reload from disk command will ask to select each file " -"using an open file dialog." -msgstr "" -"Якщо ввімкнено, дозволÑÑ” команді «Перезавантажити з диÑка» автоматично " -"знаходити та завантажувати файли при виклику.\n" -"Якщо не ввімкнено, команда «Перезавантажити з диÑка» попроÑить вибрати кожен " -"файл за допомогою діалогового вікна відкритого файлу." - -#: src/slic3r/GUI/ConfigWizard.cpp:1194 -msgid "Files association" -msgstr "ÐÑÐ¾Ñ†Ñ–Ð°Ñ†Ñ–Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð²" - -#: src/slic3r/GUI/ConfigWizard.cpp:1196 src/slic3r/GUI/Preferences.cpp:112 -msgid "Associate .3mf files to PrusaSlicer" -msgstr "ÐÑоціювати 3MF-файли з PrusaSlicer" - -#: src/slic3r/GUI/ConfigWizard.cpp:1197 src/slic3r/GUI/Preferences.cpp:119 -msgid "Associate .stl files to PrusaSlicer" -msgstr "ÐÑоціювати stl-файли з PrusaSlicer" - -#: src/slic3r/GUI/ConfigWizard.cpp:1208 -msgid "View mode" -msgstr "Режим переглÑду" - -#: src/slic3r/GUI/ConfigWizard.cpp:1210 -msgid "" -"PrusaSlicer's user interfaces comes in three variants:\n" -"Simple, Advanced, and Expert.\n" -"The Simple mode shows only the most frequently used settings relevant for " -"regular 3D printing. The other two offer progressively more sophisticated " -"fine-tuning, they are suitable for advanced and expert users, respectively." -msgstr "" -"КориÑтувацький Ñ–Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ PrusaSlicer поÑтавлÑÑŽÑ‚ÑŒÑÑ Ð² трьох варіантах:\n" -"ПроÑтий, Розширений та ЕкÑпертний.\n" -"У проÑтому режимі відображаютьÑÑ Ð»Ð¸ÑˆÐµ найбільш чаÑто викориÑтовувані " -"налаштуваннÑ, що ÑтоÑуютьÑÑ Ð·Ð²Ð¸Ñ‡Ð°Ð¹Ð½Ð¾Ð³Ð¾ 3D-друку. Два інших пропонують " -"поÑтупово більш доÑконалу точну наÑтройку, вони підходÑÑ‚ÑŒ Ð´Ð»Ñ Ð±Ñ–Ð»ÑŒÑˆ " -"доÑвідчених кориÑтувачів." - -#: src/slic3r/GUI/ConfigWizard.cpp:1215 -msgid "Simple mode" -msgstr "ПроÑтий режим" - -#: src/slic3r/GUI/ConfigWizard.cpp:1216 -msgid "Advanced mode" -msgstr "Розширений режим" - -#: src/slic3r/GUI/ConfigWizard.cpp:1217 -msgid "Expert mode" -msgstr "ЕкÑпертний режим" - -#: src/slic3r/GUI/ConfigWizard.cpp:1223 -msgid "The size of the object can be specified in inches" -msgstr "Розмір предмета можна вказати в дюймах" - -#: src/slic3r/GUI/ConfigWizard.cpp:1224 -msgid "Use inches" -msgstr "ВикориÑтовувати дюйми" - -#: src/slic3r/GUI/ConfigWizard.cpp:1258 -msgid "Other Vendors" -msgstr "Інші поÑтачальники" - -#: src/slic3r/GUI/ConfigWizard.cpp:1262 -#, c-format -msgid "Pick another vendor supported by %s" -msgstr "Виберіть іншого поÑтачальника, Ñкий підтримує %s" - -#: src/slic3r/GUI/ConfigWizard.cpp:1293 -msgid "Firmware Type" -msgstr "Тип прошивки" - -#: src/slic3r/GUI/ConfigWizard.cpp:1293 src/slic3r/GUI/Tab.cpp:2179 -msgid "Firmware" -msgstr "Прошивка" - -#: src/slic3r/GUI/ConfigWizard.cpp:1297 -msgid "Choose the type of firmware used by your printer." -msgstr "Виберіть тип прошивки, що викориÑтовуютьÑÑ Ð²Ð°ÑˆÐ¸Ð¼ принтером." - -#: src/slic3r/GUI/ConfigWizard.cpp:1331 -msgid "Bed Shape and Size" -msgstr "Форма та розмір Ñтолу" - -#: src/slic3r/GUI/ConfigWizard.cpp:1334 -msgid "Set the shape of your printer's bed." -msgstr "Ð’Ñтановіть форму Ñтолу Ñвого принтеру." - -#: src/slic3r/GUI/ConfigWizard.cpp:1354 -msgid "Filament and Nozzle Diameters" -msgstr "Діаметри філатенту та Ñопла" - -#: src/slic3r/GUI/ConfigWizard.cpp:1354 -msgid "Print Diameters" -msgstr "Діаметри друку" - -#: src/slic3r/GUI/ConfigWizard.cpp:1368 -msgid "Enter the diameter of your printer's hot end nozzle." -msgstr "Введіть діаметр кінчику екÑтрудерного Ñопла." - -#: src/slic3r/GUI/ConfigWizard.cpp:1371 -msgid "Nozzle Diameter:" -msgstr "Діаметр Ñопла:" - -#: src/slic3r/GUI/ConfigWizard.cpp:1381 -msgid "Enter the diameter of your filament." -msgstr "Введіть діаметр вашого філаметну." - -#: src/slic3r/GUI/ConfigWizard.cpp:1382 -======= #: src/slic3r/GUI/ConfigWizard.cpp:1243 src/slic3r/GUI/GUI_Factories.cpp:726 #: src/slic3r/GUI/Plater.cpp:3548 msgid "Reload from disk" @@ -1734,7 +975,6 @@ msgid "Enter the diameter of your filament." msgstr "Введіть діаметр вашого філаметну." #: src/slic3r/GUI/ConfigWizard.cpp:1486 ->>>>>>> master msgid "" "Good precision is required, so use a caliper and do multiple measurements " "along the filament, then compute the average." @@ -1742,39 +982,6 @@ msgstr "" "Ðеобхідна виÑока точніÑÑ‚ÑŒ, тому викориÑтовуйте калібрувальник Ñ– виконайте " "декілька вимірювань вздовж філаменту, потім обчиÑліть Ñереднє значеннÑ." -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigWizard.cpp:1385 -msgid "Filament Diameter:" -msgstr "Діаметр філаменту:" - -#: src/slic3r/GUI/ConfigWizard.cpp:1419 -msgid "Nozzle and Bed Temperatures" -msgstr "Температура Ñопла та Ñтолу" - -#: src/slic3r/GUI/ConfigWizard.cpp:1419 -msgid "Temperatures" -msgstr "Температури" - -#: src/slic3r/GUI/ConfigWizard.cpp:1435 -msgid "Enter the temperature needed for extruding your filament." -msgstr "Введіть температуру, необхідну Ð´Ð»Ñ ÐµÐºÑÑ‚Ñ€ÑƒÐ´ÑƒÐ²Ð°Ð½Ð½Ñ Ð²Ð°ÑˆÐ¾Ð³Ð¾ філаменту." - -#: src/slic3r/GUI/ConfigWizard.cpp:1436 -msgid "A rule of thumb is 160 to 230 °C for PLA, and 215 to 250 °C for ABS." -msgstr "Зазвичай - 160-230°C Ð´Ð»Ñ PLA та 215-250°C Ð´Ð»Ñ ABS." - -#: src/slic3r/GUI/ConfigWizard.cpp:1439 -msgid "Extrusion Temperature:" -msgstr "Температура екÑтрузії:" - -#: src/slic3r/GUI/ConfigWizard.cpp:1440 src/slic3r/GUI/ConfigWizard.cpp:1454 -#: src/libslic3r/PrintConfig.cpp:202 src/libslic3r/PrintConfig.cpp:950 -#: src/libslic3r/PrintConfig.cpp:994 src/libslic3r/PrintConfig.cpp:2296 -msgid "°C" -msgstr "°C" - -#: src/slic3r/GUI/ConfigWizard.cpp:1449 -======= #: src/slic3r/GUI/ConfigWizard.cpp:1489 msgid "Filament Diameter:" msgstr "Діаметр філаменту:" @@ -1806,7 +1013,6 @@ msgid "°C" msgstr "°C" #: src/slic3r/GUI/ConfigWizard.cpp:1577 ->>>>>>> master msgid "" "Enter the bed temperature needed for getting your filament to stick to your " "heated bed." @@ -1814,11 +1020,7 @@ msgstr "" "Введіть температуру Ñтолу, необхідну Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, щоб ваш філамент добре " "кріпивÑÑ Ð´Ð¾ нагрітого Ñтолу." -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigWizard.cpp:1450 -======= #: src/slic3r/GUI/ConfigWizard.cpp:1578 ->>>>>>> master msgid "" "A rule of thumb is 60 °C for PLA and 110 °C for ABS. Leave zero if you have " "no heated bed." @@ -1826,143 +1028,6 @@ msgstr "" "Зазвичай - 60°C Ð´Ð»Ñ PLA та 110°C Ð´Ð»Ñ ABS. Залиште рівним нулю, Ñкщо Ñтіл " "нерозігрітий." -<<<<<<< HEAD -#: src/slic3r/GUI/ConfigWizard.cpp:1453 -msgid "Bed Temperature:" -msgstr "Температура Ñтолу:" - -#: src/slic3r/GUI/ConfigWizard.cpp:1913 src/slic3r/GUI/ConfigWizard.cpp:2590 -msgid "Filaments" -msgstr "Філаменти" - -#: src/slic3r/GUI/ConfigWizard.cpp:1913 src/slic3r/GUI/ConfigWizard.cpp:2592 -msgid "SLA Materials" -msgstr "SLA-матеріали" - -#: src/slic3r/GUI/ConfigWizard.cpp:1967 -msgid "FFF Technology Printers" -msgstr "Принтери технології FFF" - -#: src/slic3r/GUI/ConfigWizard.cpp:1972 -msgid "SLA Technology Printers" -msgstr "Принтери технології SLA" - -#: src/slic3r/GUI/ConfigWizard.cpp:2278 src/slic3r/GUI/DoubleSlider.cpp:2265 -#: src/slic3r/GUI/DoubleSlider.cpp:2285 src/slic3r/GUI/GUI.cpp:246 -msgid "Notice" -msgstr "ЗауваженнÑ" - -#: src/slic3r/GUI/ConfigWizard.cpp:2299 -msgid "The following FFF printer models have no filament selected:" -msgstr "ÐаÑтупні моделі FFF-принтерів не мають вибраного філаменту:" - -#: src/slic3r/GUI/ConfigWizard.cpp:2303 -msgid "Do you want to select default filaments for these FFF printer models?" -msgstr "" -"Ви хочете вибрати філаменти за замовчуваннÑм Ð´Ð»Ñ Ñ†Ð¸Ñ… моделей FFF-принтерів?" - -#: src/slic3r/GUI/ConfigWizard.cpp:2317 -msgid "The following SLA printer models have no materials selected:" -msgstr "ÐаÑтупні моделі SLA-принтерів не мають вибраного матеріалу:" - -#: src/slic3r/GUI/ConfigWizard.cpp:2321 -msgid "Do you want to select default SLA materials for these printer models?" -msgstr "" -"Ви хочете вибрати матеріали за замовчуваннÑм Ð´Ð»Ñ Ñ†Ð¸Ñ… моделей SLA-принтерів?" - -#: src/slic3r/GUI/ConfigWizard.cpp:2553 -msgid "Select all standard printers" -msgstr "Виберіть уÑÑ– Ñтандартні принтери" - -#: src/slic3r/GUI/ConfigWizard.cpp:2556 -msgid "< &Back" -msgstr "< Ðазад" - -#: src/slic3r/GUI/ConfigWizard.cpp:2557 -msgid "&Next >" -msgstr "Далі >" - -#: src/slic3r/GUI/ConfigWizard.cpp:2558 -msgid "&Finish" -msgstr "Завершити" - -#: src/slic3r/GUI/ConfigWizard.cpp:2559 src/slic3r/GUI/FirmwareDialog.cpp:153 -#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:248 -#: src/slic3r/GUI/ProgressStatusBar.cpp:26 -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:656 -msgid "Cancel" -msgstr "СкаÑувати" - -#: src/slic3r/GUI/ConfigWizard.cpp:2572 -msgid "Prusa FFF Technology Printers" -msgstr "Принтери технології FFF" - -#: src/slic3r/GUI/ConfigWizard.cpp:2575 -msgid "Prusa MSLA Technology Printers" -msgstr "Принтери технології MSLA" - -#: src/slic3r/GUI/ConfigWizard.cpp:2590 -msgid "Filament Profiles Selection" -msgstr "Вибір профілів філаменту" - -#: src/slic3r/GUI/ConfigWizard.cpp:2590 src/slic3r/GUI/ConfigWizard.cpp:2592 -#: src/slic3r/GUI/GUI_ObjectList.cpp:4150 -msgid "Type:" -msgstr "Тип:" - -#: src/slic3r/GUI/ConfigWizard.cpp:2592 -msgid "SLA Material Profiles Selection" -msgstr "Вибір профілів SLA-матеріалу" - -#: src/slic3r/GUI/ConfigWizard.cpp:2709 -msgid "Configuration Assistant" -msgstr "ÐÑиÑтент конфігурації" - -#: src/slic3r/GUI/ConfigWizard.cpp:2710 -msgid "Configuration &Assistant" -msgstr "ÐÑиÑтент конфігурації" - -#: src/slic3r/GUI/ConfigWizard.cpp:2712 -msgid "Configuration Wizard" -msgstr "МайÑтер конфігурації" - -#: src/slic3r/GUI/ConfigWizard.cpp:2713 -msgid "Configuration &Wizard" -msgstr "МайÑтер конфігурації" - -#: src/slic3r/GUI/DoubleSlider.cpp:97 -msgid "Place bearings in slots and resume printing" -msgstr "РозміÑÑ‚Ñ–Ñ‚ÑŒ необхідні деталі в гніздах Ñ– відновіть друк" - -#: src/slic3r/GUI/DoubleSlider.cpp:1244 -msgid "One layer mode" -msgstr "Одношаровий режим" - -#: src/slic3r/GUI/DoubleSlider.cpp:1246 -msgid "Discard all custom changes" -msgstr "Відхилити вÑÑ– кориÑтувацькі зміни" - -#: src/slic3r/GUI/DoubleSlider.cpp:1250 src/slic3r/GUI/DoubleSlider.cpp:2015 -msgid "Jump to move" -msgstr "Перейти до руху" - -#: src/slic3r/GUI/DoubleSlider.cpp:1253 -#, c-format -msgid "" -"Jump to height %s\n" -"Set ruler mode\n" -"or Set extruder sequence for the entire print" -msgstr "" -"Перейти на виÑоту %s\n" -"Ðалаштувати режим лінійки\n" -"або Ðалаштувати поÑлідовніÑÑ‚ÑŒ екÑтрудерів Ð´Ð»Ñ Ð¿Ð¾Ñ‚Ð¾Ñ‡Ð½Ð¾Ð³Ð¾ Ñ‚Ñ–Ñку" - -#: src/slic3r/GUI/DoubleSlider.cpp:1256 -#, c-format -msgid "" -"Jump to height %s\n" -"or Set ruler mode" -======= #: src/slic3r/GUI/ConfigWizard.cpp:1581 msgid "Bed Temperature:" msgstr "Температура Ñтолу:" @@ -2019,36 +1084,12 @@ msgstr "" #: src/slic3r/GUI/ConfigWizard.cpp:2523 msgid "Configuration is edited in ConfigWizard" ->>>>>>> master msgstr "" -"Перейти на виÑоту %s\n" -"або Ðалаштувати режим лінійки" -<<<<<<< HEAD -#: src/slic3r/GUI/DoubleSlider.cpp:1261 -msgid "Edit current color - Right click the colored slider segment" -======= #: src/slic3r/GUI/ConfigWizard.cpp:2566 msgid "All user presets will be deleted." ->>>>>>> master msgstr "" -"Редагувати поточний колір - Клацніть правою кнопкою миші на кольоровий " -"Ñегмент повзунка" - -<<<<<<< HEAD -#: src/slic3r/GUI/DoubleSlider.cpp:1271 -msgid "Print mode" -msgstr "Режим друку" -#: src/slic3r/GUI/DoubleSlider.cpp:1285 -msgid "Add extruder change - Left click" -msgstr "Додати зміну екÑтрудеру - ліва кнопка миші" - -#: src/slic3r/GUI/DoubleSlider.cpp:1287 -msgid "" -"Add color change - Left click for predefined color or Shift + Left click for " -"custom color selection" -======= #: src/slic3r/GUI/ConfigWizard.cpp:2596 msgid "A new vendor was installed and one of its printers will be activated" msgid_plural "" @@ -2059,463 +1100,36 @@ msgstr[2] "" #: src/slic3r/GUI/ConfigWizard.cpp:2625 msgid "Do you want to continue changing the configuration?" ->>>>>>> master -msgstr "" -"Додати зміну кольору - ліва кнопка миші Ð´Ð»Ñ Ð¿Ð¾Ð¿ÐµÑ€ÐµÐ´Ð½ÑŒÐ¾ визначеного кольору " -"або Shift + ліва кнопка миші Ð´Ð»Ñ Ð²Ð»Ð°Ñтного вибору кольору" - -<<<<<<< HEAD -#: src/slic3r/GUI/DoubleSlider.cpp:1289 -msgid "Add color change - Left click" -msgstr "Додати зміну кольору - ліва кнопка миші" - -#: src/slic3r/GUI/DoubleSlider.cpp:1290 -msgid "or press \"+\" key" -msgstr "або натиÑніть клавішу \"+\"" - -#: src/slic3r/GUI/DoubleSlider.cpp:1292 -msgid "Add another code - Ctrl + Left click" -msgstr "Додайте інший код - Ctrl + ліва кнопка миші" - -#: src/slic3r/GUI/DoubleSlider.cpp:1293 -msgid "Add another code - Right click" -msgstr "Додайте інший код - права кнопка миші" - -#: src/slic3r/GUI/DoubleSlider.cpp:1299 -msgid "" -"The sequential print is on.\n" -"It's impossible to apply any custom G-code for objects printing " -"sequentually.\n" -"This code won't be processed during G-code generation." -msgstr "" -"ПоÑлідовний друк увімкнено.\n" -"Ðеможливо заÑтоÑувати будь-Ñкий влаÑний G-код Ð´Ð»Ñ Ð¿Ð¾Ñлідовного друку " -"об'єктів.\n" -"Цей код не буде оброблÑтиÑÑ Ð¿Ñ–Ð´ Ñ‡Ð°Ñ ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ G-коду." - -#: src/slic3r/GUI/DoubleSlider.cpp:1308 -msgid "Color change (\"%1%\")" -msgstr "Зміну кольору (\"%1%\")" - -#: src/slic3r/GUI/DoubleSlider.cpp:1309 -msgid "Color change (\"%1%\") for Extruder %2%" -msgstr "Зміну кольору (\"%1%\") Ð´Ð»Ñ ÐµÐºÑтрудеру %2%" - -#: src/slic3r/GUI/DoubleSlider.cpp:1311 -msgid "Pause print (\"%1%\")" -msgstr "Пауза друку (\"%1%\")" - -#: src/slic3r/GUI/DoubleSlider.cpp:1313 -msgid "Custom template (\"%1%\")" -msgstr "КориÑтувацький шаблон (\"%1%\")" - -#: src/slic3r/GUI/DoubleSlider.cpp:1315 -msgid "Extruder (tool) is changed to Extruder \"%1%\"" -msgstr "ЕкÑтрудер (інÑтрумент) змінено на ЕкÑтрудер \"%1%\"" - -#: src/slic3r/GUI/DoubleSlider.cpp:1322 -msgid "Note" -msgstr "Примітка" - -#: src/slic3r/GUI/DoubleSlider.cpp:1324 -msgid "" -"G-code associated to this tick mark is in a conflict with print mode.\n" -"Editing it will cause changes of Slider data." -msgstr "" -"G-код, пов'Ñзаний з цим маркером, Ñуперечить режиму друку.\n" -"Ð ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ñ€Ð¸Ð·Ð²ÐµÐ´Ðµ до змін даних повзунка." - -#: src/slic3r/GUI/DoubleSlider.cpp:1327 -msgid "" -"There is a color change for extruder that won't be used till the end of " -"print job.\n" -"This code won't be processed during G-code generation." -msgstr "" -"Змінено колір екÑтрудера, Ñкий не викориÑтовуватиметьÑÑ Ð´Ð¾ ÐºÑ–Ð½Ñ†Ñ Ð·Ð°Ð²Ð´Ð°Ð½Ð½Ñ " -"друку.\n" -"Цей код не буде оброблÑтиÑÑ Ð¿Ñ–Ð´ Ñ‡Ð°Ñ ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ G-коду." - -#: src/slic3r/GUI/DoubleSlider.cpp:1330 -msgid "" -"There is an extruder change set to the same extruder.\n" -"This code won't be processed during G-code generation." msgstr "" -"ІÑнує зміна екÑтрудера, вÑтановлена на той Ñамий екÑтрудер.\n" -"Цей код не буде оброблÑтиÑÑ Ð¿Ñ–Ð´ Ñ‡Ð°Ñ ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ G-коду." -#: src/slic3r/GUI/DoubleSlider.cpp:1333 -msgid "" -"There is a color change for extruder that has not been used before.\n" -"Check your settings to avoid redundant color changes." -======= #: src/slic3r/GUI/ConfigWizard.cpp:2691 msgid "A new Printer was installed and it will be activated." ->>>>>>> master msgstr "" -"ЗмінюєтьÑÑ ÐºÐ¾Ð»Ñ–Ñ€ екÑтрудера, Ñкий раніше не заÑтоÑовувавÑÑ.\n" -"Перевірте Ñвої налаштуваннÑ, щоб уникнути зайвих змін кольору." - -<<<<<<< HEAD -#: src/slic3r/GUI/DoubleSlider.cpp:1338 -msgid "Delete tick mark - Left click or press \"-\" key" -msgstr "" -"Видалити маркер - клацніть лівою кнопкою миші або натиÑніть клавішу \"-\"" - -#: src/slic3r/GUI/DoubleSlider.cpp:1340 -msgid "Edit tick mark - Ctrl + Left click" -msgstr "Змінити маркер - Ctrl+Ліва кнопка миші" - -#: src/slic3r/GUI/DoubleSlider.cpp:1341 -msgid "Edit tick mark - Right click" -msgstr "Змінити маркер - Права кнопка миші" - -#: src/slic3r/GUI/DoubleSlider.cpp:1437 src/slic3r/GUI/DoubleSlider.cpp:1471 -#: src/slic3r/GUI/GUI_ObjectList.cpp:1868 -#, c-format -msgid "Extruder %d" -msgstr "ЕкÑтрудер %d" - -#: src/slic3r/GUI/DoubleSlider.cpp:1438 src/slic3r/GUI/GUI_ObjectList.cpp:1869 -msgid "active" -msgstr "активний" - -#: src/slic3r/GUI/DoubleSlider.cpp:1447 -msgid "Switch code to Change extruder" -msgstr "Переключити код на \"Змінити екÑтрудер\"" - -#: src/slic3r/GUI/DoubleSlider.cpp:1447 src/slic3r/GUI/GUI_ObjectList.cpp:1836 -msgid "Change extruder" -msgstr "Змінити екÑтрудер" - -#: src/slic3r/GUI/DoubleSlider.cpp:1448 -msgid "Change extruder (N/A)" -msgstr "Змінити екÑтрудер (ÐедоÑтупний)" - -#: src/slic3r/GUI/DoubleSlider.cpp:1450 -msgid "Use another extruder" -msgstr "ВикориÑтати інший екÑтрудер" -#: src/slic3r/GUI/DoubleSlider.cpp:1472 -msgid "used" -msgstr "викориÑтовуєтьÑÑ" - -#: src/slic3r/GUI/DoubleSlider.cpp:1480 -msgid "Switch code to Color change (%1%) for:" -msgstr "Переключити код на \"Змінити колір\" (%1%) длÑ:" - -#: src/slic3r/GUI/DoubleSlider.cpp:1481 -msgid "Add color change (%1%) for:" -msgstr "Додати зміну кольору (%1%) длÑ:" - -#: src/slic3r/GUI/DoubleSlider.cpp:1817 -msgid "Add color change" -msgstr "Додати зміну кольору" - -#: src/slic3r/GUI/DoubleSlider.cpp:1828 -msgid "Add pause print" -msgstr "Додати паузу друку" - -#: src/slic3r/GUI/DoubleSlider.cpp:1832 -msgid "Add custom template" -msgstr "Додати влаÑний шаблон" - -#: src/slic3r/GUI/DoubleSlider.cpp:1835 -msgid "Add custom G-code" -msgstr "Додати влаÑний G-код" - -#: src/slic3r/GUI/DoubleSlider.cpp:1853 -msgid "Edit color" -msgstr "Редагувати колір" - -#: src/slic3r/GUI/DoubleSlider.cpp:1854 -msgid "Edit pause print message" -msgstr "Редагувати Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ñ–Ð´ Ñ‡Ð°Ñ Ð¿Ð°ÑƒÐ·Ð¸ друку" - -#: src/slic3r/GUI/DoubleSlider.cpp:1855 -msgid "Edit custom G-code" -msgstr "Редагувати влаÑний G-код" - -#: src/slic3r/GUI/DoubleSlider.cpp:1861 -msgid "Delete color change" -msgstr "Видалити зміну кольору" - -#: src/slic3r/GUI/DoubleSlider.cpp:1862 -msgid "Delete tool change" -msgstr "Видалити зміну інÑтрументу" - -#: src/slic3r/GUI/DoubleSlider.cpp:1863 -msgid "Delete pause print" -msgstr "Видалити паузу друку" - -#: src/slic3r/GUI/DoubleSlider.cpp:1864 -msgid "Delete custom G-code" -msgstr "Видалити влаÑний G-код" - -#: src/slic3r/GUI/DoubleSlider.cpp:1874 src/slic3r/GUI/DoubleSlider.cpp:2015 -msgid "Jump to height" -msgstr "Перейти на виÑоту" - -#: src/slic3r/GUI/DoubleSlider.cpp:1879 -msgid "Hide ruler" -msgstr "Сховати лінійку" - -#: src/slic3r/GUI/DoubleSlider.cpp:1883 -msgid "Show object height" -msgstr "Показувати виÑоту об’єкта" - -#: src/slic3r/GUI/DoubleSlider.cpp:1883 -msgid "Show object height on the ruler" -msgstr "Показувати виÑоту об’єкта на лінійці" - -#: src/slic3r/GUI/DoubleSlider.cpp:1887 -msgid "Show estimated print time" -msgstr "Показувати приблизний Ñ‡Ð°Ñ Ð´Ñ€ÑƒÐºÑƒ" - -#: src/slic3r/GUI/DoubleSlider.cpp:1887 -msgid "Show estimated print time on the ruler" -msgstr "Показувати приблизний Ñ‡Ð°Ñ Ð´Ñ€ÑƒÐºÑƒ на лінійці" - -#: src/slic3r/GUI/DoubleSlider.cpp:1891 -msgid "Ruler mode" -msgstr "Режим лінійки" - -#: src/slic3r/GUI/DoubleSlider.cpp:1891 -msgid "Set ruler mode" -msgstr "Ð’Ñтановити режим лінійки" - -#: src/slic3r/GUI/DoubleSlider.cpp:1896 -msgid "Set extruder sequence for the entire print" -msgstr "Ð’Ñтановити поÑлідовніÑÑ‚ÑŒ екÑтрудерів Ð´Ð»Ñ Ð²Ñього друку" - -#: src/slic3r/GUI/DoubleSlider.cpp:1982 -msgid "Enter custom G-code used on current layer" -msgstr "Введіть влаÑний G-код, Ð´Ð»Ñ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ð½Ð½Ñ Ð½Ð° поточному шарі" - -#: src/slic3r/GUI/DoubleSlider.cpp:1983 -msgid "Custom G-code on current layer (%1% mm)." -msgstr "КориÑтувацький G-код на поточному шарі (%1% мм)." - -#: src/slic3r/GUI/DoubleSlider.cpp:1998 -msgid "Enter short message shown on Printer display when a print is paused" -======= #: src/slic3r/GUI/ConfigWizard.cpp:2696 msgid "Some Printers were uninstalled." ->>>>>>> master msgstr "" -"Введіть коротке повідомленнÑ, що відображатиметьÑÑ Ð½Ð° диÑплеї принтера піж " -"Ñ‡Ð°Ñ Ð¿Ð°ÑƒÐ·Ð¸ друку" - -<<<<<<< HEAD -#: src/slic3r/GUI/DoubleSlider.cpp:1999 -msgid "Message for pause print on current layer (%1% mm)." -msgstr "ÐŸÐ¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð´Ð»Ñ Ð¿Ð°ÑƒÐ·Ð¸ друку на поточному шарі (%1% мм)." - -#: src/slic3r/GUI/DoubleSlider.cpp:2014 -msgid "Enter the move you want to jump to" -msgstr "Введіть рух, до Ñкого ви хочете перейти" -#: src/slic3r/GUI/DoubleSlider.cpp:2014 -msgid "Enter the height you want to jump to" -msgstr "Введіть виÑоту, на Ñку ви хочете перейти" - -#: src/slic3r/GUI/DoubleSlider.cpp:2259 -msgid "The last color change data was saved for a single extruder printing." -======= #: src/slic3r/GUI/ConfigWizard.cpp:2717 msgid "A new filament was installed and it will be activated." ->>>>>>> master -msgstr "" -"Дані про оÑтанню зміну кольору були збережені Ð´Ð»Ñ Ð¾Ð´Ð½Ð¾-екÑтрудерного друку." - -<<<<<<< HEAD -#: src/slic3r/GUI/DoubleSlider.cpp:2260 src/slic3r/GUI/DoubleSlider.cpp:2275 -msgid "The last color change data was saved for a multi extruder printing." -msgstr "" -"Дані про оÑтанню зміну кольору були збережені Ð´Ð»Ñ Ð±Ð°Ð³Ð°Ñ‚Ð¾-екÑтрудерного друку." - -#: src/slic3r/GUI/DoubleSlider.cpp:2262 -msgid "Your current changes will delete all saved color changes." -msgstr "Ваші поточні зміни видалÑÑ‚ÑŒ уÑÑ– збережені зміни кольору." - -#: src/slic3r/GUI/DoubleSlider.cpp:2263 src/slic3r/GUI/DoubleSlider.cpp:2283 -msgid "Are you sure you want to continue?" -msgstr "Ви впевнені, що хочете продовжити?" - -#: src/slic3r/GUI/DoubleSlider.cpp:2276 -msgid "" -"Select YES if you want to delete all saved tool changes, \n" -"NO if you want all tool changes switch to color changes, \n" -"or CANCEL to leave it unchanged." -msgstr "" -"Виберіть ТÐК, Ñкщо ви хочете видалити вÑÑ– збережені зміни інÑтрументу,\n" -"ÐІ, Ñкщо ви хочете, щоб уÑÑ– зміни інÑтрументу було змінено на зміну " -"кольору,\n" -"або СКÐСУВÐТИ, щоб залишити це без змін." - -#: src/slic3r/GUI/DoubleSlider.cpp:2279 -msgid "Do you want to delete all saved tool changes?" -msgstr "Ви хочете видалити вÑÑ– збережені зміни інÑтрументу?" - -#: src/slic3r/GUI/DoubleSlider.cpp:2281 -msgid "" -"The last color change data was saved for a multi extruder printing with tool " -"changes for whole print." msgstr "" -"Дані про оÑтанню зміну кольору були збережені Ð´Ð»Ñ Ð±Ð°Ð³Ð°Ñ‚Ð¾-екÑтрудерного друку " -"зі зміною інÑтрументу Ð´Ð»Ñ Ñ†Ñ–Ð»Ð¾Ð³Ð¾ друку." -#: src/slic3r/GUI/DoubleSlider.cpp:2282 -msgid "Your current changes will delete all saved extruder (tool) changes." -======= #: src/slic3r/GUI/ConfigWizard.cpp:2718 msgid "A new SLA material was installed and it will be activated." ->>>>>>> master msgstr "" -"Ваші поточні зміни видалÑÑ‚ÑŒ уÑÑ– збережені зміни екÑтрудера (інÑтрументу)." - -#: src/slic3r/GUI/ExtraRenderers.cpp:297 src/slic3r/GUI/GUI_ObjectList.cpp:512 -#: src/slic3r/GUI/GUI_ObjectList.cpp:524 src/slic3r/GUI/GUI_ObjectList.cpp:1033 -#: src/slic3r/GUI/GUI_ObjectList.cpp:4588 -#: src/slic3r/GUI/GUI_ObjectList.cpp:4598 -#: src/slic3r/GUI/GUI_ObjectList.cpp:4633 -#: src/slic3r/GUI/ObjectDataViewModel.cpp:209 -#: src/slic3r/GUI/ObjectDataViewModel.cpp:266 -#: src/slic3r/GUI/ObjectDataViewModel.cpp:291 -#: src/slic3r/GUI/ObjectDataViewModel.cpp:499 src/libslic3r/PrintConfig.cpp:552 -msgid "default" -msgstr "за замовчаннÑм" - -#: src/slic3r/GUI/ExtruderSequenceDialog.cpp:24 -msgid "Set extruder sequence" -msgstr "Ð’Ñтановити поÑлідовніÑÑ‚ÑŒ екÑтрудерів" - -#: src/slic3r/GUI/ExtruderSequenceDialog.cpp:40 -msgid "Set extruder change for every" -msgstr "Ð’Ñтановіть зміну екÑтрудера Ð´Ð»Ñ ÐºÐ¾Ð¶Ð½Ð¸Ñ…" - -#: src/slic3r/GUI/ExtruderSequenceDialog.cpp:53 -#: src/libslic3r/PrintConfig.cpp:418 src/libslic3r/PrintConfig.cpp:1089 -#: src/libslic3r/PrintConfig.cpp:1720 src/libslic3r/PrintConfig.cpp:1885 -#: src/libslic3r/PrintConfig.cpp:1952 src/libslic3r/PrintConfig.cpp:2159 -#: src/libslic3r/PrintConfig.cpp:2205 -msgid "layers" -msgstr "шару(ів)" -#: src/slic3r/GUI/ExtruderSequenceDialog.cpp:137 -msgid "Set extruder(tool) sequence" -msgstr "Ð’Ñтановити поÑлідовніÑÑ‚ÑŒ екÑтрудерів (інÑтрументів)" - -#: src/slic3r/GUI/ExtruderSequenceDialog.cpp:183 -msgid "Remove extruder from sequence" -msgstr "Видалити екÑтрудер з поÑлідовноÑÑ‚Ñ–" - -#: src/slic3r/GUI/ExtruderSequenceDialog.cpp:193 -msgid "Add extruder to sequence" -msgstr "Додати екÑтрудер до поÑлідовноÑÑ‚Ñ–" - -<<<<<<< HEAD -#: src/slic3r/GUI/Field.cpp:197 -msgid "default value" -msgstr "Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð·Ð° замовчаннÑм" - -#: src/slic3r/GUI/Field.cpp:200 -msgid "parameter name" -msgstr "назва параметра" - -#: src/slic3r/GUI/Field.cpp:211 src/slic3r/GUI/OptionsGroup.cpp:781 -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:886 -msgid "N/A" -msgstr "Ð/Д" - -#: src/slic3r/GUI/Field.cpp:233 -#, c-format -msgid "%s doesn't support percentage" -msgstr "%s не підтримує відÑотки" - -#: src/slic3r/GUI/Field.cpp:253 src/slic3r/GUI/Field.cpp:307 -#: src/slic3r/GUI/Field.cpp:1528 src/slic3r/GUI/GUI_ObjectLayers.cpp:413 -msgid "Invalid numeric input." -msgstr "ÐедійÑне чиÑлове значеннÑ." - -#: src/slic3r/GUI/Field.cpp:264 -#, c-format -msgid "" -"Input value is out of range\n" -"Are you sure that %s is a correct value and that you want to continue?" -======= #: src/slic3r/GUI/ConfigWizard.cpp:2729 msgid "Some filaments were uninstalled." ->>>>>>> master msgstr "" -"Вхідне Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð²Ð¸Ñ…Ð¾Ð´Ð¸Ñ‚ÑŒ за межі діапазону\n" -"Ви впевнені, що %s Ñ” правильним значеннÑм Ñ– хочете продовжити?" -<<<<<<< HEAD -#: src/slic3r/GUI/Field.cpp:266 src/slic3r/GUI/Field.cpp:326 -msgid "Parameter validation" -msgstr "Перевірка параметрів" - -#: src/slic3r/GUI/Field.cpp:279 src/slic3r/GUI/Field.cpp:373 -#: src/slic3r/GUI/Field.cpp:1540 -msgid "Input value is out of range" -msgstr "Вхідне Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð²Ð¸Ñ…Ð¾Ð´Ð¸Ñ‚ÑŒ за межі діапазону" - -#: src/slic3r/GUI/Field.cpp:323 -#, c-format -msgid "" -"Do you mean %s%% instead of %s %s?\n" -"Select YES if you want to change this value to %s%%, \n" -"or NO if you are sure that %s %s is a correct value." -======= #: src/slic3r/GUI/ConfigWizard.cpp:2729 msgid "Some SLA materials were uninstalled." ->>>>>>> master msgstr "" -"Ви маєте на увазі %s%% заміÑÑ‚ÑŒ %s %s?\n" -"Виберіть ТÐК, Ñкщо ви хочете змінити це Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð½Ð° %s%%,\n" -"або ÐІ, Ñкщо ви впевнені, що %s %s Ñ” правильним значеннÑм." -<<<<<<< HEAD -#: src/slic3r/GUI/Field.cpp:381 -msgid "" -"Invalid input format. Expected vector of dimensions in the following format: " -"\"%1%\"" -======= #: src/slic3r/GUI/ConfigWizard.cpp:2773 msgid "Custom printer was installed and it will be activated." ->>>>>>> master msgstr "" -"ÐедійÑний формат введеннÑ. ОчікуєтьÑÑ Ð²ÐµÐºÑ‚Ð¾Ñ€ розмірів у наÑтупному форматі: " -"\"%1%\"" - -#: src/slic3r/GUI/FirmwareDialog.cpp:152 -msgid "Flash!" -msgstr "Прошити!" - -<<<<<<< HEAD -#: src/slic3r/GUI/FirmwareDialog.cpp:154 -msgid "Flashing in progress. Please do not disconnect the printer!" -msgstr "Триває прошивка. Будь лаÑка, не від'єднуй принтер!" - -#: src/slic3r/GUI/FirmwareDialog.cpp:201 -msgid "Flashing failed" -msgstr "Помилка прошивки" - -#: src/slic3r/GUI/FirmwareDialog.cpp:284 -msgid "Flashing succeeded!" -msgstr "Прошивка вдалаÑÑ!" - -#: src/slic3r/GUI/FirmwareDialog.cpp:285 -msgid "Flashing failed. Please see the avrdude log below." -msgstr "Помилка прошивки. Будь лаÑка, переглÑнте журнал avrdude нижче." -#: src/slic3r/GUI/FirmwareDialog.cpp:286 -msgid "Flashing cancelled." -msgstr "Прошивку ÑкаÑовано." - -#: src/slic3r/GUI/FirmwareDialog.cpp:334 -#, c-format -======= #: src/slic3r/GUI/ConfigWizard.cpp:2858 msgid "Select all standard printers" msgstr "Виберіть уÑÑ– Ñтандартні принтери" @@ -2607,36 +1221,16 @@ msgid "Desktop Integration" msgstr "" #: src/slic3r/GUI/DesktopIntegrationDialog.cpp:466 ->>>>>>> master msgid "" "Desktop Integration sets this binary to be searchable by the system.\n" "\n" "Press \"Perform\" to proceed." msgstr "" -"Цей hex-файл не відповідає моделі принтера.\n" -"Даний hex-файл призначений длÑ: %s\n" -"Повідомлено Ð´Ð»Ñ Ð¿Ñ€Ð¸Ð½Ñ‚ÐµÑ€Ñƒ: %s\n" -"\n" -"Продовжити роботу та вÑе одно прошити цей hex-файл?\n" -"Будь лаÑка, продовжуйте, тільки Ñкщо ви впевнені, що це правильно робити." -<<<<<<< HEAD -#: src/slic3r/GUI/FirmwareDialog.cpp:421 src/slic3r/GUI/FirmwareDialog.cpp:456 -#, c-format -msgid "" -"Multiple %s devices found. Please only connect one at a time for flashing." -======= #: src/slic3r/GUI/DesktopIntegrationDialog.cpp:480 msgid "Perform" ->>>>>>> master msgstr "" -"Знайдено кілька приÑтроїв %s . Будь лаÑка, підключайте лише один приÑтрій " -"Ð´Ð»Ñ Ð¿Ñ€Ð¾ÑˆÐ¸Ð²ÐºÐ¸." -<<<<<<< HEAD -#: src/slic3r/GUI/FirmwareDialog.cpp:438 -#, c-format -======= #: src/slic3r/GUI/DesktopIntegrationDialog.cpp:486 #: src/slic3r/GUI/GLCanvas3D.cpp:4689 src/slic3r/GUI/KBShortcutsDialog.cpp:97 #: src/slic3r/GUI/MainFrame.cpp:1335 @@ -2661,81 +1255,11 @@ msgstr "Перейти до руху" #: src/slic3r/GUI/DoubleSlider.cpp:1388 #, c-format, boost-format ->>>>>>> master msgid "" "Jump to height %s\n" "Set ruler mode\n" "or Set extruder sequence for the entire print" msgstr "" -<<<<<<< HEAD -"ПриÑтрій %s не знайдено.\n" -"Якщо приÑтрій підключений, натиÑніть кнопку Скинути поруч з USB-роз'ємом ..." - -#: src/slic3r/GUI/FirmwareDialog.cpp:550 -#, c-format -msgid "The %s device could not have been found" -msgstr "ПриÑтрою %s не знайдено" - -#: src/slic3r/GUI/FirmwareDialog.cpp:651 -#, c-format -msgid "Error accessing port at %s: %s" -msgstr "Помилка доÑтупу до порту на %s: %s" - -#: src/slic3r/GUI/FirmwareDialog.cpp:653 -#, c-format -msgid "Error: %s" -msgstr "Помилка: %s" - -#: src/slic3r/GUI/FirmwareDialog.cpp:782 -msgid "Firmware flasher" -msgstr "Пепепрошивка" - -#: src/slic3r/GUI/FirmwareDialog.cpp:807 -msgid "Firmware image:" -msgstr "Імідж прошивки:" - -#: src/slic3r/GUI/FirmwareDialog.cpp:810 -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:291 -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:366 -msgid "Browse" -msgstr "ПереглÑнути" - -#: src/slic3r/GUI/FirmwareDialog.cpp:812 -msgid "Serial port:" -msgstr "ПоÑлідовний порт:" - -#: src/slic3r/GUI/FirmwareDialog.cpp:814 -msgid "Autodetected" -msgstr "Ðвтоматично виÑвлено" - -#: src/slic3r/GUI/FirmwareDialog.cpp:815 -msgid "Rescan" -msgstr "ПереÑканувати" - -#: src/slic3r/GUI/FirmwareDialog.cpp:822 -msgid "Progress:" -msgstr "ПрогреÑ:" - -#: src/slic3r/GUI/FirmwareDialog.cpp:825 -msgid "Status:" -msgstr "СтатуÑ:" - -#: src/slic3r/GUI/FirmwareDialog.cpp:826 -msgid "Ready" -msgstr "Готово" - -#: src/slic3r/GUI/FirmwareDialog.cpp:846 -msgid "Advanced: Output log" -msgstr "Розширений: журнал виводу" - -#: src/slic3r/GUI/FirmwareDialog.cpp:857 -#: src/slic3r/GUI/Mouse3DController.cpp:551 -#: src/slic3r/GUI/PrintHostDialogs.cpp:200 -msgid "Close" -msgstr "Закрити" - -#: src/slic3r/GUI/FirmwareDialog.cpp:907 -======= "Перейти на виÑоту %s\n" "Ðалаштувати режим лінійки\n" "або Ðалаштувати поÑлідовніÑÑ‚ÑŒ екÑтрудерів Ð´Ð»Ñ Ð¿Ð¾Ñ‚Ð¾Ñ‡Ð½Ð¾Ð³Ð¾ Ñ‚Ñ–Ñку" @@ -2843,3093 +1367,10 @@ msgid "Note" msgstr "Примітка" #: src/slic3r/GUI/DoubleSlider.cpp:1482 ->>>>>>> master msgid "" "G-code associated to this tick mark is in a conflict with print mode.\n" "Editing it will cause changes of Slider data." msgstr "" -<<<<<<< HEAD -"Ви впевнені, що хочете ÑкаÑувати перепрошивку?\n" -"Це може привеÑти ваш принтер у непридатний Ñтан!" - -#: src/slic3r/GUI/FirmwareDialog.cpp:908 -msgid "Confirmation" -msgstr "ПідтвердженнÑ" - -#: src/slic3r/GUI/FirmwareDialog.cpp:911 -msgid "Cancelling..." -msgstr "СкаÑуваннÑ..." - -#: src/slic3r/GUI/GCodeViewer.cpp:306 -msgid "Tool position" -msgstr "ÐŸÐ¾Ð·Ð¸Ñ†Ñ–Ñ Ñ–Ð½Ñтрументу" - -#: src/slic3r/GUI/GCodeViewer.cpp:1499 src/slic3r/GUI/GCodeViewer.cpp:2035 -msgid "Generating toolpaths" -msgstr "Ð¡Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñ‚Ñ€Ð°Ñ”ÐºÑ‚Ð¾Ñ€Ñ–Ð¹" - -#: src/slic3r/GUI/GCodeViewer.cpp:1537 src/slic3r/GUI/GCodeViewer.cpp:2419 -msgid "Generating vertex buffer" -msgstr "Ð¡Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð±ÑƒÑ„ÐµÑ€Ð° вершин" - -#: src/slic3r/GUI/GCodeViewer.cpp:1814 src/slic3r/GUI/GCodeViewer.cpp:2507 -msgid "Generating index buffers" -msgstr "Ð¤Ð¾Ñ€Ð¼ÑƒÐ²Ð°Ð½Ð½Ñ Ð±ÑƒÑ„ÐµÑ€Ñ–Ð² індекÑів" - -#: src/slic3r/GUI/GCodeViewer.cpp:3874 -msgid "Click to hide" -msgstr "Клацніть, щоб Ñховати" - -#: src/slic3r/GUI/GCodeViewer.cpp:3874 -msgid "Click to show" -msgstr "Клацніть, щоб показати" - -#: src/slic3r/GUI/GCodeViewer.cpp:3986 -msgid "up to" -msgstr "аж до" - -#: src/slic3r/GUI/GCodeViewer.cpp:3992 -msgid "above" -msgstr "вище" - -#: src/slic3r/GUI/GCodeViewer.cpp:4000 -msgid "from" -msgstr "від" - -#: src/slic3r/GUI/GCodeViewer.cpp:4000 -msgid "to" -msgstr "до" - -#: src/slic3r/GUI/GCodeViewer.cpp:4028 src/slic3r/GUI/GCodeViewer.cpp:4036 -#: src/slic3r/GUI/GUI_Preview.cpp:214 src/slic3r/GUI/GUI_Preview.cpp:539 -#: src/slic3r/GUI/GUI_Preview.cpp:948 -msgid "Feature type" -msgstr "Тип ознаки" - -#: src/slic3r/GUI/GCodeViewer.cpp:4028 src/slic3r/GUI/GCodeViewer.cpp:4036 -#: src/slic3r/GUI/RammingChart.cpp:76 -msgid "Time" -msgstr "ЧаÑ" - -#: src/slic3r/GUI/GCodeViewer.cpp:4036 -msgid "Percentage" -msgstr "Процент" - -#: src/slic3r/GUI/GCodeViewer.cpp:4039 -msgid "Height (mm)" -msgstr "ВиÑота (мм)" - -#: src/slic3r/GUI/GCodeViewer.cpp:4040 -msgid "Width (mm)" -msgstr "Ширина (мм)" - -#: src/slic3r/GUI/GCodeViewer.cpp:4041 -msgid "Speed (mm/s)" -msgstr "ШвидкіÑÑ‚ÑŒ (мм/Ñ)" - -#: src/slic3r/GUI/GCodeViewer.cpp:4042 -msgid "Fan Speed (%)" -msgstr "ШвидкіÑÑ‚ÑŒ вентилÑтора (%)" - -#: src/slic3r/GUI/GCodeViewer.cpp:4043 -msgid "Volumetric flow rate (mm³/s)" -msgstr "Об'ємна швидкіÑÑ‚ÑŒ потоку (мм³/Ñ)" - -#: src/slic3r/GUI/GCodeViewer.cpp:4044 src/slic3r/GUI/GUI_Preview.cpp:220 -#: src/slic3r/GUI/GUI_Preview.cpp:326 src/slic3r/GUI/GUI_Preview.cpp:477 -#: src/slic3r/GUI/GUI_Preview.cpp:538 src/slic3r/GUI/GUI_Preview.cpp:884 -#: src/slic3r/GUI/GUI_Preview.cpp:948 -msgid "Tool" -msgstr "ІнÑтрумент" - -#: src/slic3r/GUI/GCodeViewer.cpp:4045 src/slic3r/GUI/GUI_Preview.cpp:221 -#: src/slic3r/GUI/GUI_Preview.cpp:536 src/slic3r/GUI/GUI_Preview.cpp:947 -msgid "Color Print" -msgstr "Кольоровий друк" - -#: src/slic3r/GUI/GCodeViewer.cpp:4082 src/slic3r/GUI/GCodeViewer.cpp:4117 -#: src/slic3r/GUI/GCodeViewer.cpp:4122 src/slic3r/GUI/GUI_ObjectList.cpp:312 -#: src/slic3r/GUI/wxExtensions.cpp:519 src/libslic3r/PrintConfig.cpp:547 -msgid "Extruder" -msgstr "ЕкÑтрудер" - -#: src/slic3r/GUI/GCodeViewer.cpp:4093 -msgid "Default color" -msgstr "Колір за замовчуваннÑм" - -#: src/slic3r/GUI/GCodeViewer.cpp:4117 -msgid "default color" -msgstr "колір за замовчуваннÑм" - -#: src/slic3r/GUI/GCodeViewer.cpp:4212 src/slic3r/GUI/GCodeViewer.cpp:4258 -msgid "Color change" -msgstr "Зміна кольору" - -#: src/slic3r/GUI/GCodeViewer.cpp:4231 src/slic3r/GUI/GCodeViewer.cpp:4256 -msgid "Print" -msgstr "Друк" - -#: src/slic3r/GUI/GCodeViewer.cpp:4257 src/slic3r/GUI/GCodeViewer.cpp:4274 -msgid "Pause" -msgstr "Пауза" - -#: src/slic3r/GUI/GCodeViewer.cpp:4262 src/slic3r/GUI/GCodeViewer.cpp:4265 -msgid "Event" -msgstr "ПодіÑ" - -#: src/slic3r/GUI/GCodeViewer.cpp:4262 src/slic3r/GUI/GCodeViewer.cpp:4265 -msgid "Remaining time" -msgstr "ЧаÑ, що залишивÑÑ" - -#: src/slic3r/GUI/GCodeViewer.cpp:4265 -msgid "Duration" -msgstr "ТриваліÑÑ‚ÑŒ" - -#: src/slic3r/GUI/GCodeViewer.cpp:4300 src/slic3r/GUI/GUI_Preview.cpp:1029 -#: src/libslic3r/PrintConfig.cpp:2382 -msgid "Travel" -msgstr "ПереÑуваннÑ" - -#: src/slic3r/GUI/GCodeViewer.cpp:4303 -msgid "Movement" -msgstr "ПереміщеннÑ" - -#: src/slic3r/GUI/GCodeViewer.cpp:4304 -msgid "Extrusion" -msgstr "ЕкÑтрузіÑ" - -#: src/slic3r/GUI/GCodeViewer.cpp:4305 src/slic3r/GUI/Tab.cpp:1701 -#: src/slic3r/GUI/Tab.cpp:2589 -msgid "Retraction" -msgstr "ПерериваннÑ" - -#: src/slic3r/GUI/GCodeViewer.cpp:4322 src/slic3r/GUI/GCodeViewer.cpp:4325 -#: src/slic3r/GUI/GUI_Preview.cpp:1030 -msgid "Wipe" -msgstr "ВитираннÑ" - -#: src/slic3r/GUI/GCodeViewer.cpp:4356 src/slic3r/GUI/GUI_Preview.cpp:248 -#: src/slic3r/GUI/GUI_Preview.cpp:262 -msgid "Options" -msgstr "Параметри" - -#: src/slic3r/GUI/GCodeViewer.cpp:4359 src/slic3r/GUI/GUI_Preview.cpp:1031 -msgid "Retractions" -msgstr "ПерериваннÑ" - -#: src/slic3r/GUI/GCodeViewer.cpp:4360 src/slic3r/GUI/GUI_Preview.cpp:1032 -msgid "Deretractions" -msgstr "ЗниженнÑ" - -#: src/slic3r/GUI/GCodeViewer.cpp:4361 src/slic3r/GUI/GUI_Preview.cpp:1033 -msgid "Tool changes" -msgstr "Зміна інÑтрументу" - -#: src/slic3r/GUI/GCodeViewer.cpp:4362 src/slic3r/GUI/GUI_Preview.cpp:1034 -msgid "Color changes" -msgstr "Зміни кольору" - -#: src/slic3r/GUI/GCodeViewer.cpp:4363 src/slic3r/GUI/GUI_Preview.cpp:1035 -msgid "Print pauses" -msgstr "Паузи друку" - -#: src/slic3r/GUI/GCodeViewer.cpp:4364 src/slic3r/GUI/GUI_Preview.cpp:1036 -msgid "Custom G-codes" -msgstr "КориÑтувацькі G-коди" - -#: src/slic3r/GUI/GCodeViewer.cpp:4375 src/slic3r/GUI/GCodeViewer.cpp:4399 -#: src/slic3r/GUI/GUI.cpp:354 src/slic3r/GUI/Plater.cpp:698 -#: src/libslic3r/PrintConfig.cpp:117 -msgid "Printer" -msgstr "Принтер" - -#: src/slic3r/GUI/GCodeViewer.cpp:4377 src/slic3r/GUI/GCodeViewer.cpp:4404 -#: src/slic3r/GUI/GUI.cpp:350 src/slic3r/GUI/Plater.cpp:694 -msgid "Print settings" -msgstr "Параметри друку" - -#: src/slic3r/GUI/GCodeViewer.cpp:4380 src/slic3r/GUI/GCodeViewer.cpp:4410 -#: src/slic3r/GUI/GUI.cpp:352 src/slic3r/GUI/Plater.cpp:695 -#: src/slic3r/GUI/Tab.cpp:1801 src/slic3r/GUI/Tab.cpp:1802 -msgid "Filament" -msgstr "Філамент" - -#: src/slic3r/GUI/GCodeViewer.cpp:4435 src/slic3r/GUI/GCodeViewer.cpp:4440 -#: src/slic3r/GUI/Plater.cpp:243 src/slic3r/GUI/Plater.cpp:1136 -#: src/slic3r/GUI/Plater.cpp:1221 -msgid "Estimated printing time" -msgstr "Приблизний Ñ‡Ð°Ñ Ð´Ñ€ÑƒÐºÑƒ" - -#: src/slic3r/GUI/GCodeViewer.cpp:4435 -msgid "Normal mode" -msgstr "Ðормальний режим" - -#: src/slic3r/GUI/GCodeViewer.cpp:4440 -msgid "Stealth mode" -msgstr "Тихий режим" - -#: src/slic3r/GUI/GCodeViewer.cpp:4468 -msgid "Show stealth mode" -msgstr "Показати тихий режим" - -#: src/slic3r/GUI/GCodeViewer.cpp:4472 -msgid "Show normal mode" -msgstr "Показати нормальний режим" - -#: src/slic3r/GUI/GLCanvas3D.cpp:236 src/slic3r/GUI/GLCanvas3D.cpp:4619 -msgid "Variable layer height" -msgstr "Змінна виÑота шарів" - -#: src/slic3r/GUI/GLCanvas3D.cpp:238 -msgid "Left mouse button:" -msgstr "Ліва кнопка миші:" - -#: src/slic3r/GUI/GLCanvas3D.cpp:240 -msgid "Add detail" -msgstr "Додати деталь" - -#: src/slic3r/GUI/GLCanvas3D.cpp:242 -msgid "Right mouse button:" -msgstr "Права кнопка миші:" - -#: src/slic3r/GUI/GLCanvas3D.cpp:244 -msgid "Remove detail" -msgstr "Видалити деталь" - -#: src/slic3r/GUI/GLCanvas3D.cpp:246 -msgid "Shift + Left mouse button:" -msgstr "Shift + Ліва кнопка миші:" - -#: src/slic3r/GUI/GLCanvas3D.cpp:248 -msgid "Reset to base" -msgstr "Скинути до базової виÑоти шару" - -#: src/slic3r/GUI/GLCanvas3D.cpp:250 -msgid "Shift + Right mouse button:" -msgstr "Shift + Права кнопка миші:" - -#: src/slic3r/GUI/GLCanvas3D.cpp:252 -msgid "Smoothing" -msgstr "ЗгладжуваннÑ" - -#: src/slic3r/GUI/GLCanvas3D.cpp:254 -msgid "Mouse wheel:" -msgstr "КолеÑо миші:" - -#: src/slic3r/GUI/GLCanvas3D.cpp:256 -msgid "Increase/decrease edit area" -msgstr "Збільшити/зменшити облаÑÑ‚Ñ– редагуваннÑ" - -#: src/slic3r/GUI/GLCanvas3D.cpp:259 -msgid "Adaptive" -msgstr "Ðдаптивний" - -#: src/slic3r/GUI/GLCanvas3D.cpp:265 -msgid "Quality / Speed" -msgstr "ЯкіÑÑ‚ÑŒ / ШвидкіÑÑ‚ÑŒ" - -#: src/slic3r/GUI/GLCanvas3D.cpp:268 -msgid "Higher print quality versus higher print speed." -msgstr "Вища ÑкіÑÑ‚ÑŒ друку порівнÑно з вищою швидкіÑÑ‚ÑŽ друку." - -#: src/slic3r/GUI/GLCanvas3D.cpp:279 -msgid "Smooth" -msgstr "Згладити" - -#: src/slic3r/GUI/GLCanvas3D.cpp:285 src/libslic3r/PrintConfig.cpp:571 -msgid "Radius" -msgstr "РадіуÑ" - -#: src/slic3r/GUI/GLCanvas3D.cpp:295 -msgid "Keep min" -msgstr "Залишити мін" - -#: src/slic3r/GUI/GLCanvas3D.cpp:304 src/slic3r/GUI/GLCanvas3D.cpp:4055 -msgid "Reset" -msgstr "Скинути" - -#: src/slic3r/GUI/GLCanvas3D.cpp:566 -msgid "Variable layer height - Manual edit" -msgstr "Змінна виÑота шарів - Ручне редагуваннÑ" - -#: src/slic3r/GUI/GLCanvas3D.cpp:634 -msgid "An object outside the print area was detected." -msgstr "ВиÑвлено об'єкт за межами облаÑÑ‚Ñ– друку." - -#: src/slic3r/GUI/GLCanvas3D.cpp:635 -msgid "A toolpath outside the print area was detected." -msgstr "ВиÑвлено траєкторію за межами облаÑÑ‚Ñ– друку." - -#: src/slic3r/GUI/GLCanvas3D.cpp:636 -msgid "SLA supports outside the print area were detected." -msgstr "ВиÑвлено SLA-підтримки за межами облаÑÑ‚Ñ– друку." - -#: src/slic3r/GUI/GLCanvas3D.cpp:637 -msgid "Some objects are not visible." -msgstr "ДеÑкі об'єкти не видно." - -#: src/slic3r/GUI/GLCanvas3D.cpp:639 -msgid "" -"An object outside the print area was detected.\n" -"Resolve the current problem to continue slicing." -msgstr "" -"ВиÑвлено об’єкт за межами облаÑÑ‚Ñ– друку.\n" -"Вирішіть поточну проблему, щоб продовжувати нарізаннÑ." - -#: src/slic3r/GUI/GLCanvas3D.cpp:949 -msgid "Seq." -msgstr "ПоÑлід." - -#: src/slic3r/GUI/GLCanvas3D.cpp:1455 -msgid "Variable layer height - Reset" -msgstr "Змінна виÑота шарів - СкаÑувати" - -#: src/slic3r/GUI/GLCanvas3D.cpp:1463 -msgid "Variable layer height - Adaptive" -msgstr "Змінна виÑота шарів - Ðдаптивний" - -#: src/slic3r/GUI/GLCanvas3D.cpp:1471 -msgid "Variable layer height - Smooth all" -msgstr "Змінна виÑота шарів - Згладити вÑе" - -#: src/slic3r/GUI/GLCanvas3D.cpp:1876 -msgid "Mirror Object" -msgstr "Віддзеркалити об'єкт" - -#: src/slic3r/GUI/GLCanvas3D.cpp:2746 -#: src/slic3r/GUI/Gizmos/GLGizmosManager.cpp:520 -msgid "Gizmo-Move" -msgstr "Gizmo переміщеннÑ" - -#: src/slic3r/GUI/GLCanvas3D.cpp:2832 -#: src/slic3r/GUI/Gizmos/GLGizmosManager.cpp:522 -msgid "Gizmo-Rotate" -msgstr "Gizmo обертаннÑ" - -#: src/slic3r/GUI/GLCanvas3D.cpp:3389 -msgid "Move Object" -msgstr "ПереміÑтити об'єкт" - -#: src/slic3r/GUI/GLCanvas3D.cpp:3859 src/slic3r/GUI/GLCanvas3D.cpp:4580 -msgid "Switch to Settings" -msgstr "Перейдіть до налаштувань" - -#: src/slic3r/GUI/GLCanvas3D.cpp:3860 src/slic3r/GUI/GLCanvas3D.cpp:4580 -msgid "Print Settings Tab" -msgstr "Вкладка параметрів друку" - -#: src/slic3r/GUI/GLCanvas3D.cpp:3861 src/slic3r/GUI/GLCanvas3D.cpp:4581 -msgid "Filament Settings Tab" -msgstr "Вкладка параметрів філаменту" - -#: src/slic3r/GUI/GLCanvas3D.cpp:3861 src/slic3r/GUI/GLCanvas3D.cpp:4581 -msgid "Material Settings Tab" -msgstr "Вкладка параметрів матеріалу" - -#: src/slic3r/GUI/GLCanvas3D.cpp:3862 src/slic3r/GUI/GLCanvas3D.cpp:4582 -msgid "Printer Settings Tab" -msgstr "Вкладка параметрів принтеру" - -#: src/slic3r/GUI/GLCanvas3D.cpp:3914 -msgid "Undo History" -msgstr "СкаÑувати Ñ–Ñторію" - -#: src/slic3r/GUI/GLCanvas3D.cpp:3914 -msgid "Redo History" -msgstr "Повторити Ñ–Ñторію" - -#: src/slic3r/GUI/GLCanvas3D.cpp:3935 -#, c-format -msgid "Undo %1$d Action" -msgid_plural "Undo %1$d Actions" -msgstr[0] "СкаÑувати %1$d дію" -msgstr[1] "СкаÑувати %1$d дії" -msgstr[2] "СкаÑувати %1$d дій" - -#: src/slic3r/GUI/GLCanvas3D.cpp:3935 -#, c-format -msgid "Redo %1$d Action" -msgid_plural "Redo %1$d Actions" -msgstr[0] "Повторити %1$d дію" -msgstr[1] "Повторити %1$d дії" -msgstr[2] "Повторити %1$d дій" - -#: src/slic3r/GUI/GLCanvas3D.cpp:3955 src/slic3r/GUI/GLCanvas3D.cpp:4598 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:98 src/slic3r/GUI/Search.cpp:348 -msgid "Search" -msgstr "Пошук" - -#: src/slic3r/GUI/GLCanvas3D.cpp:3969 src/slic3r/GUI/GLCanvas3D.cpp:3977 -#: src/slic3r/GUI/Search.cpp:355 -msgid "Enter a search term" -msgstr "Введіть пошуковий термін" - -#: src/slic3r/GUI/GLCanvas3D.cpp:4008 -msgid "Arrange options" -msgstr "Параметри розташуваннÑ" - -#: src/slic3r/GUI/GLCanvas3D.cpp:4038 -msgid "Press %1%left mouse button to enter the exact value" -msgstr "ÐатиÑніть %1%ліву кнопку миші, щоб ввеÑти точне значеннÑ" - -#: src/slic3r/GUI/GLCanvas3D.cpp:4040 -msgid "Spacing" -msgstr "ВідÑтань" - -#: src/slic3r/GUI/GLCanvas3D.cpp:4047 -msgid "Enable rotations (slow)" -msgstr "Увімкнути Ð¾Ð±ÐµÑ€Ñ‚Ð°Ð½Ð½Ñ (повільно)" - -#: src/slic3r/GUI/GLCanvas3D.cpp:4065 src/slic3r/GUI/GLCanvas3D.cpp:4490 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:120 src/slic3r/GUI/Plater.cpp:1649 -msgid "Arrange" -msgstr "Розташувати" - -#: src/slic3r/GUI/GLCanvas3D.cpp:4464 -msgid "Add..." -msgstr "Додати..." - -#: src/slic3r/GUI/GLCanvas3D.cpp:4472 src/slic3r/GUI/GUI_ObjectList.cpp:1882 -#: src/slic3r/GUI/Plater.cpp:4015 src/slic3r/GUI/Plater.cpp:4039 -#: src/slic3r/GUI/Tab.cpp:3491 -msgid "Delete" -msgstr "Видалити" - -#: src/slic3r/GUI/GLCanvas3D.cpp:4481 src/slic3r/GUI/KBShortcutsDialog.cpp:88 -#: src/slic3r/GUI/Plater.cpp:5128 -msgid "Delete all" -msgstr "Видалити вÑе" - -#: src/slic3r/GUI/GLCanvas3D.cpp:4490 src/slic3r/GUI/KBShortcutsDialog.cpp:121 -msgid "Arrange selection" -msgstr "Розташувати вибране" - -#: src/slic3r/GUI/GLCanvas3D.cpp:4490 -msgid "Click right mouse button to show arrangement options" -msgstr "Клацніть правою кнопкою миші, щоб показати параметри розташуваннÑ" - -#: src/slic3r/GUI/GLCanvas3D.cpp:4512 -msgid "Copy" -msgstr "Копіювати" - -#: src/slic3r/GUI/GLCanvas3D.cpp:4521 -msgid "Paste" -msgstr "Ð’Ñтавити" - -#: src/slic3r/GUI/GLCanvas3D.cpp:4533 src/slic3r/GUI/Plater.cpp:3874 -#: src/slic3r/GUI/Plater.cpp:3886 src/slic3r/GUI/Plater.cpp:4024 -msgid "Add instance" -msgstr "Додати екземплÑÑ€" - -#: src/slic3r/GUI/GLCanvas3D.cpp:4544 src/slic3r/GUI/Plater.cpp:4026 -msgid "Remove instance" -msgstr "Видалити екземплÑÑ€" - -#: src/slic3r/GUI/GLCanvas3D.cpp:4557 -msgid "Split to objects" -msgstr "Розділити на об'єкти" - -#: src/slic3r/GUI/GLCanvas3D.cpp:4567 src/slic3r/GUI/GUI_ObjectList.cpp:1654 -msgid "Split to parts" -msgstr "Розділити на чаÑтини" - -#: src/slic3r/GUI/GLCanvas3D.cpp:4669 src/slic3r/GUI/KBShortcutsDialog.cpp:89 -#: src/slic3r/GUI/MainFrame.cpp:1125 -msgid "Undo" -msgstr "СкаÑувати" - -#: src/slic3r/GUI/GLCanvas3D.cpp:4669 src/slic3r/GUI/GLCanvas3D.cpp:4708 -msgid "Click right mouse button to open/close History" -msgstr "Клацніть правою кнопкою миші, щоб відкрити/закрити Ñ–Ñторію" - -#: src/slic3r/GUI/GLCanvas3D.cpp:4692 -msgid "Next Undo action: %1%" -msgstr "СкаÑувати дію: %1%" - -#: src/slic3r/GUI/GLCanvas3D.cpp:4708 src/slic3r/GUI/KBShortcutsDialog.cpp:90 -#: src/slic3r/GUI/MainFrame.cpp:1128 -msgid "Redo" -msgstr "Повторити" - -#: src/slic3r/GUI/GLCanvas3D.cpp:4730 -msgid "Next Redo action: %1%" -msgstr "Повторити дію: %1%" - -#: src/slic3r/GUI/GLCanvas3D.cpp:6354 -msgid "Selection-Add from rectangle" -msgstr "Ð’Ð¸Ð´Ñ–Ð»ÐµÐ½Ð½Ñ - Додано прÑмокутником" - -#: src/slic3r/GUI/GLCanvas3D.cpp:6373 -msgid "Selection-Remove from rectangle" -msgstr "Ð’Ð¸Ð´Ñ–Ð»ÐµÐ½Ð½Ñ - Видалено прÑмокутником" - -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:54 -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:151 src/libslic3r/PrintConfig.cpp:3694 -msgid "Cut" -msgstr "Розрізати" - -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:179 -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:341 -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:418 -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:486 -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:487 -msgid "in" -msgstr "дюйм" - -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:185 -msgid "Keep upper part" -msgstr "Залишити верхню чаÑтину" - -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:186 -msgid "Keep lower part" -msgstr "Залишити нижню чаÑтину" - -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:187 -msgid "Rotate lower part upwards" -msgstr "Повернути нижню чаÑтину вгору" - -#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:192 -msgid "Perform cut" -msgstr "Виконати розріз" - -#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:33 -msgid "Paint-on supports" -msgstr "ÐœÐ°Ð»ÑŽÐ²Ð°Ð½Ð½Ñ Ð¿Ñ–Ð´Ñ‚Ñ€Ð¸Ð¼Ð¾Ðº" - -#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:42 -#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:49 -#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:25 -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:57 -msgid "Clipping of view" -msgstr "ВідÑÑ–ÐºÐ°Ð½Ð½Ñ Ð¿Ð»Ð¾Ñ‰Ð¸Ð½Ð¾ÑŽ" - -#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:43 -#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:50 -#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:26 -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:58 -msgid "Reset direction" -msgstr "Скинути напрÑмок" - -#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:44 -#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:27 -msgid "Brush size" -msgstr "Розмір пензлÑ" - -#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:45 -#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:28 -msgid "Brush shape" -msgstr "Форма пензлÑ" - -#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:46 -#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:29 -msgid "Left mouse button" -msgstr "Ліва кнопка миші" - -#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:47 -msgid "Enforce supports" -msgstr "Забезпечити підтримки" - -#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:48 -#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:31 -msgid "Right mouse button" -msgstr "Права кнопка миші" - -#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:49 -#: src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp:373 -msgid "Block supports" -msgstr "Блокувати підтрики" - -#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:50 -#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:33 -msgid "Shift + Left mouse button" -msgstr "Shift + Ліва кнопка миші" - -#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:51 -#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:34 -#: src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp:368 -#: src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp:378 -msgid "Remove selection" -msgstr "Видалити виділене" - -#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:52 -#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:35 -msgid "Remove all selection" -msgstr "Видалити вÑе, що виділено" - -#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:53 -#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:36 -msgid "Circle" -msgstr "Коло" - -#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:54 -#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:37 -#: src/slic3r/GUI/GUI_ObjectList.cpp:1599 -msgid "Sphere" -msgstr "Сфера" - -#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:129 -msgid "Autoset by angle" -msgstr "Ðвтоматичне вÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð¿Ñ–Ð´ кутом" - -#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:136 -#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:118 -msgid "Reset selection" -msgstr "Скинути вибір" - -#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:160 -#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:141 -msgid "Alt + Mouse wheel" -msgstr "Alt + КолеÑо миші" - -#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:178 -#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:159 -msgid "Paints all facets inside, regardless of their orientation." -msgstr "Малює вÑÑ– грані вÑередині, незалежно від Ñ—Ñ… орієнтації." - -#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:192 -#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:173 -msgid "Ignores facets facing away from the camera." -msgstr "Ігнорує грані, відвернуті від камери." - -#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:225 -#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:203 -msgid "Ctrl + Mouse wheel" -msgstr "Ctrl + КолеÑо миші" - -#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:233 -msgid "Autoset custom supports" -msgstr "Ðвтоматичне вÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð²Ð»Ð°Ñних підтримок" - -#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:235 -msgid "Threshold:" -msgstr "Порог навиÑаннÑ:" - -#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:242 -msgid "Enforce" -msgstr "Забезпечити" - -#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:245 -msgid "Block" -msgstr "Блокувати" - -#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:295 -msgid "Block supports by angle" -msgstr "Блокувати підтрики під кутом" - -#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:296 -msgid "Add supports by angle" -msgstr "Додати підтримки під кутом" - -#: src/slic3r/GUI/Gizmos/GLGizmoFlatten.cpp:40 -msgid "Place on face" -msgstr "Поверхнею на Ñтіл" - -#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:40 -msgid "Hollow this object" -msgstr "Випорожнити цей об'єкт" - -#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:41 -msgid "Preview hollowed and drilled model" -msgstr "Попередній переглÑд порожниÑтої та проÑвердленої моделі" - -#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:42 -msgid "Offset" -msgstr "ЗміщеннÑ" - -#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:43 -#: src/slic3r/GUI/Jobs/SLAImportJob.cpp:56 -msgid "Quality" -msgstr "ЯкіÑÑ‚ÑŒ" - -#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:44 -#: src/libslic3r/PrintConfig.cpp:3185 -msgid "Closing distance" -msgstr "ВідÑтань закриттÑ" - -#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:45 -msgid "Hole diameter" -msgstr "Діаметр отвору" - -#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:46 -msgid "Hole depth" -msgstr "Глибина отвору" - -#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:47 -msgid "Remove selected holes" -msgstr "Видалити вибрані отвори" - -#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:48 -msgid "Remove all holes" -msgstr "Видалити вÑÑ– отвори" - -#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:51 -msgid "Show supports" -msgstr "Показувати підтримки" - -#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:308 -msgid "Add drainage hole" -msgstr "Додати дренажний отвір" - -#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:424 -msgid "Delete drainage hole" -msgstr "Видалити дренажний отвір" - -#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:624 -msgid "Hollowing parameter change" -msgstr "Зміна параметру порожниÑтоÑÑ‚Ñ–" - -#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:693 -msgid "Change drainage hole diameter" -msgstr "Змініть діаметр дренажного отвору" - -#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:785 -msgid "Hollow and drill" -msgstr "ПорожниÑÑ‚Ñ–ÑÑ‚ÑŒ та ÑвердліннÑ" - -#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:835 -msgid "Move drainage hole" -msgstr "ПереміÑтити дренажний отвір" - -#: src/slic3r/GUI/Gizmos/GLGizmoMove.cpp:64 -msgid "Move" -msgstr "ПереÑунути" - -#: src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp:461 -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:527 -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:546 -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:562 -#: src/libslic3r/PrintConfig.cpp:3743 -msgid "Rotate" -msgstr "Обертати" - -#: src/slic3r/GUI/Gizmos/GLGizmoScale.cpp:78 -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:238 -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:547 -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:563 -#: src/libslic3r/PrintConfig.cpp:3758 -msgid "Scale" -msgstr "МаÑштаб" - -#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:30 -#: src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp:381 -msgid "Enforce seam" -msgstr "Забезпечити шов" - -#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:32 -#: src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp:383 -msgid "Block seam" -msgstr "Блокувати шов" - -#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:46 -msgid "Seam painting" -msgstr "ÐœÐ°Ð»ÑŽÐ²Ð°Ð½Ð½Ñ ÑˆÐ²Ð°" - -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:47 -msgid "Head diameter" -msgstr "Діаметр головки" - -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:48 -msgid "Lock supports under new islands" -msgstr "ЗафікÑувати підтримки під новими оÑтровами" - -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:49 -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1218 -msgid "Remove selected points" -msgstr "Видалити вибрані точки" - -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:50 -msgid "Remove all points" -msgstr "Видалити вÑÑ– точки" - -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:51 -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1221 -msgid "Apply changes" -msgstr "ЗаÑтоÑувати зміни" - -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:52 -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1222 -msgid "Discard changes" -msgstr "Відхилити зміни" - -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:53 -msgid "Minimal points distance" -msgstr "Мінімальна відÑтань точок" - -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:54 -#: src/libslic3r/PrintConfig.cpp:3015 -msgid "Support points density" -msgstr "ЩільніÑÑ‚ÑŒ точок підтримки" - -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:55 -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1224 -msgid "Auto-generate points" -msgstr "Генерувати точки автоматично" - -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:56 -msgid "Manual editing" -msgstr "Ручне редагуваннÑ" - -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:374 -msgid "Add support point" -msgstr "Додати точку підтримки" - -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:514 -msgid "Delete support point" -msgstr "Видалити точку підтримки" - -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:694 -msgid "Change point head diameter" -msgstr "Змінити діаметр головки" - -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:762 -msgid "Support parameter change" -msgstr "Зміна параметрів підтримки" - -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:869 -msgid "SLA Support Points" -msgstr "Точки SLA-підтримки" - -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:897 -msgid "SLA gizmo turned on" -msgstr "Ввімкнути SLA гізмо" - -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:911 -msgid "Do you want to save your manually edited support points?" -msgstr "Ви хочете зберегти відредаговані вручну точки підтримки?" - -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:912 -msgid "Save changes?" -msgstr "Зберегти зміни?" - -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:924 -msgid "SLA gizmo turned off" -msgstr "Вимкнути SLA гізмо" - -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:955 -msgid "Move support point" -msgstr "ПереміÑтити точку підтримки" - -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1048 -msgid "Support points edit" -msgstr "Ð ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ð½Ð½Ñ Ñ‚Ð¾Ñ‡Ð¾Ðº підтримки" - -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1127 -msgid "Autogeneration will erase all manually edited points." -msgstr "ÐÐ²Ñ‚Ð¾Ð³ÐµÐ½ÐµÑ€Ð°Ñ†Ñ–Ñ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚ÑŒ вÑÑ– відредаговані вручну точки." - -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1128 -msgid "Are you sure you want to do it?" -msgstr "Ви впевнені, що хочете це зробити?" - -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1129 src/slic3r/GUI/GUI.cpp:258 -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:621 -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:645 -#: src/slic3r/GUI/WipeTowerDialog.cpp:45 src/slic3r/GUI/WipeTowerDialog.cpp:366 -msgid "Warning" -msgstr "ЗаÑтереженнÑ" - -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1134 -msgid "Autogenerate support points" -msgstr "Ðвтогенерувати точки підтримки" - -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1181 -msgid "SLA gizmo keyboard shortcuts" -msgstr "Комбінації клавіш Ð´Ð»Ñ SLA гізма" - -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1192 -msgid "Note: some shortcuts work in (non)editing mode only." -msgstr "Примітка: деÑкі ÑÐºÐ¾Ñ€Ð¾Ñ‡ÐµÐ½Ð½Ñ Ð¿Ñ€Ð°Ñ†ÑŽÑŽÑ‚ÑŒ лише в режимі (не)редагуваннÑ." - -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1210 -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1213 -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1214 -msgid "Left click" -msgstr "Ліва кнопка миші" - -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1210 -msgid "Add point" -msgstr "Додати точку" - -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1211 -msgid "Right click" -msgstr "Клік на праву кнопку миші" - -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1211 -msgid "Remove point" -msgstr "Видалити точку" - -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1212 -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1215 -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1216 -msgid "Drag" -msgstr "ПеретÑгуваннÑ" - -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1212 -msgid "Move point" -msgstr "ПереміÑтити точку" - -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1213 -msgid "Add point to selection" -msgstr "Додати точку до виділеннÑ" - -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1214 -msgid "Remove point from selection" -msgstr "Видалити точку з виділеннÑ" - -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1215 -msgid "Select by rectangle" -msgstr "Ð’Ð¸Ð´Ñ–Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ñмокутником" - -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1216 -msgid "Deselect by rectangle" -msgstr "СкаÑÑƒÐ²Ð°Ð½Ð½Ñ Ð²Ð¸Ð±Ð¾Ñ€Ñƒ прÑмокутником" - -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1217 -msgid "Select all points" -msgstr "Виділити уÑÑ– точки" - -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1219 -msgid "Mouse wheel" -msgstr "КолеÑо миші" - -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1219 -msgid "Move clipping plane" -msgstr "ПереміÑтити площину відÑіканнÑ" - -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1220 -msgid "Reset clipping plane" -msgstr "Скинути площину відÑіканнÑ" - -#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1223 -msgid "Switch to editing mode" -msgstr "Перейти в режим редагуваннÑ" - -#: src/slic3r/GUI/Gizmos/GLGizmosManager.cpp:521 -msgid "Gizmo-Scale" -msgstr "Gizmo маÑштабуваннÑ" - -#: src/slic3r/GUI/Gizmos/GLGizmosManager.cpp:630 -msgid "Gizmo-Place on Face" -msgstr "Gizmo \"Поверхнею на Ñтіл\"" - -#: src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp:39 -msgid "Entering Paint-on supports" -msgstr "Увійти до режиму Ð¼Ð°Ð»ÑŽÐ²Ð°Ð½Ð½Ñ Ð¿Ñ–Ð´Ñ‚Ñ€Ð¸Ð¼Ð¾Ðº" - -#: src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp:40 -msgid "Entering Seam painting" -msgstr "Увійти до режиму Ð¼Ð°Ð»ÑŽÐ²Ð°Ð½Ð½Ñ ÑˆÐ²Ñƒ" - -#: src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp:47 -msgid "Leaving Seam painting" -msgstr "Вийти з режиму Ð¼Ð°Ð»ÑŽÐ²Ð°Ð½Ð½Ñ ÑˆÐ²Ñƒ" - -#: src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp:48 -msgid "Leaving Paint-on supports" -msgstr "Вийти з режиму Ð¼Ð°Ð»ÑŽÐ²Ð°Ð½Ð½Ñ Ð¿Ñ–Ð´Ñ‚Ñ€Ð¸Ð¼Ð¾Ðº" - -#: src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp:371 -msgid "Add supports" -msgstr "Додати підтримки" - -#: src/slic3r/GUI/GUI.cpp:305 -msgid "Undefined" -msgstr "Ðевизначено" - -#: src/slic3r/GUI/GUI.cpp:330 -msgid "%1% was substituted with %2%" -msgstr "%1% було замінено на %2%" - -#: src/slic3r/GUI/GUI.cpp:339 -msgid "" -"Most likely the configuration was produced by a newer version of PrusaSlicer " -"or by some PrusaSlicer fork." -msgstr "" -"Швидше за вÑе, ÐºÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ Ð±ÑƒÐ»Ð° виготовлена новішою верÑією PrusaSlicer або " -"деÑким форкем PrusaSlicer." - -#: src/slic3r/GUI/GUI.cpp:340 -msgid "The following values were substituted:" -msgstr "Замінено такі значеннÑ:" - -#: src/slic3r/GUI/GUI.cpp:341 -msgid "Review the substitutions and adjust them if needed." -msgstr "ПереглÑньте заміни та за потреби відрегулюйте Ñ—Ñ…." - -#: src/slic3r/GUI/GUI.cpp:351 src/slic3r/GUI/Plater.cpp:696 -msgid "SLA print settings" -msgstr "Параметри SLA-друку" - -#: src/slic3r/GUI/GUI.cpp:355 src/slic3r/GUI/PhysicalPrinterDialog.cpp:156 -msgid "Physical Printer" -msgstr "Фізичний принтер" - -#: src/slic3r/GUI/GUI.cpp:368 -msgid "" -"Configuration bundle was loaded, however some configuration values were not " -"recognized." -msgstr "" -"Пакет конфігурації завантажено, проте деÑкі Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ ÐºÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ— не " -"розпізнано." - -#: src/slic3r/GUI/GUI.cpp:378 -msgid "" -"Configuration file \"%1%\" was loaded, however some configuration values " -"were not recognized." -msgstr "" -"Файл конфігурації \"%1%\" завантажено, однак деÑкі Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ ÐºÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ— не " -"розпізнаютьÑÑ." - -#: src/slic3r/GUI/GUI_App.cpp:247 -msgid "is based on Slic3r by Alessandro Ranellucci and the RepRap community." -msgstr "заÑнований на Slic3r від Alessandro Ranellucci та Ñпільноти RepRap." - -#: src/slic3r/GUI/GUI_App.cpp:249 -msgid "" -"Contributions by Vojtech Bubnik, Enrico Turri, Oleksandra Iushchenko, Tamas " -"Meszaros, Lukas Matena, Vojtech Kral, David Kocik and numerous others." -msgstr "" -"Розробки від Henrik Brix Andersen, Nicolas Dandrimont, Mark Hindess, Petr " -"Ledvina, Joseph Lenox, Y. Sapir, Mike Sheldrake, Vojtech Bubnik та багатьох " -"інших." - -#: src/slic3r/GUI/GUI_App.cpp:250 -msgid "Artwork model by Nora Al-Badri and Jan Nikolai Nelles" -msgstr "Модель ілюÑтрації виконано Nora Al-Badri та Jan Nikolai Nelles" - -#: src/slic3r/GUI/GUI_App.cpp:391 -msgid "" -"Starting with %1% 2.3, configuration directory on Linux has changed " -"(according to XDG Base Directory Specification) to \n" -"%2%.\n" -"\n" -"This directory did not exist yet (maybe you run the new version for the " -"first time).\n" -"However, an old %1% configuration directory was detected in \n" -"%3%.\n" -"\n" -"Consider moving the contents of the old directory to the new location in " -"order to access your profiles, etc.\n" -"Note that if you decide to downgrade %1% in future, it will use the old " -"location again.\n" -"\n" -"What do you want to do now?" -msgstr "" -"Починаючи з %1% 2.3, каталог конфігурації в Linux змінивÑÑ (відповідно до " -"Ñпецифікації базового каталогу XDG) на\n" -"%2%.\n" -"\n" -"Цей каталог ще не Ñ–Ñнував (можливо, ви запуÑкаєте нову верÑÑ–ÑŽ вперше).\n" -"Однак у %3% був виÑвлений Ñтарий каталог конфігурації %1%.\n" -"\n" -"Подумайте про Ð¿ÐµÑ€ÐµÐ¼Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð²Ð¼Ñ–Ñту Ñтарого каталогу в нове міÑце, щоб отримати " -"доÑтуп до ваших профілів тощо.\n" -"Зверніть увагу, що Ñкщо ви вирішите знизити верÑÑ–ÑŽ %1% у майбутньому, він " -"знову викориÑтовуватиме Ñтаре міÑце.\n" -"\n" -"Що ви хочете робити зараз?" - -#: src/slic3r/GUI/GUI_App.cpp:399 -#, c-format -msgid "%s - BREAKING CHANGE" -msgstr "%s - ЗЛÐÐœÐÐРЗМІÐÐ" - -#: src/slic3r/GUI/GUI_App.cpp:401 -msgid "Quit, I will move my data now" -msgstr "Вийти, Ñ Ð·Ð°Ñ€Ð°Ð· перенеÑу Ñвої дані" - -#: src/slic3r/GUI/GUI_App.cpp:401 -msgid "Start the application" -msgstr "ЗапуÑтити програму" - -#: src/slic3r/GUI/GUI_App.cpp:591 -#, c-format -msgid "" -"%s has encountered an error. It was likely caused by running out of memory. " -"If you are sure you have enough RAM on your system, this may also be a bug " -"and we would be glad if you reported it.\n" -"\n" -"The application will now terminate." -msgstr "" -"%s виÑвив помилку. Ймовірно, це було пов’Ñзано з закінченнÑм пам’ÑÑ‚Ñ–. Якщо " -"ви впевнені, що у вашій ÑиÑтемі доÑтатньо оперативної пам'ÑÑ‚Ñ–, це також може " -"бути помилкою, Ñ– ми будемо раді, Ñкщо ви нам про це повідомите.\n" -"\n" -"Тепер заÑтоÑÑƒÐ²Ð°Ð½Ð½Ñ Ð±ÑƒÐ´Ðµ припинено." - -#: src/slic3r/GUI/GUI_App.cpp:594 -msgid "Fatal error" -msgstr "Критична помилка" - -#: src/slic3r/GUI/GUI_App.cpp:598 -msgid "" -"PrusaSlicer has encountered a localization error. Please report to " -"PrusaSlicer team, what language was active and in which scenario this issue " -"happened. Thank you.\n" -"\n" -"The application will now terminate." -msgstr "" -"Виникла помилка локалізації. Будь лаÑка, повідомте команді PrusaSlicer, Ñка " -"мова була активною та за Ñкого Ñценарію ÑталаÑÑ Ñ†Ñ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ð°. ДÑкую.\n" -"\n" -"Тепер заÑтоÑÑƒÐ²Ð°Ð½Ð½Ñ Ð±ÑƒÐ´Ðµ припинено." - -#: src/slic3r/GUI/GUI_App.cpp:601 -msgid "Critical error" -msgstr "Критична помилка" - -#: src/slic3r/GUI/GUI_App.cpp:749 -msgid "" -"Error parsing PrusaSlicer config file, it is probably corrupted. Try to " -"manually delete the file to recover from the error. Your user profiles will " -"not be affected." -msgstr "" -"Помилка під Ñ‡Ð°Ñ Ñ€Ð¾Ð·Ð±Ð¾Ñ€Ñƒ файлу конфігурації PrusaSlicer, можливо, він " -"пошкоджений. Спробуйте вручну видалити файл, щоб оговтатиÑÑ Ð²Ñ–Ð´ помилки. Це " -"не вплине на профілі кориÑтувачів." - -#: src/slic3r/GUI/GUI_App.cpp:755 -msgid "" -"Error parsing PrusaGCodeViewer config file, it is probably corrupted. Try to " -"manually delete the file to recover from the error." -msgstr "" -"Помилка під Ñ‡Ð°Ñ Ñ€Ð¾Ð·Ð±Ð¾Ñ€Ñƒ файлу конфігурації PrusaGCodeViewer, можливо, він " -"пошкоджений. Спробуйте вручну видалити файл, щоб оговтатиÑÑ Ð²Ñ–Ð´ помилки." - -#: src/slic3r/GUI/GUI_App.cpp:809 -#, c-format -msgid "" -"%s\n" -"Do you want to continue?" -msgstr "" -"%s\n" -"Бажаєте продовжити?" - -#: src/slic3r/GUI/GUI_App.cpp:811 src/slic3r/GUI/UnsavedChangesDialog.cpp:665 -msgid "Remember my choice" -msgstr "Пам'Ñтати мій вибір" - -#: src/slic3r/GUI/GUI_App.cpp:846 -msgid "Loading configuration" -msgstr "Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ ÐºÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ—" - -#: src/slic3r/GUI/GUI_App.cpp:917 -msgid "Preparing settings tabs" -msgstr "Підготовка вкладок параметрів" - -#: src/slic3r/GUI/GUI_App.cpp:1134 -msgid "" -"You have the following presets with saved options for \"Print Host upload\"" -msgstr "" -"У Ð²Ð°Ñ Ñ” наÑтупні преÑети із збереженими параметрами Ð´Ð»Ñ \"Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ñ…Ð¾Ñта " -"друку(\"Print Host upload\")\"" - -#: src/slic3r/GUI/GUI_App.cpp:1138 -msgid "" -"But since this version of PrusaSlicer we don't show this information in " -"Printer Settings anymore.\n" -"Settings will be available in physical printers settings." -msgstr "" -"Від поточної верÑÑ–Ñ— PrusaSlicer ми більше не відображаємо цю інформацію в " -"параметрах принтера.\n" -"Ці параметри будуть доÑтупні у налаштуваннÑÑ… фізичних принтерів." - -#: src/slic3r/GUI/GUI_App.cpp:1140 -msgid "" -"By default new Printer devices will be named as \"Printer N\" during its " -"creation.\n" -"Note: This name can be changed later from the physical printers settings" -msgstr "" -"За замовчуваннÑм нові друкуючі приÑтрої будуть названі \"Printer N\" під Ñ‡Ð°Ñ " -"Ñ—Ñ… ÑтвореннÑ.\n" -"Примітка: Цю назву можна змінити пізніше в налаштуваннÑÑ… фізичних принтерів" - -#: src/slic3r/GUI/GUI_App.cpp:1143 src/slic3r/GUI/PhysicalPrinterDialog.cpp:691 -msgid "Information" -msgstr "ІнформаціÑ" - -#: src/slic3r/GUI/GUI_App.cpp:1156 src/slic3r/GUI/GUI_App.cpp:1167 -msgid "Recreating" -msgstr "Пере-ÑтвореннÑ" - -#: src/slic3r/GUI/GUI_App.cpp:1172 -msgid "Loading of current presets" -msgstr "Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð¿Ð¾Ñ‚Ð¾Ñ‡Ð½Ð¸Ñ… преÑетів" - -#: src/slic3r/GUI/GUI_App.cpp:1177 -msgid "Loading of a mode view" -msgstr "Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ñ€ÐµÐ¶Ð¸Ð¼Ñƒ переглÑду" - -#: src/slic3r/GUI/GUI_App.cpp:1253 -msgid "Choose one file (3MF/AMF):" -msgstr "Виберіть один файл (3MF/AMF):" - -#: src/slic3r/GUI/GUI_App.cpp:1265 -msgid "Choose one or more files (STL/OBJ/AMF/3MF/PRUSA):" -msgstr "Виберіть один чи кілька файлів (STL/OBJ/AMF/PRUSA):" - -#: src/slic3r/GUI/GUI_App.cpp:1277 -msgid "Choose one file (GCODE/.GCO/.G/.ngc/NGC):" -msgstr "Виберіть один файл (GCODE/.GCO/.G/.ngc/NGC):" - -#: src/slic3r/GUI/GUI_App.cpp:1288 -msgid "Changing of an application language" -msgstr "Зміна мови заÑтоÑуваннÑ" - -#: src/slic3r/GUI/GUI_App.cpp:1411 -msgid "Select the language" -msgstr "Оберіть мову" - -#: src/slic3r/GUI/GUI_App.cpp:1411 -msgid "Language" -msgstr "Мова" - -#: src/slic3r/GUI/GUI_App.cpp:1560 -msgid "modified" -msgstr "модифікований" - -#: src/slic3r/GUI/GUI_App.cpp:1609 -#, c-format -msgid "Run %s" -msgstr "ЗапуÑтити %s" - -#: src/slic3r/GUI/GUI_App.cpp:1613 -msgid "&Configuration Snapshots" -msgstr "Знімки конфігурації" - -#: src/slic3r/GUI/GUI_App.cpp:1613 -msgid "Inspect / activate configuration snapshots" -msgstr "ПереглÑньте / активізуйте знімки конфігурації" - -#: src/slic3r/GUI/GUI_App.cpp:1614 -msgid "Take Configuration &Snapshot" -msgstr "Зробіть знімок конфігурації" - -#: src/slic3r/GUI/GUI_App.cpp:1614 -msgid "Capture a configuration snapshot" -msgstr "Зробіть знімок конфігурації" - -#: src/slic3r/GUI/GUI_App.cpp:1615 -msgid "Check for updates" -msgstr "Перевірити наÑвніÑÑ‚ÑŒ оновлень" - -#: src/slic3r/GUI/GUI_App.cpp:1615 -msgid "Check for configuration updates" -msgstr "Перевірити наÑвніÑÑ‚ÑŒ оновлень конфігурації" - -#: src/slic3r/GUI/GUI_App.cpp:1618 -msgid "&Preferences" -msgstr "&Преференції" - -#: src/slic3r/GUI/GUI_App.cpp:1624 -msgid "Application preferences" -msgstr "Преференції заÑтоÑуваннÑ" - -#: src/slic3r/GUI/GUI_App.cpp:1629 src/slic3r/GUI/wxExtensions.cpp:685 -msgid "Simple" -msgstr "ПроÑтий" - -#: src/slic3r/GUI/GUI_App.cpp:1629 -msgid "Simple View Mode" -msgstr "ПроÑтий режим переглÑду" - -#: src/slic3r/GUI/GUI_App.cpp:1631 src/slic3r/GUI/wxExtensions.cpp:687 -msgctxt "Mode" -msgid "Advanced" -msgstr "Розширений" - -#: src/slic3r/GUI/GUI_App.cpp:1631 -msgid "Advanced View Mode" -msgstr "Розширений режим переглÑду" - -#: src/slic3r/GUI/GUI_App.cpp:1632 src/slic3r/GUI/wxExtensions.cpp:688 -msgid "Expert" -msgstr "ЕкÑперт" - -#: src/slic3r/GUI/GUI_App.cpp:1632 -msgid "Expert View Mode" -msgstr "Режим переглÑду ЕкÑперт" - -#: src/slic3r/GUI/GUI_App.cpp:1637 -msgid "Mode" -msgstr "Режим" - -#: src/slic3r/GUI/GUI_App.cpp:1637 -#, c-format -msgid "%s View Mode" -msgstr "Режим переглÑду %s" - -#: src/slic3r/GUI/GUI_App.cpp:1640 -msgid "&Language" -msgstr "Мова" - -#: src/slic3r/GUI/GUI_App.cpp:1643 -msgid "Flash printer &firmware" -msgstr "Прошити принтер" - -#: src/slic3r/GUI/GUI_App.cpp:1643 -msgid "Upload a firmware image into an Arduino based printer" -msgstr "Завантажте імідж прошивки на Arduino-принтер" - -#: src/slic3r/GUI/GUI_App.cpp:1659 -msgid "Taking configuration snapshot" -msgstr "Знімок конфігурації" - -#: src/slic3r/GUI/GUI_App.cpp:1659 -msgid "Snapshot name" -msgstr "Ðазва знімку" - -#: src/slic3r/GUI/GUI_App.cpp:1697 -msgid "Failed to activate configuration snapshot." -msgstr "Ðе вдалоÑÑ Ð°ÐºÑ‚Ð¸Ð²ÑƒÐ²Ð°Ñ‚Ð¸ знімок конфігурації." - -#: src/slic3r/GUI/GUI_App.cpp:1747 -msgid "Language selection" -msgstr "Вибір мови" - -#: src/slic3r/GUI/GUI_App.cpp:1749 -msgid "" -"Switching the language will trigger application restart.\n" -"You will lose content of the plater." -msgstr "" -"ÐŸÐµÑ€ÐµÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ Ð¼Ð¾Ð²Ð¸ Ñпричинить перезапуÑк програми.\n" -"Ви втратите вміÑÑ‚ платеру." - -#: src/slic3r/GUI/GUI_App.cpp:1751 -msgid "Do you want to proceed?" -msgstr "Ви хочете продовжити?" - -#: src/slic3r/GUI/GUI_App.cpp:1778 -msgid "&Configuration" -msgstr "&КонфігураціÑ" - -#: src/slic3r/GUI/GUI_App.cpp:1809 -msgid "The preset(s) modifications are successfully saved" -msgstr "Модифікації преÑетів уÑпішно збережено" - -#: src/slic3r/GUI/GUI_App.cpp:1830 -msgid "The uploads are still ongoing" -msgstr "Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð²Ñе ще триває" - -#: src/slic3r/GUI/GUI_App.cpp:1830 -msgid "Stop them and continue anyway?" -msgstr "Зупинити Ñ—Ñ… Ñ– продовжувати в будь-Ñкому випадку?" - -#: src/slic3r/GUI/GUI_App.cpp:1833 -msgid "Ongoing uploads" -msgstr "Триває завантаженнÑ" - -#: src/slic3r/GUI/GUI_App.cpp:2061 src/slic3r/GUI/Tab.cpp:3249 -msgid "It's impossible to print multi-part object(s) with SLA technology." -msgstr "" -"За технологією SLA неможливо надрукувати об'єкти, що ÑкладаютьÑÑ Ð· декількох " -"чаÑтин." - -#: src/slic3r/GUI/GUI_App.cpp:2062 -msgid "Please check and fix your object list." -msgstr "Будь лаÑка, перевірте та виправте Ñвій ÑпиÑок об'єктів." - -#: src/slic3r/GUI/GUI_App.cpp:2063 src/slic3r/GUI/Jobs/SLAImportJob.cpp:212 -#: src/slic3r/GUI/Plater.cpp:2361 src/slic3r/GUI/Tab.cpp:3251 -msgid "Attention!" -msgstr "Увага!" - -#: src/slic3r/GUI/GUI_App.cpp:2080 -msgid "Select a gcode file:" -msgstr "Виберіть файл G-коду:" - -#: src/slic3r/GUI/GUI_Init.cpp:57 src/slic3r/GUI/GUI_Init.cpp:60 -msgid "PrusaSlicer GUI initialization failed" -msgstr "Помилка ініціалізації графічного інтерфейÑу PrusaSlicer" - -#: src/slic3r/GUI/GUI_Init.cpp:60 -msgid "Fatal error, exception catched: %1%" -msgstr "Фатальна помилка, вилучений винÑток: %1%" - -#: src/slic3r/GUI/GUI_ObjectLayers.cpp:29 -msgid "Start at height" -msgstr "Початкова виÑота" - -#: src/slic3r/GUI/GUI_ObjectLayers.cpp:29 -msgid "Stop at height" -msgstr "Кінцева виÑота" - -#: src/slic3r/GUI/GUI_ObjectLayers.cpp:161 -msgid "Remove layer range" -msgstr "Видалити діапазон шарів" - -#: src/slic3r/GUI/GUI_ObjectLayers.cpp:165 -msgid "Add layer range" -msgstr "Додати діапазон шарів" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:34 src/slic3r/GUI/GUI_ObjectList.cpp:92 -#: src/slic3r/GUI/GUI_ObjectList.cpp:667 src/libslic3r/PrintConfig.cpp:74 -#: src/libslic3r/PrintConfig.cpp:189 src/libslic3r/PrintConfig.cpp:231 -#: src/libslic3r/PrintConfig.cpp:240 src/libslic3r/PrintConfig.cpp:464 -#: src/libslic3r/PrintConfig.cpp:530 src/libslic3r/PrintConfig.cpp:538 -#: src/libslic3r/PrintConfig.cpp:970 src/libslic3r/PrintConfig.cpp:1219 -#: src/libslic3r/PrintConfig.cpp:1586 src/libslic3r/PrintConfig.cpp:1652 -#: src/libslic3r/PrintConfig.cpp:1837 src/libslic3r/PrintConfig.cpp:2304 -#: src/libslic3r/PrintConfig.cpp:2363 src/libslic3r/PrintConfig.cpp:2372 -msgid "Layers and Perimeters" -msgstr "Шари та периметри" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:36 src/slic3r/GUI/GUI_ObjectList.cpp:95 -#: src/slic3r/GUI/GUI_ObjectList.cpp:670 src/slic3r/GUI/GUI_Preview.cpp:240 -#: src/slic3r/GUI/Tab.cpp:1479 src/slic3r/GUI/Tab.cpp:1481 -#: src/libslic3r/ExtrusionEntity.cpp:320 src/libslic3r/ExtrusionEntity.cpp:352 -#: src/libslic3r/PrintConfig.cpp:426 src/libslic3r/PrintConfig.cpp:1717 -#: src/libslic3r/PrintConfig.cpp:2095 src/libslic3r/PrintConfig.cpp:2101 -#: src/libslic3r/PrintConfig.cpp:2109 src/libslic3r/PrintConfig.cpp:2121 -#: src/libslic3r/PrintConfig.cpp:2131 src/libslic3r/PrintConfig.cpp:2139 -#: src/libslic3r/PrintConfig.cpp:2154 src/libslic3r/PrintConfig.cpp:2175 -#: src/libslic3r/PrintConfig.cpp:2187 src/libslic3r/PrintConfig.cpp:2203 -#: src/libslic3r/PrintConfig.cpp:2212 src/libslic3r/PrintConfig.cpp:2221 -#: src/libslic3r/PrintConfig.cpp:2232 src/libslic3r/PrintConfig.cpp:2246 -#: src/libslic3r/PrintConfig.cpp:2254 src/libslic3r/PrintConfig.cpp:2255 -#: src/libslic3r/PrintConfig.cpp:2264 src/libslic3r/PrintConfig.cpp:2272 -#: src/libslic3r/PrintConfig.cpp:2286 -msgid "Support material" -msgstr "Підтримка" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:39 src/slic3r/GUI/GUI_ObjectList.cpp:99 -#: src/slic3r/GUI/GUI_ObjectList.cpp:674 src/libslic3r/PrintConfig.cpp:2482 -#: src/libslic3r/PrintConfig.cpp:2490 -msgid "Wipe options" -msgstr "Параметри витираннÑ" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:45 -msgid "Pad and Support" -msgstr "Подушка та підтримки" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:51 -msgid "Add part" -msgstr "Додати чаÑтину" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:52 -msgid "Add modifier" -msgstr "Додати модифікатор" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:53 -msgid "Add support enforcer" -msgstr "Додати примуÑову підтримку" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:54 -msgid "Add support blocker" -msgstr "Додати блокувальник підтримок" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:94 src/slic3r/GUI/GUI_ObjectList.cpp:669 -#: src/slic3r/GUI/GUI_Preview.cpp:236 src/slic3r/GUI/Tab.cpp:1449 -#: src/libslic3r/ExtrusionEntity.cpp:316 src/libslic3r/ExtrusionEntity.cpp:344 -#: src/libslic3r/PrintConfig.cpp:1226 src/libslic3r/PrintConfig.cpp:1232 -#: src/libslic3r/PrintConfig.cpp:1246 src/libslic3r/PrintConfig.cpp:1256 -#: src/libslic3r/PrintConfig.cpp:1264 src/libslic3r/PrintConfig.cpp:1266 -msgid "Ironing" -msgstr "ПраÑуваннÑ" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:96 src/slic3r/GUI/GUI_ObjectList.cpp:671 -#: src/slic3r/GUI/GUI_Preview.cpp:217 src/slic3r/GUI/Tab.cpp:1505 -#: src/libslic3r/PrintConfig.cpp:291 src/libslic3r/PrintConfig.cpp:518 -#: src/libslic3r/PrintConfig.cpp:1012 src/libslic3r/PrintConfig.cpp:1192 -#: src/libslic3r/PrintConfig.cpp:1265 src/libslic3r/PrintConfig.cpp:1642 -#: src/libslic3r/PrintConfig.cpp:1918 src/libslic3r/PrintConfig.cpp:1970 -#: src/libslic3r/PrintConfig.cpp:2348 -msgid "Speed" -msgstr "ШвидкіÑÑ‚ÑŒ" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:97 src/slic3r/GUI/GUI_ObjectList.cpp:672 -#: src/slic3r/GUI/Tab.cpp:1541 src/slic3r/GUI/Tab.cpp:2119 -#: src/libslic3r/PrintConfig.cpp:548 src/libslic3r/PrintConfig.cpp:1146 -#: src/libslic3r/PrintConfig.cpp:1620 src/libslic3r/PrintConfig.cpp:1939 -#: src/libslic3r/PrintConfig.cpp:2167 src/libslic3r/PrintConfig.cpp:2194 -msgid "Extruders" -msgstr "ЕкÑтрудери" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:98 src/slic3r/GUI/GUI_ObjectList.cpp:673 -#: src/libslic3r/PrintConfig.cpp:507 src/libslic3r/PrintConfig.cpp:616 -#: src/libslic3r/PrintConfig.cpp:957 src/libslic3r/PrintConfig.cpp:1154 -#: src/libslic3r/PrintConfig.cpp:1629 src/libslic3r/PrintConfig.cpp:1959 -#: src/libslic3r/PrintConfig.cpp:2176 src/libslic3r/PrintConfig.cpp:2336 -msgid "Extrusion Width" -msgstr "Ширина екÑтрузії" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:102 src/slic3r/GUI/GUI_ObjectList.cpp:677 -#: src/slic3r/GUI/Tab.cpp:1435 src/slic3r/GUI/Tab.cpp:1459 -#: src/slic3r/GUI/Tab.cpp:1562 src/slic3r/GUI/Tab.cpp:1565 -#: src/slic3r/GUI/Tab.cpp:1862 src/slic3r/GUI/Tab.cpp:2204 -#: src/slic3r/GUI/Tab.cpp:4121 src/libslic3r/PrintConfig.cpp:92 -#: src/libslic3r/PrintConfig.cpp:132 src/libslic3r/PrintConfig.cpp:279 -#: src/libslic3r/PrintConfig.cpp:1097 src/libslic3r/PrintConfig.cpp:1181 -#: src/libslic3r/PrintConfig.cpp:2506 src/libslic3r/PrintConfig.cpp:2678 -msgid "Advanced" -msgstr "Розширений" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:104 src/slic3r/GUI/GUI_ObjectList.cpp:679 -#: src/slic3r/GUI/Plater.cpp:358 src/slic3r/GUI/Tab.cpp:4055 -#: src/slic3r/GUI/Tab.cpp:4056 src/libslic3r/PrintConfig.cpp:2844 -#: src/libslic3r/PrintConfig.cpp:2851 src/libslic3r/PrintConfig.cpp:2860 -#: src/libslic3r/PrintConfig.cpp:2869 src/libslic3r/PrintConfig.cpp:2879 -#: src/libslic3r/PrintConfig.cpp:2889 src/libslic3r/PrintConfig.cpp:2926 -#: src/libslic3r/PrintConfig.cpp:2933 src/libslic3r/PrintConfig.cpp:2944 -#: src/libslic3r/PrintConfig.cpp:2954 src/libslic3r/PrintConfig.cpp:2963 -#: src/libslic3r/PrintConfig.cpp:2976 src/libslic3r/PrintConfig.cpp:2986 -#: src/libslic3r/PrintConfig.cpp:2995 src/libslic3r/PrintConfig.cpp:3005 -#: src/libslic3r/PrintConfig.cpp:3016 src/libslic3r/PrintConfig.cpp:3024 -msgid "Supports" -msgstr "Підтримки" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:105 src/slic3r/GUI/GUI_ObjectList.cpp:680 -#: src/slic3r/GUI/Plater.cpp:501 src/slic3r/GUI/Tab.cpp:4096 -#: src/slic3r/GUI/Tab.cpp:4097 src/slic3r/GUI/Tab.cpp:4168 -#: src/libslic3r/PrintConfig.cpp:3032 src/libslic3r/PrintConfig.cpp:3039 -#: src/libslic3r/PrintConfig.cpp:3053 src/libslic3r/PrintConfig.cpp:3064 -#: src/libslic3r/PrintConfig.cpp:3074 src/libslic3r/PrintConfig.cpp:3096 -#: src/libslic3r/PrintConfig.cpp:3107 src/libslic3r/PrintConfig.cpp:3114 -#: src/libslic3r/PrintConfig.cpp:3121 src/libslic3r/PrintConfig.cpp:3132 -#: src/libslic3r/PrintConfig.cpp:3141 src/libslic3r/PrintConfig.cpp:3150 -msgid "Pad" -msgstr "Подушка" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:106 src/slic3r/GUI/Tab.cpp:4114 -#: src/slic3r/GUI/Tab.cpp:4115 src/libslic3r/SLA/Hollowing.cpp:45 -#: src/libslic3r/SLA/Hollowing.cpp:57 src/libslic3r/SLA/Hollowing.cpp:66 -#: src/libslic3r/SLA/Hollowing.cpp:75 src/libslic3r/PrintConfig.cpp:3160 -#: src/libslic3r/PrintConfig.cpp:3167 src/libslic3r/PrintConfig.cpp:3177 -#: src/libslic3r/PrintConfig.cpp:3186 -msgid "Hollowing" -msgstr "ВипорожненнÑ" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:300 -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:161 -msgid "Name" -msgstr "Ім'Ñ" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:316 src/slic3r/GUI/GUI_ObjectList.cpp:457 -msgid "Editing" -msgstr "РедагуваннÑ" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:402 -#, c-format -msgid "Auto-repaired (%d errors):" -msgstr "Ðвто-Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ (%d помилок):" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:409 -msgid "degenerate facets" -msgstr "вироджені грані" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:410 -msgid "edges fixed" -msgstr "виправлено країв" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:411 -msgid "facets removed" -msgstr "вилучено граней" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:412 -msgid "facets added" -msgstr "додано граней" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:413 -msgid "facets reversed" -msgstr "змінено граней" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:414 -msgid "backwards edges" -msgstr "повернуто країв" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:422 -msgid "Right button click the icon to fix STL through Netfabb" -msgstr "Клацніть правою кнопкою миші, щоб виправити STL за допомогою Netfabb" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:459 -msgid "Right button click the icon to change the object settings" -msgstr "" -"Клацніть правою кнопкою миші на піктограмі, щоб змінити Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð¾Ð±'єкта" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:461 -msgid "Click the icon to change the object settings" -msgstr "Клацніть на піктограмі, щоб змінити Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð¾Ð±'єкта" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:465 -msgid "Right button click the icon to change the object printable property" -msgstr "" -"Клацніть правою кнопкою миші на піктограмі, щоб змінити влаÑтивіÑÑ‚ÑŒ друку " -"Ð´Ð»Ñ Ð¾Ð±'єкта" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:467 -msgid "Click the icon to change the object printable property" -msgstr "Клацніть на піктограмі, щоб змінити влаÑтивіÑÑ‚ÑŒ друку Ð´Ð»Ñ Ð¾Ð±'єкта" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:590 -msgid "Change Extruder" -msgstr "Змінити екÑтрудер" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:605 -msgid "Rename Object" -msgstr "Перейменувати об'єкт" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:605 -msgid "Rename Sub-object" -msgstr "Перейменувати підоб'єкт" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1251 -#: src/slic3r/GUI/GUI_ObjectList.cpp:4378 -msgid "Instances to Separated Objects" -msgstr "Змінити екземплÑри на окремі об'єкти" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1266 -msgid "Volumes in Object reordered" -msgstr "Об’єкт впорÑдковано" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1266 -msgid "Object reordered" -msgstr "Об’єкт впорÑдковано" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1342 -#: src/slic3r/GUI/GUI_ObjectList.cpp:1697 -#: src/slic3r/GUI/GUI_ObjectList.cpp:1703 -#: src/slic3r/GUI/GUI_ObjectList.cpp:2085 -#, c-format -msgid "Quick Add Settings (%s)" -msgstr "Швидке Ð´Ð¾Ð´Ð°Ð½Ð½Ñ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½ÑŒ (%s)" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1432 -msgid "Select showing settings" -msgstr "Виберіть Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ð»Ñ Ð¿Ð¾ÐºÐ°Ð·Ñƒ" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1481 -msgid "Add Settings for Layers" -msgstr "Додати Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ð»Ñ ÑˆÐ°Ñ€Ñ–Ð²" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1482 -msgid "Add Settings for Sub-object" -msgstr "Додати Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ð»Ñ Ð¿Ñ–Ð´Ð¾Ð±'єкту" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1483 -msgid "Add Settings for Object" -msgstr "Додати Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ð»Ñ Ð¾Ð±'єкту" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1553 -msgid "Add Settings Bundle for Height range" -msgstr "Додати пакет налаштувань Ð´Ð»Ñ Ð´Ñ–Ð°Ð¿Ð°Ð·Ð¾Ð½Ñƒ виÑот" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1554 -msgid "Add Settings Bundle for Sub-object" -msgstr "Додати пакет налаштувань Ð´Ð»Ñ Ð¿Ñ–Ð´Ð¾Ð±'єкту" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1555 -msgid "Add Settings Bundle for Object" -msgstr "Додати пакет налаштувань Ð´Ð»Ñ Ð¾Ð±'єкту" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1594 -msgid "Load" -msgstr "Завантажити" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1599 -#: src/slic3r/GUI/GUI_ObjectList.cpp:1631 -#: src/slic3r/GUI/GUI_ObjectList.cpp:1635 -msgid "Box" -msgstr "Коробка" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1599 -msgid "Cylinder" -msgstr "Циліндр" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1599 -msgid "Slab" -msgstr "Плита" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1667 -msgid "Height range Modifier" -msgstr "Модифікатор діапазону виÑот" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1676 -msgid "Add settings" -msgstr "Додати налаштуваннÑ" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1754 -msgid "Change type" -msgstr "Змінити тип" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1764 -#: src/slic3r/GUI/GUI_ObjectList.cpp:1776 -msgid "Set as a Separated Object" -msgstr "Ð’Ñтановити Ñк окремий об’єкт" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1776 -msgid "Set as a Separated Objects" -msgstr "Ð’Ñтановити Ñк окремі об’єкти" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1786 -msgid "Printable" -msgstr "Ð”Ð»Ñ Ð´Ñ€ÑƒÐºÑƒ" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1801 -msgid "Rename" -msgstr "Перейменувати" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1812 -msgid "Fix through the Netfabb" -msgstr "Виправити за допомогою NetFabb" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1822 src/slic3r/GUI/Plater.cpp:4052 -msgid "Export as STL" -msgstr "ЕкÑпортувати Ñк STL" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1829 -#: src/slic3r/GUI/GUI_ObjectList.cpp:4573 src/slic3r/GUI/Plater.cpp:4018 -msgid "Reload the selected volumes from disk" -msgstr "Перезавантажити вибрані чаÑÑ‚Ñ– з диÑка" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1836 -msgid "Set extruder for selected items" -msgstr "Ð’Ñтановити екÑтрудер Ð´Ð»Ñ Ð²Ð¸Ð±Ñ€Ð°Ð½Ð¸Ñ… елементів" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1868 src/libslic3r/PrintConfig.cpp:391 -msgid "Default" -msgstr "За замовчуваннÑм" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1888 -msgid "Scale to print volume" -msgstr "МаÑштабувати під облаÑÑ‚ÑŒ друку" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1888 -msgid "Scale the selected object to fit the print volume" -msgstr "МаÑштабуйте вибраний об'єкт відповідно до об'єму Ñтолу" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1917 src/slic3r/GUI/Plater.cpp:5245 -msgid "Convert from imperial units" -msgstr "Конвертувати з імперÑьких одиниць" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1919 src/slic3r/GUI/Plater.cpp:5245 -msgid "Revert conversion from imperial units" -msgstr "Повернути конвертацію з імперÑьких одиниць" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1948 -#: src/slic3r/GUI/GUI_ObjectList.cpp:1956 -#: src/slic3r/GUI/GUI_ObjectList.cpp:2636 src/libslic3r/PrintConfig.cpp:3734 -msgid "Merge" -msgstr "Об’єднати" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1948 -msgid "Merge objects to the one multipart object" -msgstr "Об'єднати об'єкти в один багаточаÑтковий об'єкт" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:1956 -msgid "Merge objects to the one single object" -msgstr "Об’єднайте об’єкти в один єдиний об’єкт" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2030 -#: src/slic3r/GUI/GUI_ObjectList.cpp:2287 -msgid "Add Shape" -msgstr "Додати форму" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2115 -msgid "Load Part" -msgstr "Завантажити чаÑтину" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2154 -msgid "Error!" -msgstr "Помилка!" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2229 -msgid "Add Generic Subobject" -msgstr "Додати загальний підоб'єкт" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2258 -msgid "Generic" -msgstr "Загальний" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2384 -msgid "Delete Settings" -msgstr "Видалити налаштуваннÑ" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2408 -msgid "Delete All Instances from Object" -msgstr "Видалити вÑÑ– екземплÑри з об’єкта" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2424 -msgid "Delete Height Range" -msgstr "Видалити діапазон виÑот" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2456 -msgid "From Object List You can't delete the last solid part from object." -msgstr "" -"Зі ÑпиÑку об’єктів Ви не можете видалити оÑтанню Ñуцільну чаÑтину з об’єкта." - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2460 -msgid "Delete Subobject" -msgstr "Видалити підоб'єкт" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2475 -msgid "Last instance of an object cannot be deleted." -msgstr "Ðе можна видалити оÑтанній екземплÑÑ€ з об'єкту." - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2479 -msgid "Delete Instance" -msgstr "Видалити екземплÑÑ€" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2503 src/slic3r/GUI/Plater.cpp:2873 -msgid "" -"The selected object couldn't be split because it contains only one part." -msgstr "" -"Вибраний об'єкт не можна розділити, оÑкільки він міÑтить лише одну чаÑтину." - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2507 -msgid "Split to Parts" -msgstr "Розділити на чаÑтини" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2643 -msgid "Merged" -msgstr "Об’єднано" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2727 -msgid "Merge all parts to the one single object" -msgstr "Об’єднати вÑÑ– чаÑтини в єдиний об’єкт" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2759 -msgid "Add Layers" -msgstr "Додати шари" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2913 -msgid "Group manipulation" -msgstr "ÐœÐ°Ð½Ñ–Ð¿ÑƒÐ»ÑŽÐ²Ð°Ð½Ð½Ñ Ð³Ñ€ÑƒÐ¿Ð¾ÑŽ" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2925 -msgid "Object manipulation" -msgstr "ÐœÐ°Ð½Ñ–Ð¿ÑƒÐ»ÑŽÐ²Ð°Ð½Ð½Ñ Ð¾Ð±'єктом" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2938 -msgid "Object Settings to modify" -msgstr "Параметри об'єкту, Ñкі можна змінювати" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2942 -msgid "Part Settings to modify" -msgstr "Параметри чаÑтини, Ñкі можна змінювати" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2947 -msgid "Layer range Settings to modify" -msgstr "Пакет налаштувань Ð´Ð»Ñ Ð´Ñ–Ð°Ð¿Ð°Ð·Ð¾Ð½Ñƒ виÑот" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2953 -msgid "Part manipulation" -msgstr "ÐœÐ°Ð½Ñ–Ð¿ÑƒÐ»ÑŽÐ²Ð°Ð½Ð½Ñ Ñ‡Ð°Ñтиною" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2959 -msgid "Instance manipulation" -msgstr "ÐœÐ°Ð½Ñ–Ð¿ÑƒÐ»ÑŽÐ²Ð°Ð½Ð½Ñ ÐµÐºÐ·ÐµÐ¼Ð¿Ð»Ñром" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2966 -msgid "Height ranges" -msgstr "Діапазони виÑот" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:2966 -msgid "Settings for height range" -msgstr "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ñ–Ð°Ð¿Ð°Ð·Ð¾Ð½Ñƒ виÑот" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:3150 -msgid "Delete Selected Item" -msgstr "Видалити вибраний елемент" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:3338 -msgid "Delete Selected" -msgstr "Видалити вибране" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:3414 -#: src/slic3r/GUI/GUI_ObjectList.cpp:3442 -#: src/slic3r/GUI/GUI_ObjectList.cpp:3462 -msgid "Add Height Range" -msgstr "Додати діапазон виÑот" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:3508 -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 "" -"Ðе вдаєтьÑÑ Ð²Ñтавити новий діапазон шарів піÑÐ»Ñ Ð¿Ð¾Ñ‚Ð¾Ñ‡Ð½Ð¾Ð³Ð¾ діапазону шарів.\n" -"Діапазон наÑтупного шару занадто тонкий, щоб його можна було розділити на " -"два\n" -"без Ð¿Ð¾Ñ€ÑƒÑˆÐµÐ½Ð½Ñ Ð¼Ñ–Ð½Ñ–Ð¼Ð°Ð»ÑŒÐ½Ð¾Ñ— виÑоти шару." - -#: src/slic3r/GUI/GUI_ObjectList.cpp:3512 -msgid "" -"Cannot insert a new layer range between the current and the next layer " -"range.\n" -"The gap between the current layer range and the next layer range\n" -"is thinner than the minimum layer height allowed." -msgstr "" -"Ðе вдаєтьÑÑ Ð²Ñтавити новий діапазон шарів між поточним та наÑтупним " -"діапазоном шарів.\n" -"Розрив між діапазоном поточного шару та діапазоном наÑтупного шару\n" -"тонше мінімально допуÑтимої виÑоти шару." - -#: src/slic3r/GUI/GUI_ObjectList.cpp:3517 -msgid "" -"Cannot insert a new layer range after the current layer range.\n" -"Current layer range overlaps with the next layer range." -msgstr "" -"Ðе вдаєтьÑÑ Ð²Ñтавити новий діапазон шарів піÑÐ»Ñ Ð¿Ð¾Ñ‚Ð¾Ñ‡Ð½Ð¾Ð³Ð¾ діапазону шарів.\n" -"Діапазон поточного шару перекриваєтьÑÑ Ð· діапазоном наÑтупного шару." - -#: src/slic3r/GUI/GUI_ObjectList.cpp:3576 -msgid "Edit Height Range" -msgstr "Ð ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ñ–Ð°Ð¿Ð°Ð·Ð¾Ð½Ñƒ виÑот" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:3871 -msgid "Selection-Remove from list" -msgstr "Ð’Ð¸Ð´Ñ–Ð»ÐµÐ½Ð½Ñ - Видалено зі ÑпиÑку" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:3879 -msgid "Selection-Add from list" -msgstr "Ð’Ð¸Ð´Ñ–Ð»ÐµÐ½Ð½Ñ - Додано зі ÑпиÑку" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4014 -msgid "Object or Instance" -msgstr "\"Об’єкт\" або \"ЕкземплÑÑ€\"" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4015 -#: src/slic3r/GUI/GUI_ObjectList.cpp:4148 -msgid "Part" -msgstr "\"ЧаÑтина\"" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4015 -msgid "Layer" -msgstr "\"Шар\"" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4017 -msgid "Unsupported selection" -msgstr "Ðепідтримуваний вибір" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4018 -#, c-format -msgid "You started your selection with %s Item." -msgstr "Ви розпочали Ñвій вибір з елемента %s." - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4019 -#, c-format -msgid "In this mode you can select only other %s Items%s" -msgstr "Ð’ цьому режимі ви можете вибирати тільки інші %s %s" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4022 -msgid "of a current Object" -msgstr "поточного \"Об'єкта\"" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4027 -#: src/slic3r/GUI/GUI_ObjectList.cpp:4102 src/slic3r/GUI/Plater.cpp:144 -msgid "Info" -msgstr "Інфо" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4143 -msgid "You can't change a type of the last solid part of the object." -msgstr "Ви не можете змінити тип оÑтанньої твердої чаÑтини об’єкта." - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4148 -msgid "Modifier" -msgstr "Модифікатор" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4148 -msgid "Support Enforcer" -msgstr "ПримуÑова підтримка" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4148 -msgid "Support Blocker" -msgstr "Блокувальник підтримок" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4150 -msgid "Select type of part" -msgstr "Змінити тип чаÑтини" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4155 -msgid "Change Part Type" -msgstr "Змінити тип деталі" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4400 -msgid "Enter new name" -msgstr "Введіть нову назву" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4400 -msgid "Renaming" -msgstr "ПерейменуваннÑ" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4416 -#: src/slic3r/GUI/GUI_ObjectList.cpp:4543 -#: src/slic3r/GUI/SavePresetDialog.cpp:101 -#: src/slic3r/GUI/SavePresetDialog.cpp:109 -msgid "The supplied name is not valid;" -msgstr "Ðадане ім'Ñ Ð½ÐµÐ´Ñ–Ð¹Ñне;" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4417 -#: src/slic3r/GUI/GUI_ObjectList.cpp:4544 -#: src/slic3r/GUI/SavePresetDialog.cpp:102 -msgid "the following characters are not allowed:" -msgstr "такі Ñимволи не допуÑкаютьÑÑ:" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4592 -msgid "Select extruder number:" -msgstr "Виберіть номер екÑтрудера:" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4593 -msgid "This extruder will be set for selected items" -msgstr "Цей екÑтрудер буде вÑтановлений Ð´Ð»Ñ Ð²Ð¸Ð±Ñ€Ð°Ð½Ð¸Ñ… елементів" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4618 -msgid "Change Extruders" -msgstr "Змінити екÑтрудери" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4715 src/slic3r/GUI/Selection.cpp:1485 -msgid "Set Printable" -msgstr "Ð’Ñтановити \"Ð”Ð»Ñ Ð´Ñ€ÑƒÐºÑƒ\"" - -#: src/slic3r/GUI/GUI_ObjectList.cpp:4715 src/slic3r/GUI/Selection.cpp:1485 -msgid "Set Unprintable" -msgstr "Ð’Ñтановити \"Ðе Ð´Ð»Ñ Ð´Ñ€ÑƒÐºÑƒ\"" - -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:68 -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:111 -msgid "World coordinates" -msgstr "Світові координати" - -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:69 -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:112 -msgid "Local coordinates" -msgstr "Локальні координати" - -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:88 -msgid "Select coordinate space, in which the transformation will be performed." -msgstr "Виберіть проÑÑ‚Ñ–Ñ€ координат, в Ñкому буде виконуватиÑÑ Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ." - -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:163 src/libslic3r/GCode.cpp:537 -msgid "Object name" -msgstr "Ðазва об'єкту" - -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:223 -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:505 -msgid "Position" -msgstr "ПозиціÑ" - -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:224 -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:506 -#: src/slic3r/GUI/Mouse3DController.cpp:486 -#: src/slic3r/GUI/Mouse3DController.cpp:507 -msgid "Rotation" -msgstr "ОбертаннÑ" - -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:271 -#, c-format -msgid "Toggle %c axis mirroring" -msgstr "Переключити дзеркальне Ð²Ñ–Ð´Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ Ð·Ð° оÑею %c" - -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:305 -msgid "Set Mirror" -msgstr "Ð’Ñтановити віддзеркаленнÑ" - -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:345 -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:357 -msgid "Drop to bed" -msgstr "ПоÑтавити на Ñтіл" - -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:372 -msgid "Reset rotation" -msgstr "Скинути обертаннÑ" - -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:394 -msgid "Reset Rotation" -msgstr "Скинути обертаннÑ" - -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:407 -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:409 -msgid "Reset scale" -msgstr "Скинути маÑштаб" - -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:423 -msgid "Inches" -msgstr "Дюймів" - -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:507 -msgid "Scale factors" -msgstr "МаÑштаб" - -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:561 -msgid "Translate" -msgstr "ПереміÑтити" - -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:625 -msgid "" -"You cannot use non-uniform scaling mode for multiple objects/parts selection" -msgstr "" -"Ðе можна викориÑтовувати нерівномірний режим маÑштабуваннÑ, коли вибрано " -"кілька об’єктів/чаÑтей" - -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:797 -msgid "Set Position" -msgstr "Ð’Ñтановити позицію" - -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:828 -msgid "Set Orientation" -msgstr "Ð’Ñтановити орієнтацію" - -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:893 -msgid "Set Scale" -msgstr "Ð’Ñтановити маÑштаб" - -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:925 -msgid "" -"The currently manipulated object is tilted (rotation angles are not " -"multiples of 90°).\n" -"Non-uniform scaling of tilted objects is only possible in the World " -"coordinate system,\n" -"once the rotation is embedded into the object coordinates." -msgstr "" -"Ð’ даний Ñ‡Ð°Ñ Ð¼Ð°Ð½Ñ–Ð¿ÑƒÐ»ÑŒÐ¾Ð²Ð°Ð½Ð¸Ð¹ об'єкт нахилений (кути повороту не кратні 90 °).\n" -"Ðерівномірне маÑÑˆÑ‚Ð°Ð±ÑƒÐ²Ð°Ð½Ð½Ñ Ð½Ð°Ñ…Ð¸Ð»ÐµÐ½Ð¸Ñ… предметів можливе лише у Ñвітовій " -"ÑиÑтемі координат,\n" -"Ñк тільки Ð¾Ð±ÐµÑ€Ñ‚Ð°Ð½Ð½Ñ Ð±ÑƒÐ´Ðµ вбудовано в координати об’єкта." - -#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:928 -msgid "" -"This operation is irreversible.\n" -"Do you want to proceed?" -msgstr "" -"Ð¦Ñ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ñ–Ñ Ð½ÐµÐ·Ð²Ð¾Ñ€Ð¾Ñ‚Ð½Ð°.\n" -"Ви хочете продовжити?" - -#: src/slic3r/GUI/GUI_ObjectSettings.cpp:62 -msgid "Additional Settings" -msgstr "Додаткові налаштуваннÑ" - -#: src/slic3r/GUI/GUI_ObjectSettings.cpp:98 -msgid "Remove parameter" -msgstr "Видалити параметр" - -#: src/slic3r/GUI/GUI_ObjectSettings.cpp:104 -#, c-format -msgid "Delete Option %s" -msgstr "Видалити параметр %s" - -#: src/slic3r/GUI/GUI_ObjectSettings.cpp:157 -#, c-format -msgid "Change Option %s" -msgstr "Змінити параметр %s" - -#: src/slic3r/GUI/GUI_Preview.cpp:212 -msgid "View" -msgstr "Вид" - -#: src/slic3r/GUI/GUI_Preview.cpp:215 src/libslic3r/PrintConfig.cpp:560 -msgid "Height" -msgstr "ВиÑота" - -#: src/slic3r/GUI/GUI_Preview.cpp:216 src/libslic3r/PrintConfig.cpp:2468 -msgid "Width" -msgstr "Ширина" - -#: src/slic3r/GUI/GUI_Preview.cpp:218 src/slic3r/GUI/Tab.cpp:1847 -msgid "Fan speed" -msgstr "ШвидкіÑÑ‚ÑŒ вентилÑтора" - -#: src/slic3r/GUI/GUI_Preview.cpp:219 -msgid "Volumetric flow rate" -msgstr "Об'ємна швидкіÑÑ‚ÑŒ потоку" - -#: src/slic3r/GUI/GUI_Preview.cpp:224 -msgid "Show" -msgstr "Показати" - -#: src/slic3r/GUI/GUI_Preview.cpp:227 src/slic3r/GUI/GUI_Preview.cpp:245 -msgid "Feature types" -msgstr "Типи ознак" - -#: src/slic3r/GUI/GUI_Preview.cpp:230 src/libslic3r/ExtrusionEntity.cpp:310 -#: src/libslic3r/ExtrusionEntity.cpp:332 -msgid "Perimeter" -msgstr "Периметр" - -#: src/slic3r/GUI/GUI_Preview.cpp:231 src/libslic3r/ExtrusionEntity.cpp:311 -#: src/libslic3r/ExtrusionEntity.cpp:334 -msgid "External perimeter" -msgstr "Зовнішній периметр" - -#: src/slic3r/GUI/GUI_Preview.cpp:232 src/libslic3r/ExtrusionEntity.cpp:312 -#: src/libslic3r/ExtrusionEntity.cpp:336 -msgid "Overhang perimeter" -msgstr "ÐавиÑаючий периметр" - -#: src/slic3r/GUI/GUI_Preview.cpp:233 src/libslic3r/ExtrusionEntity.cpp:313 -#: src/libslic3r/ExtrusionEntity.cpp:338 -msgid "Internal infill" -msgstr "Внутрішнє наповненнÑ" - -#: src/slic3r/GUI/GUI_Preview.cpp:234 src/libslic3r/ExtrusionEntity.cpp:314 -#: src/libslic3r/ExtrusionEntity.cpp:340 src/libslic3r/PrintConfig.cpp:1958 -#: src/libslic3r/PrintConfig.cpp:1969 -msgid "Solid infill" -msgstr "Суцільне наповненнÑ" - -#: src/slic3r/GUI/GUI_Preview.cpp:235 src/libslic3r/ExtrusionEntity.cpp:315 -#: src/libslic3r/ExtrusionEntity.cpp:342 src/libslic3r/PrintConfig.cpp:2335 -#: src/libslic3r/PrintConfig.cpp:2347 -msgid "Top solid infill" -msgstr "Верхнє Ñуцільне наповненнÑ" - -#: src/slic3r/GUI/GUI_Preview.cpp:237 src/libslic3r/ExtrusionEntity.cpp:317 -#: src/libslic3r/ExtrusionEntity.cpp:346 -msgid "Bridge infill" -msgstr "МоÑтове наповненнÑ" - -#: src/slic3r/GUI/GUI_Preview.cpp:238 src/libslic3r/ExtrusionEntity.cpp:318 -#: src/libslic3r/ExtrusionEntity.cpp:348 src/libslic3r/PrintConfig.cpp:1011 -msgid "Gap fill" -msgstr "Ð—Ð°Ð¿Ð¾Ð²Ð½ÐµÐ½Ð½Ñ Ñ€Ð¾Ð·Ñ€Ð¸Ð²Ñƒ" - -#: src/slic3r/GUI/GUI_Preview.cpp:239 src/slic3r/GUI/Tab.cpp:1469 -#: src/libslic3r/ExtrusionEntity.cpp:319 src/libslic3r/ExtrusionEntity.cpp:350 -msgid "Skirt" -msgstr "ПлінтуÑ" - -#: src/slic3r/GUI/GUI_Preview.cpp:241 src/libslic3r/ExtrusionEntity.cpp:321 -#: src/libslic3r/ExtrusionEntity.cpp:354 src/libslic3r/PrintConfig.cpp:2220 -msgid "Support material interface" -msgstr "Ð†Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ Ð¿Ñ–Ð´Ñ‚Ñ€Ð¸Ð¼ÑƒÑŽÑ‡Ð¾Ð³Ð¾ матеріалу" - -#: src/slic3r/GUI/GUI_Preview.cpp:242 src/slic3r/GUI/Tab.cpp:1552 -#: src/libslic3r/ExtrusionEntity.cpp:322 src/libslic3r/ExtrusionEntity.cpp:356 -msgid "Wipe tower" -msgstr "Вежа витираннÑ" - -#: src/slic3r/GUI/GUI_Preview.cpp:1037 -msgid "Shells" -msgstr "Оболонки" - -#: src/slic3r/GUI/GUI_Preview.cpp:1038 -msgid "Tool marker" -msgstr "Маркер інÑтрументу" - -#: src/slic3r/GUI/GUI_Preview.cpp:1039 -msgid "Legend/Estimated printing time" -msgstr "Легенда / Приблизний Ñ‡Ð°Ñ Ð´Ñ€ÑƒÐºÑƒ" - -#: src/slic3r/GUI/ImGuiWrapper.cpp:804 src/slic3r/GUI/Search.cpp:386 -msgid "Use for search" -msgstr "ВикориÑтовуйте Ð´Ð»Ñ Ð¿Ð¾ÑˆÑƒÐºÑƒ" - -#: src/slic3r/GUI/ImGuiWrapper.cpp:805 src/slic3r/GUI/Search.cpp:380 -msgid "Category" -msgstr "КатегоріÑ" - -#: src/slic3r/GUI/ImGuiWrapper.cpp:807 src/slic3r/GUI/Search.cpp:382 -msgid "Search in English" -msgstr "Шукати англійÑькою мовою" - -#: src/slic3r/GUI/Jobs/ArrangeJob.cpp:145 -msgid "Arranging" -msgstr "РозташуваннÑ" - -#: src/slic3r/GUI/Jobs/ArrangeJob.cpp:175 -msgid "Could not arrange model objects! Some geometries may be invalid." -msgstr "" -"Ðе вдалоÑÑ Ñ€Ð¾Ð·Ñ‚Ð°ÑˆÑƒÐ²Ð°Ñ‚Ð¸ об’єкти моделі! ДеÑкі геометрії можуть бути невірними." - -#: src/slic3r/GUI/Jobs/ArrangeJob.cpp:181 -msgid "Arranging canceled." -msgstr "Ð Ð¾Ð·Ñ‚Ð°ÑˆÑƒÐ²Ð°Ð½Ð½Ñ ÑкаÑовано." - -#: src/slic3r/GUI/Jobs/ArrangeJob.cpp:182 -msgid "Arranging done." -msgstr "Ð Ð¾Ð·Ñ‚Ð°ÑˆÑƒÐ²Ð°Ð½Ð½Ñ Ð²Ð¸ÐºÐ¾Ð½Ð°Ð½Ð¾." - -#: src/slic3r/GUI/Jobs/Job.cpp:75 -msgid "ERROR: not enough resources to execute a new job." -msgstr "ПОМИЛКÐ: недоÑтатньо реÑурÑів Ð´Ð»Ñ Ð²Ð¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ завданнÑ." - -#: src/slic3r/GUI/Jobs/RotoptimizeJob.cpp:41 -msgid "Searching for optimal orientation" -msgstr "Пошук оптимальної орієнтації" - -#: src/slic3r/GUI/Jobs/RotoptimizeJob.cpp:73 -msgid "Orientation search canceled." -msgstr "Пошук орієнтації ÑкаÑовано." - -#: src/slic3r/GUI/Jobs/RotoptimizeJob.cpp:74 -msgid "Orientation found." -msgstr "ÐžÑ€Ñ–Ñ”Ð½Ñ‚Ð°Ñ†Ñ–Ñ Ð·Ð½Ð°Ð¹Ð´ÐµÐ½Ð°." - -#: src/slic3r/GUI/Jobs/SLAImportJob.cpp:35 -msgid "Choose SLA archive:" -msgstr "Виберіть SLA-архів:" - -#: src/slic3r/GUI/Jobs/SLAImportJob.cpp:39 -msgid "Import file" -msgstr "Імпорт файлу" - -#: src/slic3r/GUI/Jobs/SLAImportJob.cpp:46 -msgid "Import model and profile" -msgstr "Імпорт моделі та профілю" - -#: src/slic3r/GUI/Jobs/SLAImportJob.cpp:47 -msgid "Import profile only" -msgstr "Імпорт тільки профілю" - -#: src/slic3r/GUI/Jobs/SLAImportJob.cpp:48 -msgid "Import model only" -msgstr "Імпорт тільки моделі" - -#: src/slic3r/GUI/Jobs/SLAImportJob.cpp:59 -msgid "Accurate" -msgstr "Точний" - -#: src/slic3r/GUI/Jobs/SLAImportJob.cpp:60 -msgid "Balanced" -msgstr "ЗбаланÑований" - -#: src/slic3r/GUI/Jobs/SLAImportJob.cpp:61 -msgid "Quick" -msgstr "Швидко" - -#: src/slic3r/GUI/Jobs/SLAImportJob.cpp:136 -msgid "Importing SLA archive" -msgstr "Імпорт SLA-архіву" - -#: src/slic3r/GUI/Jobs/SLAImportJob.cpp:160 -msgid "Importing canceled." -msgstr "Імпорт ÑкаÑовано." - -#: src/slic3r/GUI/Jobs/SLAImportJob.cpp:161 -msgid "Importing done." -msgstr "Імпорт виконано." - -#: src/slic3r/GUI/Jobs/SLAImportJob.cpp:210 src/slic3r/GUI/Plater.cpp:2359 -msgid "You cannot load SLA project with a multi-part object on the bed" -msgstr "" -"Ви не можете завантажувати SLA-проект, що міÑтить об'єкт, Ñкий ÑкладаєтьÑÑ Ð· " -"кількох чаÑтин" - -#: src/slic3r/GUI/Jobs/SLAImportJob.cpp:211 src/slic3r/GUI/Plater.cpp:2360 -#: src/slic3r/GUI/Tab.cpp:3250 -msgid "Please check your object list before preset changing." -msgstr "" -"Будь лаÑка, перевірте Ñвій ÑпиÑок об'єктів перед тим, Ñк змінити преÑет." - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:17 src/slic3r/GUI/MainFrame.cpp:894 -msgid "Keyboard Shortcuts" -msgstr "ГарÑчі клавіши" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:69 -msgid "New project, clear plater" -msgstr "Ðовий проект, очиÑтити платер" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:70 -msgid "Open project STL/OBJ/AMF/3MF with config, clear plater" -msgstr "Відкрити проект STL / OBJ / AMF / 3MF з конфігурацією, очиÑтити Ñтіл" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:71 -msgid "Save project (3mf)" -msgstr "Зберегти проект (3mf)" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:72 -msgid "Save project as (3mf)" -msgstr "Зберегти проект Ñк (3mf)" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:73 -msgid "(Re)slice" -msgstr "(Пере)Ðарізати" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:75 -msgid "Import STL/OBJ/AMF/3MF without config, keep plater" -msgstr "Імпорт STL/OBJ/AMF/3MF без конфігурації зі збереженнÑм платеру" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:76 -msgid "Import Config from ini/amf/3mf/gcode" -msgstr "Імпорт конфігурації з INI/AMF/3MF/GCODE" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:77 -msgid "Load Config from ini/amf/3mf/gcode and merge" -msgstr "Завантажити конфігурацію з INI/AMF/3MF/GCODE та об’єднати" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:79 src/slic3r/GUI/Plater.cpp:771 -#: src/slic3r/GUI/Plater.cpp:6075 src/libslic3r/PrintConfig.cpp:3639 -msgid "Export G-code" -msgstr "ЕкÑпорт G-коду" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:80 src/slic3r/GUI/Plater.cpp:6076 -msgid "Send G-code" -msgstr "ÐадіÑÐ»Ð°Ð½Ð½Ñ G-коду" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:81 -msgid "Export config" -msgstr "ЕкÑпорт конфігурації" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:82 src/slic3r/GUI/Plater.cpp:759 -msgid "Export to SD card / Flash drive" -msgstr "ЕкÑпорт на SD-карту/флешку" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:83 -msgid "Eject SD card / Flash drive" -msgstr "Від'єднати SD-карту/флешку" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:85 -msgid "Select all objects" -msgstr "Вибрати вÑÑ– об'єкти" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:86 -msgid "Deselect all" -msgstr "СкаÑувати веÑÑŒ вибір" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:87 -msgid "Delete selected" -msgstr "Видалити вибране" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:91 -msgid "Copy to clipboard" -msgstr "Скопіювати в буфер обміну" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:92 -msgid "Paste from clipboard" -msgstr "Ð’Ñтавити з буферу обміну" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:94 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:96 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:187 -msgid "Reload plater from disk" -msgstr "Перезавантажити Ñтіл з диÑка" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:100 -msgid "Select Plater Tab" -msgstr "Вибрати вкладку Plater" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:101 -msgid "Select Print Settings Tab" -msgstr "Вибрати вкладку параметрів друку" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:102 -msgid "Select Filament Settings Tab" -msgstr "Вибрати вкладку параметрів філаменту" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:103 -msgid "Select Printer Settings Tab" -msgstr "Вибрати вкладку параметрів принтеру" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:104 -msgid "Switch to 3D" -msgstr "Переключити на 3D" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:105 -msgid "Switch to Preview" -msgstr "Переключити на ПереглÑд" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:106 -#: src/slic3r/GUI/PrintHostDialogs.cpp:176 -msgid "Print host upload queue" -msgstr "Черга Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ñ…Ð¾Ñта друку" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:107 src/slic3r/GUI/MainFrame.cpp:65 -#: src/slic3r/GUI/MainFrame.cpp:1191 -msgid "Open new instance" -msgstr "Відкрити новий екземплÑÑ€" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:109 -msgid "Camera view" -msgstr "Вид камери" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:110 -msgid "Show/Hide object/instance labels" -msgstr "Показати/Ñховати мітки об’єктів/екземплÑрів" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:112 src/slic3r/GUI/Preferences.cpp:13 -msgid "Preferences" -msgstr "Преференції" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:114 -msgid "Show keyboard shortcuts list" -msgstr "Показати ÑпиÑок гарÑчих клавіш" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:117 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:191 -msgid "Commands" -msgstr "Команди" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:122 -msgid "Add Instance of the selected object" -msgstr "Додати екземплÑÑ€ вибраного об’єкта" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:123 -msgid "Remove Instance of the selected object" -msgstr "Видалити екземплÑÑ€ вибраного об’єкта" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:124 -msgid "" -"Press to select multiple objects\n" -"or move multiple objects with mouse" -msgstr "" -"ÐатиÑніть, щоб вибрати кілька об'єктів\n" -"або переміщуйте кілька об’єктів за допомогою миші" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:125 -msgid "Press to activate selection rectangle" -msgstr "ÐатиÑніть, щоб активувати прÑмокутник виділеннÑ" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:126 -msgid "Press to activate deselection rectangle" -msgstr "ÐатиÑніть, щоб активувати прÑмокутник ÑкаÑÑƒÐ²Ð°Ð½Ð½Ñ Ð²Ð¸Ð±Ð¾Ñ€Ñƒ" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:127 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:196 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:207 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:219 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:226 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:243 -msgid "Arrow Up" -msgstr "Стрілка вгору" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:127 -msgid "Move selection 10 mm in positive Y direction" -msgstr "ПереміÑтити Ð²Ð¸Ð´Ñ–Ð»ÐµÐ½Ð½Ñ Ð½Ð° 10 мм у позитивному напрÑмку за Y" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:128 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:197 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:208 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:220 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:227 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:244 -msgid "Arrow Down" -msgstr "Стрілка вниз" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:128 -msgid "Move selection 10 mm in negative Y direction" -msgstr "ПереміÑтити Ð²Ð¸Ð´Ñ–Ð»ÐµÐ½Ð½Ñ Ð½Ð° 10 мм у негативному напрÑмку за Y" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:129 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:198 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:221 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:228 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:241 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:246 -msgid "Arrow Left" -msgstr "Стрілка вліво" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:129 -msgid "Move selection 10 mm in negative X direction" -msgstr "ПереміÑтити Ð²Ð¸Ð´Ñ–Ð»ÐµÐ½Ð½Ñ Ð½Ð° 10 мм у негативному напрÑмку за X" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:130 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:199 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:222 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:229 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:242 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:247 -msgid "Arrow Right" -msgstr "Стрілка вправо" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:130 -msgid "Move selection 10 mm in positive X direction" -msgstr "ПереміÑтити Ð²Ð¸Ð´Ñ–Ð»ÐµÐ½Ð½Ñ Ð½Ð° 10 мм у позитивному напрÑмку за X" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:131 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:132 -msgid "Any arrow" -msgstr "Будь-Ñка Ñтрілка" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:131 -msgid "Movement step set to 1 mm" -msgstr "Ð’Ñтановити крок Ð¿ÐµÑ€ÐµÐ¼Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð½Ð° 1 мм" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:132 -msgid "Movement in camera space" -msgstr "ÐŸÐµÑ€ÐµÐ¼Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð²Ñ–Ð´Ð½Ð¾Ñно камери" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:133 -msgid "Page Up" -msgstr "ÐŸÐ¾Ð¿ÐµÑ€ÐµÐ´Ð½Ñ Ñторінка" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:133 -msgid "Rotate selection 45 degrees CCW" -msgstr "Повернути вибране на 45 градуÑів за годинниковою Ñтрілкою" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:134 -msgid "Page Down" -msgstr "ÐаÑтупна Ñторінка" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:134 -msgid "Rotate selection 45 degrees CW" -msgstr "Повернути вибране на 45 градуÑів проти годинникової Ñтрілки" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:135 -msgid "Gizmo move" -msgstr "Gizmo переміщеннÑ" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:136 -msgid "Gizmo scale" -msgstr "Gizmo маÑштабуваннÑ" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:137 -msgid "Gizmo rotate" -msgstr "Gizmo обертаннÑ" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:138 -msgid "Gizmo cut" -msgstr "Gizmo розрізаннÑ" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:139 -msgid "Gizmo Place face on bed" -msgstr "Gizmo \"Поверхнею на Ñтіл\"" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:140 -msgid "Gizmo SLA hollow" -msgstr "Gizmo SLA-порожниÑÑ‚Ñ–ÑÑ‚ÑŒ" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:141 -msgid "Gizmo SLA support points" -msgstr "Gizmo точки SLA-підтримок" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:142 -msgid "Unselect gizmo or clear selection" -msgstr "СкаÑуйте вибір gizmo або очиÑÑ‚Ñ–Ñ‚ÑŒ виділеннÑ" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:143 -msgid "Change camera type (perspective, orthographic)" -msgstr "Зміна типу камери (перÑпективна, орфографічна)" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:144 -msgid "Zoom to Bed" -msgstr "Приблизити до розміру Ñтолу" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:145 -msgid "" -"Zoom to selected object\n" -"or all objects in scene, if none selected" -msgstr "" -"Приблизити до розміру об'єкту\n" -"або до вÑÑ–Ñ… об'єктів Ñцени, Ñкщо жоден не вибрано" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:146 -msgid "Zoom in" -msgstr "Приблизити" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:147 -msgid "Zoom out" -msgstr "Віддалити" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:148 -msgid "Switch between Editor/Preview" -msgstr "ÐŸÐµÑ€ÐµÐ¼Ð¸ÐºÐ°Ð½Ð½Ñ Ð¼Ñ–Ð¶ Редактором та Попереднім переглÑдом" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:149 -msgid "Collapse/Expand the sidebar" -msgstr "Згорнути/Розгорнути бічну панель" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:152 -msgid "Show/Hide 3Dconnexion devices settings dialog, if enabled" -msgstr "" -"Показати/Ñховати діалогове вікно налаштувань приÑтроїв 3Dconnexion, Ñкщо " -"такі Ñ–Ñнують" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:154 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:158 -msgid "Show/Hide 3Dconnexion devices settings dialog" -msgstr "Показати/Ñховати діалогове вікно налаштувань приÑтроїв 3Dconnexion" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:167 src/slic3r/GUI/MainFrame.cpp:331 -#: src/slic3r/GUI/MainFrame.cpp:343 -msgid "Plater" -msgstr "Платер" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:170 -msgid "All gizmos: Rotate - left mouse button; Pan - right mouse button" -msgstr "" -"Ð’ÑÑ– gizmos: Обертати — ліва кнопка миші; ÐŸÐ°Ð½Ð¾Ñ€Ð°Ð¼ÑƒÐ²Ð°Ð½Ð½Ñ â€” права кнопка миші" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:171 -msgid "Gizmo move: Press to snap by 1mm" -msgstr "Gizmo переміщеннÑ: ÐатиÑніть, щоб зафікÑувати Ð¿ÐµÑ€ÐµÐ¼Ñ–Ñ‰ÐµÐ½Ð½Ñ Ñ‡ÐµÑ€ÐµÐ· 1 мм" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:172 -msgid "Gizmo scale: Press to snap by 5%" -msgstr "Gizmo маÑштабуваннÑ: ÐатиÑніть, щоб зафікÑувати Ð¾Ð±ÐµÑ€Ñ‚Ð°Ð½Ð½Ñ Ð½Ð° 5%" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:173 -msgid "Gizmo scale: Scale selection to fit print volume" -msgstr "Gizmo маÑштабуваннÑ: МаÑштабуйте вибране відповідно до об'єму Ñтолу" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:174 -msgid "Gizmo scale: Press to activate one direction scaling" -msgstr "" -"Gizmo маÑштабуваннÑ: ÐатиÑніть, щоб активувати маÑÑˆÑ‚Ð°Ð±ÑƒÐ²Ð°Ð½Ð½Ñ Ð² одному " -"напрÑмку" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:175 -msgid "Gizmo scale: Press to scale selected objects around their own center" -msgstr "" -"Gizmo маÑштабуваннÑ: ÐатиÑніть, щоб маÑштабувати вибрані об'єкти навколо Ñ—Ñ… " -"влаÑного центру" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:176 -msgid "Gizmo rotate: Press to rotate selected objects around their own center" -msgstr "" -"Gizmo обертаннÑ: ÐатиÑніть, щоб обертати вибрані об'єкти навколо Ñ—Ñ… влаÑного " -"центру" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:179 -msgid "Gizmos" -msgstr "Ð’ÑÑ– gizmos" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:179 -msgid "" -"The following shortcuts are applicable when the specified gizmo is active" -msgstr "ÐаÑтупні гарÑчі клавіші заÑтоÑовуютьÑÑ, коли активне вказане gizmo" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:183 src/slic3r/GUI/MainFrame.cpp:1244 -msgid "Open a G-code file" -msgstr "Відкрити файл G-кода" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:185 src/slic3r/GUI/MainFrame.cpp:1142 -#: src/slic3r/GUI/MainFrame.cpp:1146 src/slic3r/GUI/MainFrame.cpp:1249 -#: src/slic3r/GUI/MainFrame.cpp:1253 -msgid "Reload the plater from disk" -msgstr "Перезавантажити Ñтіл з диÑка" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:196 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:200 -msgid "Vertical slider - Move active thumb Up" -msgstr "Вертикальний повзунок - ПереміÑтити активний повзунок вгору" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:197 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:201 -msgid "Vertical slider - Move active thumb Down" -msgstr "Вертикальний повзунок - ПереміÑтити активний повзунок вниз" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:198 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:202 -msgid "Horizontal slider - Move active thumb Left" -msgstr "Горизонтальний повзунок - ПереміÑтити активний повзунок вліво" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:199 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:203 -msgid "Horizontal slider - Move active thumb Right" -msgstr "Горизонтальний повзунок - ПереміÑтити активний повзунок вправо" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:204 -msgid "On/Off one layer mode of the vertical slider" -msgstr "Увімкнути/Вимкнути одношаровий режим вертикального повзунка" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:205 -msgid "Show/Hide Legend and Estimated printing time" -msgstr "Показати / Сховати легенду та приблизний Ñ‡Ð°Ñ Ð´Ñ€ÑƒÐºÑƒ" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:207 -msgid "Upper layer" -msgstr "Верхній шар" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:208 -msgid "Lower layer" -msgstr "Ðижній шар" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:209 -msgid "Upper Layer" -msgstr "Верхній шар" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:210 -msgid "Lower Layer" -msgstr "Ðижній шар" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:211 -msgid "Show/Hide Legend & Estimated printing time" -msgstr "Показати / Сховати легенду та приблизний Ñ‡Ð°Ñ Ð´Ñ€ÑƒÐºÑƒ" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:215 src/slic3r/GUI/Plater.cpp:4217 -#: src/slic3r/GUI/Tab.cpp:2609 -msgid "Preview" -msgstr "Попередній переглÑд" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:219 -msgid "Move active thumb Up" -msgstr "ПереміÑтити активний повзунок вгору" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:220 -msgid "Move active thumb Down" -msgstr "ПереміÑтити активний повзунок вниз" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:221 -msgid "Set upper thumb as active" -msgstr "Ð’Ñтановити активним верхній повзунок" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:222 -msgid "Set lower thumb as active" -msgstr "Ð’Ñтановити активним нижній повзунок" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:223 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:230 -msgid "Add color change marker for current layer" -msgstr "Додати маркер зміни кольору Ð´Ð»Ñ Ð¿Ð¾Ñ‚Ð¾Ñ‡Ð½Ð¾Ð³Ð¾ шару" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:224 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:231 -msgid "Delete color change marker for current layer" -msgstr "Видалити маркер зміни кольору Ð´Ð»Ñ Ð¿Ð¾Ñ‚Ð¾Ñ‡Ð½Ð¾Ð³Ð¾ шару" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:226 -msgid "Move current slider thumb Up" -msgstr "ПереміÑтити активний повзунок вгору" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:227 -msgid "Move current slider thumb Down" -msgstr "ПереміÑтити активний повзунок вниз" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:228 -msgid "Set upper thumb to current slider thumb" -msgstr "Ð’Ñтановити верхній повзунок на поточну позицію" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:229 -msgid "Set lower thumb to current slider thumb" -msgstr "Ð’Ñтановити нижній повзунок на поточну позицію" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:233 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:234 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:249 -#: src/slic3r/GUI/KBShortcutsDialog.cpp:250 -msgid "" -"Press to speed up 5 times while moving thumb\n" -"with arrow keys or mouse wheel" -msgstr "" -"ÐатиÑніть, щоб мати 5-кратне приÑÐºÐ¾Ñ€ÐµÐ½Ð½Ñ Ð¿Ñ–Ð´ Ñ‡Ð°Ñ Ñ€ÑƒÑ…Ñƒ повзунка\n" -"за допомогою клавіш зі Ñтрілками або колеÑа миші" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:237 -msgid "Vertical Slider" -msgstr "Вертикальний повзунок" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:237 -msgid "" -"The following shortcuts are applicable in G-code preview when the vertical " -"slider is active" -msgstr "" -"Ðаведені нижче гарÑчі клавіші заÑтоÑовуютьÑÑ Ñƒ переглÑді G-коду, коли " -"вертикальний повзунок активний" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:241 -msgid "Move active thumb Left" -msgstr "ПереміÑтити активний повзунок вліво" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:242 -msgid "Move active thumb Right" -msgstr "ПереміÑтити активний повзунок вправо" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:243 -msgid "Set left thumb as active" -msgstr "Ð’Ñтановити активним лівий повзунок" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:244 -msgid "Set right thumb as active" -msgstr "Ð’Ñтановити активним правий повзунок" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:246 -msgid "Move active slider thumb Left" -msgstr "ПереміÑтити активний повзунок вліво" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:247 -msgid "Move active slider thumb Right" -msgstr "ПереміÑтити активний повзунок вправо" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:253 -msgid "Horizontal Slider" -msgstr "Горизонтальний повзунок" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:253 -msgid "" -"The following shortcuts are applicable in G-code preview when the horizontal " -"slider is active" -msgstr "" -"Ðаведені нижче гарÑчі клавіші заÑтоÑовуютьÑÑ Ñƒ переглÑді G-коду, коли " -"горизонтальний повзунок активний" - -#: src/slic3r/GUI/KBShortcutsDialog.cpp:276 -msgid "Keyboard shortcuts" -msgstr "ГарÑчі клавіши" - -#: src/slic3r/GUI/MainFrame.cpp:65 src/slic3r/GUI/MainFrame.cpp:79 -#: src/slic3r/GUI/MainFrame.cpp:1191 -msgid "Open a new PrusaSlicer instance" -msgstr "Відкрити новий екземплÑÑ€ PrusaSlicer" - -#: src/slic3r/GUI/MainFrame.cpp:68 src/slic3r/GUI/MainFrame.cpp:81 -msgid "G-code preview" -msgstr "ПереглÑд G-коду" - -#: src/slic3r/GUI/MainFrame.cpp:68 src/slic3r/GUI/MainFrame.cpp:1091 -msgid "Open G-code viewer" -msgstr "Відкрити переглÑдач G-коду" - -#: src/slic3r/GUI/MainFrame.cpp:79 src/slic3r/GUI/MainFrame.cpp:1260 -msgid "Open PrusaSlicer" -msgstr "Відкрити PrusaSlicer" - -#: src/slic3r/GUI/MainFrame.cpp:81 -msgid "Open new G-code viewer" -msgstr "Відкрити новий переглÑдач G-коду" - -#: src/slic3r/GUI/MainFrame.cpp:153 -msgid "" -"Remember to check for updates at https://github.com/prusa3d/PrusaSlicer/" -"releases" -msgstr "" -"Ðе забудьте перевірити наÑвніÑÑ‚ÑŒ оновлень на https://github.com/prusa3d/" -"PrusaSlicer/releases" - -#: src/slic3r/GUI/MainFrame.cpp:510 -msgid "based on Slic3r" -msgstr "на оÑнові Slic3r" - -#: src/slic3r/GUI/MainFrame.cpp:866 -msgid "Prusa 3D &Drivers" -msgstr "Драйвери Prusa3D" - -#: src/slic3r/GUI/MainFrame.cpp:866 -msgid "Open the Prusa3D drivers download page in your browser" -msgstr "Відкрити Ñторінку Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð´Ñ€Ð°Ð¹Ð²ÐµÑ€Ñ–Ð² Prusa3D у Ñвоєму браузері" - -#: src/slic3r/GUI/MainFrame.cpp:868 -msgid "Software &Releases" -msgstr "Релізи ПЗ" - -#: src/slic3r/GUI/MainFrame.cpp:868 -msgid "Open the software releases page in your browser" -msgstr "Відкрити Ñторінку релізів PrusaEdition у Ñвоєму браузері" - -#: src/slic3r/GUI/MainFrame.cpp:874 -#, c-format -msgid "%s &Website" -msgstr "Веб-Ñайт %s" - -#: src/slic3r/GUI/MainFrame.cpp:875 -#, c-format -msgid "Open the %s website in your browser" -msgstr "Відкрити Ñторінку %s у Ñвоєму браузері" - -#: src/slic3r/GUI/MainFrame.cpp:881 -msgid "System &Info" -msgstr "Ð†Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ Ð¿Ñ€Ð¾ ÑиÑтему" - -#: src/slic3r/GUI/MainFrame.cpp:881 -msgid "Show system information" -msgstr "Показати інформацію про ÑиÑтему" - -#: src/slic3r/GUI/MainFrame.cpp:883 -msgid "Show &Configuration Folder" -msgstr "Показати папку конфігурації" - -#: src/slic3r/GUI/MainFrame.cpp:883 -msgid "Show user configuration folder (datadir)" -msgstr "Показати папку кориÑтувацької конфігурації (datadir)" - -#: src/slic3r/GUI/MainFrame.cpp:885 -msgid "Report an I&ssue" -msgstr "Повідомити про проблему" - -#: src/slic3r/GUI/MainFrame.cpp:885 -#, c-format -msgid "Report an issue on %s" -msgstr "Повідомити про проблему на %s" - -#: src/slic3r/GUI/MainFrame.cpp:888 src/slic3r/GUI/MainFrame.cpp:891 -#, c-format -msgid "&About %s" -msgstr "О %s" - -#: src/slic3r/GUI/MainFrame.cpp:888 src/slic3r/GUI/MainFrame.cpp:891 -msgid "Show about dialog" -msgstr "Показати діалог Про Slic3r" - -#: src/slic3r/GUI/MainFrame.cpp:894 -msgid "Show the list of the keyboard shortcuts" -msgstr "Показати ÑпиÑок гарÑчих клавіш" - -#: src/slic3r/GUI/MainFrame.cpp:908 -msgid "Iso" -msgstr "Iso" - -#: src/slic3r/GUI/MainFrame.cpp:908 -msgid "Iso View" -msgstr "Вид Iso" - -#. TRN To be shown in the main menu View->Top -#. TRN To be shown in Print Settings "Top solid layers" -#: src/slic3r/GUI/MainFrame.cpp:912 src/libslic3r/PrintConfig.cpp:2362 -#: src/libslic3r/PrintConfig.cpp:2371 -msgid "Top" -msgstr "Зверху" - -#: src/slic3r/GUI/MainFrame.cpp:912 -msgid "Top View" -msgstr "Вид зверху" - -#. TRN To be shown in the main menu View->Bottom -#. TRN To be shown in Print Settings "Bottom solid layers" -#. TRN To be shown in Print Settings "Top solid layers" -#: src/slic3r/GUI/MainFrame.cpp:915 src/libslic3r/PrintConfig.cpp:230 -#: src/libslic3r/PrintConfig.cpp:239 -msgid "Bottom" -msgstr "Знизу" - -#: src/slic3r/GUI/MainFrame.cpp:915 -msgid "Bottom View" -msgstr "Вид знизу" - -#: src/slic3r/GUI/MainFrame.cpp:917 -msgid "Front" -msgstr "Спереду" - -#: src/slic3r/GUI/MainFrame.cpp:917 -msgid "Front View" -msgstr "Вид Ñпереду" - -#: src/slic3r/GUI/MainFrame.cpp:919 src/libslic3r/PrintConfig.cpp:1847 -msgid "Rear" -msgstr "Ззаду" - -#: src/slic3r/GUI/MainFrame.cpp:919 -msgid "Rear View" -msgstr "Вид ззаду" - -#: src/slic3r/GUI/MainFrame.cpp:921 -msgid "Left" -msgstr "З лівого боку" - -#: src/slic3r/GUI/MainFrame.cpp:921 -msgid "Left View" -msgstr "Вид з лівого боку" - -#: src/slic3r/GUI/MainFrame.cpp:923 -msgid "Right" -msgstr "З правого боку" - -#: src/slic3r/GUI/MainFrame.cpp:923 -msgid "Right View" -msgstr "Вид з правого боку" - -#: src/slic3r/GUI/MainFrame.cpp:936 -msgid "&New Project" -msgstr "Ðовий проект" - -#: src/slic3r/GUI/MainFrame.cpp:936 -msgid "Start a new project" -msgstr "Почати новий проект" - -#: src/slic3r/GUI/MainFrame.cpp:939 -msgid "&Open Project" -msgstr "Відкрити проект" - -#: src/slic3r/GUI/MainFrame.cpp:939 -msgid "Open a project file" -msgstr "Відкрити файл проекту" - -#: src/slic3r/GUI/MainFrame.cpp:944 -msgid "Recent projects" -msgstr "ОÑтанні проекти" - -#: src/slic3r/GUI/MainFrame.cpp:953 -msgid "" -"The selected project is no longer available.\n" -"Do you want to remove it from the recent projects list?" -======= "G-код, пов'Ñзаний з цим маркером, Ñуперечить режиму друку.\n" "Ð ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ñ€Ð¸Ð·Ð²ÐµÐ´Ðµ до змін даних повзунка." @@ -7445,865 +2886,8 @@ msgstr "" #: src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:156 msgid "Simplification is currently only allowed when a single part is selected" ->>>>>>> master -msgstr "" -"Вибраний проект більше не доÑтупний.\n" -"Видалити його зі ÑпиÑку оÑтанніх проектів?" - -#: src/slic3r/GUI/MainFrame.cpp:953 src/slic3r/GUI/MainFrame.cpp:1344 -#: src/slic3r/GUI/PrintHostDialogs.cpp:274 -msgid "Error" -msgstr "Помилка" - -<<<<<<< HEAD -#: src/slic3r/GUI/MainFrame.cpp:978 -msgid "&Save Project" -msgstr "Зберегти проект" - -#: src/slic3r/GUI/MainFrame.cpp:978 -msgid "Save current project file" -msgstr "Зберегти файл поточного проекту" - -#: src/slic3r/GUI/MainFrame.cpp:982 src/slic3r/GUI/MainFrame.cpp:984 -msgid "Save Project &as" -msgstr "Зберегти проект Ñк" - -#: src/slic3r/GUI/MainFrame.cpp:982 src/slic3r/GUI/MainFrame.cpp:984 -msgid "Save current project file as" -msgstr "Зберегти файл поточного проекту Ñк" - -#: src/slic3r/GUI/MainFrame.cpp:992 -msgid "Import STL/OBJ/AM&F/3MF" -msgstr "Імпорт STL/OBJ/AMF/3MF" - -#: src/slic3r/GUI/MainFrame.cpp:992 -msgid "Load a model" -msgstr "Завантажити модель" - -#: src/slic3r/GUI/MainFrame.cpp:996 -msgid "Import STL (imperial units)" -msgstr "Імпорт SТL (в імперÑьких одиницÑÑ…)" - -#: src/slic3r/GUI/MainFrame.cpp:996 -msgid "Load an model saved with imperial units" -msgstr "Завантажити модель, збережену в імперÑьких одиницÑÑ…" - -#: src/slic3r/GUI/MainFrame.cpp:1000 -msgid "Import SL1 / SL1S archive" -msgstr "Імпорт архіву SL1 / SL1S" - -#: src/slic3r/GUI/MainFrame.cpp:1000 -msgid "Load an SL1 / Sl1S archive" -msgstr "Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð°Ñ€Ñ…Ñ–Ð²Ñƒ SL1 / Sl1S" - -#: src/slic3r/GUI/MainFrame.cpp:1005 -msgid "Import &Config" -msgstr "Імпорт конфігурації" - -#: src/slic3r/GUI/MainFrame.cpp:1005 -msgid "Load exported configuration file" -msgstr "Завантажити екÑпортований файл конфігурації" - -#: src/slic3r/GUI/MainFrame.cpp:1008 -msgid "Import Config from &project" -msgstr "Імпорт конфігурації з проекту" - -#: src/slic3r/GUI/MainFrame.cpp:1008 -msgid "Load configuration from project file" -msgstr "Завантажити конфігурацію з файлу проекту" - -#: src/slic3r/GUI/MainFrame.cpp:1012 -msgid "Import Config &Bundle" -msgstr "Імпорт пакету конфігурацій" - -#: src/slic3r/GUI/MainFrame.cpp:1012 -msgid "Load presets from a bundle" -msgstr "Завантажити Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð· пакету" - -#: src/slic3r/GUI/MainFrame.cpp:1015 -msgid "&Import" -msgstr "Імпорт" - -#: src/slic3r/GUI/MainFrame.cpp:1018 src/slic3r/GUI/MainFrame.cpp:1305 -msgid "Export &G-code" -msgstr "ЕкÑпортувати G-код" - -#: src/slic3r/GUI/MainFrame.cpp:1018 -msgid "Export current plate as G-code" -msgstr "ЕкÑпорт поточної плаÑтини Ñк G-код" - -#: src/slic3r/GUI/MainFrame.cpp:1022 src/slic3r/GUI/MainFrame.cpp:1306 -msgid "S&end G-code" -msgstr "ÐадіÑлати G-код" - -#: src/slic3r/GUI/MainFrame.cpp:1022 -msgid "Send to print current plate as G-code" -msgstr "ÐадіÑлати на принтер поточний Ñтіл Ñк G-код" - -#: src/slic3r/GUI/MainFrame.cpp:1026 -msgid "Export G-code to SD card / Flash drive" -msgstr "ЕкÑпорт G-коду на SD-карту / Флешку" - -#: src/slic3r/GUI/MainFrame.cpp:1026 -msgid "Export current plate as G-code to SD card / Flash drive" -msgstr "ЕкÑпорт поточного Ñтолу Ñк G-код на SD-карту / Флешку" - -#: src/slic3r/GUI/MainFrame.cpp:1030 -msgid "Export plate as &STL" -msgstr "ЕкÑпорт Ñтолу Ñк STL" - -#: src/slic3r/GUI/MainFrame.cpp:1030 -msgid "Export current plate as STL" -msgstr "ЕкÑпорт поточної плаÑтини Ñк STL" - -#: src/slic3r/GUI/MainFrame.cpp:1033 -msgid "Export plate as STL &including supports" -msgstr "ЕкÑпорт Ñтолу Ñк STL, включаючи підтримку" - -#: src/slic3r/GUI/MainFrame.cpp:1033 -msgid "Export current plate as STL including supports" -msgstr "ЕкÑпорт поточного Ñтолу Ñк STL, включаючи підтримку" - -#: src/slic3r/GUI/MainFrame.cpp:1036 -msgid "Export plate as &AMF" -msgstr "ЕкÑпорт Ñтолу Ñк AMF" - -#: src/slic3r/GUI/MainFrame.cpp:1036 -msgid "Export current plate as AMF" -msgstr "ЕкÑпорт поточної плаÑтини Ñк AMF" - -#: src/slic3r/GUI/MainFrame.cpp:1040 src/slic3r/GUI/MainFrame.cpp:1257 -msgid "Export &toolpaths as OBJ" -msgstr "ЕкÑпорт шлÑхів інÑтрументів Ñк OBJ" - -#: src/slic3r/GUI/MainFrame.cpp:1040 src/slic3r/GUI/MainFrame.cpp:1257 -msgid "Export toolpaths as OBJ" -msgstr "ЕкÑпорт шлÑхів інÑтрументів Ñк OBJ" - -#: src/slic3r/GUI/MainFrame.cpp:1044 -msgid "Export &Config" -msgstr "ЕкÑпортувати конфігурацію" - -#: src/slic3r/GUI/MainFrame.cpp:1044 -msgid "Export current configuration to file" -msgstr "ЕкÑпортувати поточну конфігурацію в файл" - -#: src/slic3r/GUI/MainFrame.cpp:1047 -msgid "Export Config &Bundle" -msgstr "ЕкÑпортувати пакет конфігурації" - -#: src/slic3r/GUI/MainFrame.cpp:1047 -msgid "Export all presets to file" -msgstr "ЕкÑпортувати вÑÑ– Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ñƒ файл" - -#: src/slic3r/GUI/MainFrame.cpp:1050 -msgid "Export Config Bundle With Physical Printers" -msgstr "ЕкÑпортувати пакет конфігурації, включаючи фізичні принтери" - -#: src/slic3r/GUI/MainFrame.cpp:1050 -msgid "Export all presets including physical printers to file" -msgstr "ЕкÑпортуйте вÑÑ– преÑети, включаючи фізичні принтери, у файл" - -#: src/slic3r/GUI/MainFrame.cpp:1053 -msgid "&Export" -msgstr "ЕкÑпорт" - -#: src/slic3r/GUI/MainFrame.cpp:1055 -msgid "Ejec&t SD card / Flash drive" -msgstr "Від'єднати SD-карту/флешку" - -#: src/slic3r/GUI/MainFrame.cpp:1055 -msgid "Eject SD card / Flash drive after the G-code was exported to it." msgstr "" -"Від'єднати SD-карту / Флешку піÑÐ»Ñ Ñ‚Ð¾Ð³Ð¾, Ñк на неї був екÑпортований G-код." - -#: src/slic3r/GUI/MainFrame.cpp:1063 -msgid "Quick Slice" -msgstr "Швидке нарізаннÑ" - -#: src/slic3r/GUI/MainFrame.cpp:1063 -msgid "Slice a file into a G-code" -msgstr "Ðарізати файл у G-код" - -#: src/slic3r/GUI/MainFrame.cpp:1069 -msgid "Quick Slice and Save As" -msgstr "Швидко нарізати та зберегти Ñк" - -#: src/slic3r/GUI/MainFrame.cpp:1069 -msgid "Slice a file into a G-code, save as" -msgstr "Ðарізати файл у G-код, зберегти Ñк" - -#: src/slic3r/GUI/MainFrame.cpp:1075 -msgid "Repeat Last Quick Slice" -msgstr "Повторити оÑтаннє швидке нарізаннÑ" - -#: src/slic3r/GUI/MainFrame.cpp:1075 -msgid "Repeat last quick slice" -msgstr "Повторити оÑтаннє швидке нарізаннÑ" - -#: src/slic3r/GUI/MainFrame.cpp:1083 -msgid "(Re)Slice No&w" -msgstr "(Пере)Ðарізати зараз" - -#: src/slic3r/GUI/MainFrame.cpp:1083 -msgid "Start new slicing process" -msgstr "Почати новий Ð¿Ñ€Ð¾Ñ†ÐµÑ Ð½Ð°Ñ€Ñ–Ð·Ð°Ð½Ð½Ñ" - -#: src/slic3r/GUI/MainFrame.cpp:1087 -msgid "&Repair STL file" -msgstr "Відновити STL-файл" - -#: src/slic3r/GUI/MainFrame.cpp:1087 -msgid "Automatically repair an STL file" -msgstr "Ðвтоматично відновити Ñк STL-файл" - -#: src/slic3r/GUI/MainFrame.cpp:1091 -msgid "&G-code preview" -msgstr "ПереглÑд G-коду" - -#: src/slic3r/GUI/MainFrame.cpp:1094 src/slic3r/GUI/MainFrame.cpp:1264 -msgid "&Quit" -msgstr "Вихід" - -#: src/slic3r/GUI/MainFrame.cpp:1094 src/slic3r/GUI/MainFrame.cpp:1264 -#, c-format -msgid "Quit %s" -msgstr "Вийти з %s" - -#: src/slic3r/GUI/MainFrame.cpp:1109 -msgid "&Select all" -msgstr "Вибрати вÑе" - -#: src/slic3r/GUI/MainFrame.cpp:1110 -msgid "Selects all objects" -msgstr "Видалити вÑÑ– об'єкти" - -#: src/slic3r/GUI/MainFrame.cpp:1112 -msgid "D&eselect all" -msgstr "СкаÑувати вибір уÑÑ–Ñ…" - -#: src/slic3r/GUI/MainFrame.cpp:1113 -msgid "Deselects all objects" -msgstr "СкаÑовує вибір уÑÑ–Ñ… об’єктів" -#: src/slic3r/GUI/MainFrame.cpp:1116 -msgid "&Delete selected" -msgstr "Видалити вибране" - -#: src/slic3r/GUI/MainFrame.cpp:1117 -msgid "Deletes the current selection" -msgstr "ВидалÑÑ” поточний вибір" - -#: src/slic3r/GUI/MainFrame.cpp:1119 -msgid "Delete &all" -msgstr "Видалити вÑе" - -#: src/slic3r/GUI/MainFrame.cpp:1120 -msgid "Deletes all objects" -msgstr "Видалити вÑÑ– об'єкти" - -#: src/slic3r/GUI/MainFrame.cpp:1124 -msgid "&Undo" -msgstr "Відмінити" - -#: src/slic3r/GUI/MainFrame.cpp:1127 -msgid "&Redo" -msgstr "Повторити" - -#: src/slic3r/GUI/MainFrame.cpp:1132 -msgid "&Copy" -msgstr "Копіювати" - -#: src/slic3r/GUI/MainFrame.cpp:1133 -msgid "Copy selection to clipboard" -msgstr "Скопіювати вибране в буфер обміну" - -#: src/slic3r/GUI/MainFrame.cpp:1135 -msgid "&Paste" -msgstr "Ð’Ñтавити" - -#: src/slic3r/GUI/MainFrame.cpp:1136 -msgid "Paste clipboard" -msgstr "Ð’Ñтавити буфер обміну" - -#: src/slic3r/GUI/MainFrame.cpp:1141 src/slic3r/GUI/MainFrame.cpp:1145 -#: src/slic3r/GUI/MainFrame.cpp:1248 src/slic3r/GUI/MainFrame.cpp:1252 -msgid "Re&load from disk" -msgstr "Перезавантажити з диÑка" - -#: src/slic3r/GUI/MainFrame.cpp:1151 -msgid "Searc&h" -msgstr "Пошук" - -#: src/slic3r/GUI/MainFrame.cpp:1152 -msgid "Search in settings" -msgstr "Шукайте в налаштуваннÑÑ…" - -#: src/slic3r/GUI/MainFrame.cpp:1160 -msgid "&Plater Tab" -msgstr "Вкладка Платер" - -#: src/slic3r/GUI/MainFrame.cpp:1160 -msgid "Show the plater" -msgstr "Показати plater" - -#: src/slic3r/GUI/MainFrame.cpp:1165 -msgid "P&rint Settings Tab" -msgstr "Вкладка параметрів друку" - -#: src/slic3r/GUI/MainFrame.cpp:1165 -msgid "Show the print settings" -msgstr "Показати параметри друку" - -#: src/slic3r/GUI/MainFrame.cpp:1168 src/slic3r/GUI/MainFrame.cpp:1308 -msgid "&Filament Settings Tab" -msgstr "Вкладка параметрів філаменту" - -#: src/slic3r/GUI/MainFrame.cpp:1168 -msgid "Show the filament settings" -msgstr "Показати параметри філаменту" - -#: src/slic3r/GUI/MainFrame.cpp:1172 -msgid "Print&er Settings Tab" -msgstr "Вкладка параметрів принтеру" - -#: src/slic3r/GUI/MainFrame.cpp:1172 -msgid "Show the printer settings" -msgstr "Показати параметри принтеру" - -#: src/slic3r/GUI/MainFrame.cpp:1178 -msgid "3&D" -msgstr "3&D" - -#: src/slic3r/GUI/MainFrame.cpp:1178 -msgid "Show the 3D editing view" -msgstr "Показати режим 3D-редагуваннÑ" - -#: src/slic3r/GUI/MainFrame.cpp:1181 -msgid "Pre&view" -msgstr "Попередній переглÑд" - -#: src/slic3r/GUI/MainFrame.cpp:1181 -msgid "Show the 3D slices preview" -msgstr "Показати попередній переглÑд 3D нарізки" - -#: src/slic3r/GUI/MainFrame.cpp:1187 -msgid "Print &Host Upload Queue" -msgstr "Черга Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ñ…Ð¾Ñта друку" - -#: src/slic3r/GUI/MainFrame.cpp:1187 -msgid "Display the Print Host Upload Queue window" -msgstr "Показати вікна черги Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ñ…Ð¾Ñта друку" - -#: src/slic3r/GUI/MainFrame.cpp:1201 -msgid "Show &labels" -msgstr "Показувати мітки" - -#: src/slic3r/GUI/MainFrame.cpp:1201 -msgid "Show object/instance labels in 3D scene" -msgstr "Показувати мітки об’єктів/екземплÑрів у 3D-Ñцені" - -#: src/slic3r/GUI/MainFrame.cpp:1204 -msgid "&Collapse sidebar" -msgstr "Згорнути бічну панель" - -#: src/slic3r/GUI/MainFrame.cpp:1204 src/slic3r/GUI/Plater.cpp:2248 -msgid "Collapse sidebar" -msgstr "Згорнути бічну панель" - -#: src/slic3r/GUI/MainFrame.cpp:1216 src/slic3r/GUI/MainFrame.cpp:1279 -msgid "&File" -msgstr "Файл" - -#: src/slic3r/GUI/MainFrame.cpp:1217 -msgid "&Edit" -msgstr "&РедагуваннÑ" - -#: src/slic3r/GUI/MainFrame.cpp:1218 -msgid "&Window" -msgstr "Вікно" - -#: src/slic3r/GUI/MainFrame.cpp:1219 src/slic3r/GUI/MainFrame.cpp:1280 -msgid "&View" -msgstr "Вид" - -#: src/slic3r/GUI/MainFrame.cpp:1222 src/slic3r/GUI/MainFrame.cpp:1283 -msgid "&Help" -msgstr "Допомога" - -#: src/slic3r/GUI/MainFrame.cpp:1244 -msgid "&Open G-code" -msgstr "Відкрити G-код" - -#: src/slic3r/GUI/MainFrame.cpp:1260 -msgid "Open &PrusaSlicer" -msgstr "Відкрити PrusaSlicer" - -#: src/slic3r/GUI/MainFrame.cpp:1305 -msgid "E&xport" -msgstr "ЕкÑпорт" - -#: src/slic3r/GUI/MainFrame.cpp:1306 -msgid "S&end to print" -msgstr "ÐадіÑлати на принтер" - -#: src/slic3r/GUI/MainFrame.cpp:1308 -msgid "Mate&rial Settings Tab" -msgstr "Вкладка параметрів матеріалу" - -#: src/slic3r/GUI/MainFrame.cpp:1332 -msgid "Choose a file to slice (STL/OBJ/AMF/3MF/PRUSA):" -msgstr "Вибрати файл Ð´Ð»Ñ Ð½Ð°Ñ€Ñ–Ð·Ð°Ð½Ð½Ñ (STL/OBJ/AMF/3MF/PRUSA):" - -#: src/slic3r/GUI/MainFrame.cpp:1343 -msgid "No previously sliced file." -msgstr "Ðемає попередньо нарізаного файлу." - -#: src/slic3r/GUI/MainFrame.cpp:1349 -msgid "Previously sliced file (" -msgstr "Попередньо нарізаний файл (" - -#: src/slic3r/GUI/MainFrame.cpp:1349 -msgid ") not found." -msgstr ") не знайдено." - -#: src/slic3r/GUI/MainFrame.cpp:1350 -msgid "File Not Found" -msgstr "Файл не знайдено" - -#: src/slic3r/GUI/MainFrame.cpp:1385 -#, c-format -msgid "Save %s file as:" -msgstr "Зберегти файл %s Ñк:" - -#: src/slic3r/GUI/MainFrame.cpp:1385 -msgid "SVG" -msgstr "SVG" - -#: src/slic3r/GUI/MainFrame.cpp:1385 -msgid "G-code" -msgstr "G-код" - -#: src/slic3r/GUI/MainFrame.cpp:1397 -msgid "Save zip file as:" -msgstr "Зберегти zip-файл Ñк:" - -#: src/slic3r/GUI/MainFrame.cpp:1406 src/slic3r/GUI/Plater.cpp:3017 -#: src/slic3r/GUI/Plater.cpp:5603 src/slic3r/GUI/Tab.cpp:1582 -#: src/slic3r/GUI/Tab.cpp:4122 -msgid "Slicing" -msgstr "ÐарізаннÑ" - -#. TRN "Processing input_file_basename" -#: src/slic3r/GUI/MainFrame.cpp:1408 -#, c-format -msgid "Processing %s" -msgstr "Обробка %s" - -#: src/slic3r/GUI/MainFrame.cpp:1431 -msgid "%1% was successfully sliced." -msgstr "%1% був уÑпішно нарізаний." - -#: src/slic3r/GUI/MainFrame.cpp:1433 -msgid "Slicing Done!" -msgstr "ÐÐ°Ñ€Ñ–Ð·Ð°Ð½Ð½Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¾!" - -#: src/slic3r/GUI/MainFrame.cpp:1449 -msgid "Select the STL file to repair:" -msgstr "Вибрати STL-файл Ð´Ð»Ñ Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ:" - -#: src/slic3r/GUI/MainFrame.cpp:1459 -msgid "Save OBJ file (less prone to coordinate errors than STL) as:" -msgstr "Зберегти OBJ-файл (менш Ñхильний координувати помилки, ніж STL) Ñк:" - -#: src/slic3r/GUI/MainFrame.cpp:1471 -msgid "Your file was repaired." -msgstr "Ваш файл було відновлено." - -#: src/slic3r/GUI/MainFrame.cpp:1471 src/libslic3r/PrintConfig.cpp:3739 -msgid "Repair" -msgstr "Відновити" - -#: src/slic3r/GUI/MainFrame.cpp:1485 -msgid "Save configuration as:" -msgstr "Зберегти конфігурацію Ñк:" - -#: src/slic3r/GUI/MainFrame.cpp:1504 src/slic3r/GUI/MainFrame.cpp:1568 -msgid "Select configuration to load:" -msgstr "Вибрати конфігурацію Ð´Ð»Ñ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ:" - -#: src/slic3r/GUI/MainFrame.cpp:1542 -msgid "Save presets bundle as:" -msgstr "Зберегти набір налаштувань Ñк:" - -#: src/slic3r/GUI/MainFrame.cpp:1595 -#, c-format -msgid "%d presets successfully imported." -msgstr "%d налаштувань уÑпішно імпортовано." - -#: src/slic3r/GUI/Mouse3DController.cpp:461 -msgid "3Dconnexion settings" -msgstr "Параметри 3Dconnexion" - -#: src/slic3r/GUI/Mouse3DController.cpp:472 -msgid "Device:" -msgstr "ПриÑтрій:" - -#: src/slic3r/GUI/Mouse3DController.cpp:477 -msgid "Speed:" -msgstr "ШвидкіÑÑ‚ÑŒ:" - -#: src/slic3r/GUI/Mouse3DController.cpp:480 -#: src/slic3r/GUI/Mouse3DController.cpp:501 -msgid "Translation" -msgstr "ПереміщеннÑ" - -#: src/slic3r/GUI/Mouse3DController.cpp:492 -#: src/slic3r/GUI/Mouse3DController.cpp:501 -msgid "Zoom" -msgstr "МаÑштабуваннÑ" - -#: src/slic3r/GUI/Mouse3DController.cpp:498 -msgid "Deadzone:" -msgstr "Мертва зона:" - -#: src/slic3r/GUI/Mouse3DController.cpp:513 -msgid "Options:" -msgstr "Параметри:" - -#: src/slic3r/GUI/Mouse3DController.cpp:516 -msgid "Swap Y/Z axes" -msgstr "ПомінÑти міÑцÑми оÑÑ– Y/Z" - -#: src/slic3r/GUI/MsgDialog.cpp:70 -#, c-format -msgid "%s error" -msgstr "помилка %s" - -#: src/slic3r/GUI/MsgDialog.cpp:71 -#, c-format -msgid "%s has encountered an error" -msgstr "%s виÑвив помилку" - -#: src/slic3r/GUI/MsgDialog.cpp:114 -#, c-format -msgid "%s information" -msgstr "%s інформаціÑ" - -#: src/slic3r/GUI/NotificationManager.cpp:41 -msgid "3D Mouse disconnected." -msgstr "3D миша відключена." - -#: src/slic3r/GUI/NotificationManager.cpp:44 -msgid "Configuration update is available." -msgstr "ДоÑтупне Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ ÐºÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ—." - -#: src/slic3r/GUI/NotificationManager.cpp:44 -msgid "See more." -msgstr "Див. докладніше." - -#: src/slic3r/GUI/NotificationManager.cpp:46 -msgid "New version is available." -msgstr "ДоÑтупна нова верÑÑ–Ñ." - -#: src/slic3r/GUI/NotificationManager.cpp:46 -msgid "See Releases page." -msgstr "Див. Сторінку випуÑків." - -#: src/slic3r/GUI/NotificationManager.cpp:49 -msgid "" -"You have just added a G-code for color change, but its value is empty.\n" -"To export the G-code correctly, check the \"Color Change G-code\" in " -"\"Printer Settings > Custom G-code\"" -msgstr "" -"Ви щойно додали G-код Ð´Ð»Ñ Ð·Ð¼Ñ–Ð½Ð¸ кольору, але його Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð¿Ð¾Ñ€Ð¾Ð¶Ð½Ñ”.\n" -"Щоб правильно екÑпортувати G-код, перевірте Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñƒ «G-коду зміни " -"кольору» в «Параметри принтера > КориÑтувацький G-код»" - -#: src/slic3r/GUI/NotificationManager.cpp:533 -#: src/slic3r/GUI/NotificationManager.cpp:541 -msgid "More" -msgstr "Більше" - -#: src/slic3r/GUI/NotificationManager.cpp:908 -#: src/slic3r/GUI/NotificationManager.cpp:1188 -msgid "Export G-Code." -msgstr "ЕкÑпортувати G-код." - -#: src/slic3r/GUI/NotificationManager.cpp:954 -msgid "Open Folder." -msgstr "Відкрити папку." - -#: src/slic3r/GUI/NotificationManager.cpp:993 -msgid "Eject drive" -msgstr "Від'єднати диÑк" - -#: src/slic3r/GUI/NotificationManager.cpp:1107 -#: src/slic3r/GUI/NotificationManager.cpp:1123 -#: src/slic3r/GUI/NotificationManager.cpp:1134 -msgid "ERROR:" -msgstr "ПОМИЛКÐ:" - -#: src/slic3r/GUI/NotificationManager.cpp:1112 -#: src/slic3r/GUI/NotificationManager.cpp:1127 -#: src/slic3r/GUI/NotificationManager.cpp:1142 -msgid "WARNING:" -msgstr "ЗÐСТЕРЕЖЕÐÐЯ:" - -#: src/slic3r/GUI/NotificationManager.cpp:1191 -msgid "Slicing finished." -msgstr "ÐÐ°Ñ€Ñ–Ð·Ð°Ð½Ð½Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¾." - -#: src/slic3r/GUI/NotificationManager.cpp:1233 -msgid "Exporting finished." -msgstr "ЕкÑпорт завершено." - -#: src/slic3r/GUI/ObjectDataViewModel.cpp:58 -msgid "Instances" -msgstr "ЕкземплÑри" - -#: src/slic3r/GUI/ObjectDataViewModel.cpp:62 -#: src/slic3r/GUI/ObjectDataViewModel.cpp:225 -#, c-format -msgid "Instance %d" -msgstr "ЕкземплÑÑ€ %d" - -#: src/slic3r/GUI/ObjectDataViewModel.cpp:69 src/slic3r/GUI/Tab.cpp:3969 -#: src/slic3r/GUI/Tab.cpp:4051 -msgid "Layers" -msgstr "Шари" - -#: src/slic3r/GUI/ObjectDataViewModel.cpp:96 -msgid "Range" -msgstr "Діапазон" - -#: src/slic3r/GUI/OpenGLManager.cpp:261 -#, c-format -msgid "" -"PrusaSlicer requires OpenGL 2.0 capable graphics driver to run correctly, \n" -"while OpenGL version %s, render %s, vendor %s was detected." -msgstr "" -"PrusaSlicer вимагає, щоб графічний драйвер, що підтримує OpenGL 2.0, " -"працював правильно,\n" -"але було виÑвлено OpenGL верÑÑ–Ñ— %s, Ð²Ñ–Ð´Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ %s, поÑтачальника %s." - -#: src/slic3r/GUI/OpenGLManager.cpp:264 -msgid "You may need to update your graphics card driver." -msgstr "Можливо, вам доведетьÑÑ Ð¾Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ драйвер відеокарти." - -#: src/slic3r/GUI/OpenGLManager.cpp:267 -msgid "" -"As a workaround, you may run PrusaSlicer with a software rendered 3D " -"graphics by running prusa-slicer.exe with the --sw_renderer parameter." -msgstr "" -"Як ÑпоÑіб вирішеннÑ, ви можете запуÑтити PrusaSlicer з програмним " -"забезпеченнÑм, що рендерить 3D-графіку, за допомогою Ñтарту prusa-slicer.exe " -"з параметром --sw_renderer." - -#: src/slic3r/GUI/OpenGLManager.cpp:269 -msgid "Unsupported OpenGL version" -msgstr "Ðепідтримувана верÑÑ–Ñ OpenGL" - -#: src/slic3r/GUI/OpenGLManager.cpp:277 -#, c-format -msgid "" -"Unable to load the following shaders:\n" -"%s" -msgstr "" -"Ðе вдаєтьÑÑ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸ такі шейдери:\n" -"%s" - -#: src/slic3r/GUI/OpenGLManager.cpp:278 -msgid "Error loading shaders" -msgstr "Помилка Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ ÑˆÐµÐ¹Ð´ÐµÑ€Ñ–Ð²" - -#: src/slic3r/GUI/OptionsGroup.cpp:335 -msgctxt "Layers" -msgid "Top" -msgstr "Верхні" - -#: src/slic3r/GUI/OptionsGroup.cpp:335 -msgctxt "Layers" -msgid "Bottom" -msgstr "Ðижні" - -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:51 -msgid "Delete this preset from this printer device" -msgstr "Видаліть цей преÑет з цього принтера" - -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:82 -msgid "This printer will be shown in the presets list as" -msgstr "Цей принтер буде відображатиÑÑ Ñƒ ÑпиÑку преÑетів Ñк" - -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:163 -msgid "Type here the name of your printer device" -msgstr "Введіть тут назву вашого принтера" - -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:174 -msgid "Descriptive name for the printer" -msgstr "ОпиÑова назва принтера" - -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:178 -msgid "Add preset for this printer device" -msgstr "Додати преÑет Ð´Ð»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ приÑтрою принтера" - -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:207 src/slic3r/GUI/Tab.cpp:2071 -msgid "Print Host upload" -msgstr "Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ñ…Ð¾Ñта друку" - -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:262 -msgid "Connection to printers connected via the print host failed." -msgstr "Помилка Ð¿Ñ–Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ Ð´Ð¾ принтерів, підключених через хоÑÑ‚ друку." - -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:304 -msgid "Test" -msgstr "Перевірити" - -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:309 -msgid "Could not get a valid Printer Host reference" -msgstr "Ðе вдалоÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ дійÑне поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð½Ð° хоÑÑ‚ принтера" - -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:321 -msgid "Success!" -msgstr "УÑпіх!" - -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:331 -msgid "Refresh Printers" -msgstr "Оновити принтери" - -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:358 -msgid "" -"HTTPS CA file is optional. It is only needed if you use HTTPS with a self-" -"signed certificate." -msgstr "" -"Файл HTTPS CA не Ñ” обов'Ñзковим. Це потрібно, лише Ñкщо ви викориÑтовуєте " -"HTTPS із ÑамопідпиÑаним Ñертифікатом." - -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:368 -msgid "Certificate files (*.crt, *.pem)|*.crt;*.pem|All files|*.*" -msgstr "Файли Ñертифікатів (*.crt, *.pem)|*.crt;*.pem|УÑÑ– файли|*.*" - -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:369 -msgid "Open CA certificate file" -msgstr "Відкрити файл CA Ñертифікату" - -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:397 -#: src/libslic3r/PrintConfig.cpp:124 -msgid "HTTPS CA File" -msgstr "Файл CA Ñертифікату" - -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:398 -#, c-format -msgid "" -"On this system, %s uses HTTPS certificates from the system Certificate Store " -"or Keychain." -msgstr "" -"Ðа цій ÑиÑтемі, %s викориÑтовує HTTPS-Ñертифікати з ÑиÑтемного Ñховища " -"Ñертифікатів або Keychain." - -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:399 -msgid "" -"To use a custom CA file, please import your CA file into Certificate Store / " -"Keychain." -msgstr "" -"Щоб викориÑтовувати влаÑний CA файл, будь-лаÑка, імпортуйте його у Ñховища " -"Ñертифікатів / Keychain." - -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:607 -msgid "The supplied name is empty. It can't be saved." -msgstr "Ðадане ім'Ñ Ð¿Ð¾Ñ€Ð¾Ð¶Ð½Ñ”. Ðе вдаєтьÑÑ Ð·Ð±ÐµÑ€ÐµÐ³Ñ‚Ð¸." - -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:611 -msgid "You should change the name of your printer device." -msgstr "Слід змінити ім'Ñ Ð¿Ñ€Ð¸Ñтрою." - -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:619 -msgid "Printer with name \"%1%\" already exists." -msgstr "Принтер з ім'Ñм \"%1%\" вже Ñ–Ñнує." - -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:620 -msgid "Replace?" -msgstr "Замінити?" - -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:643 -msgid "" -"Following printer preset(s) is duplicated:%1%The above preset for printer " -"\"%2%\" will be used just once." -msgstr "" -"ÐаÑтупні преÑети принтера повторюютьÑÑ:%1%Вищезазначений преÑет принтера " -"\"%2%\" буде викориÑтано лише один раз." - -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:690 -msgid "It's not possible to delete the last related preset for the printer." -msgstr "Ðеможливо видалити оÑтанній преÑет Ð´Ð»Ñ Ð¿Ñ€Ð¸Ð½Ñ‚ÐµÑ€Ð°." - -#: src/slic3r/GUI/Plater.cpp:164 -msgid "Volume" -msgstr "ОбÑÑг" - -#: src/slic3r/GUI/Plater.cpp:165 -msgid "Facets" -msgstr "Грані" - -#: src/slic3r/GUI/Plater.cpp:166 -msgid "Materials" -msgstr "Матеріали" - -#: src/slic3r/GUI/Plater.cpp:169 -msgid "Manifold" -msgstr "РізноманіттÑ" - -#: src/slic3r/GUI/Plater.cpp:219 -msgid "Sliced Info" -msgstr "Ð†Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ Ð· нарізаннÑ" - -#: src/slic3r/GUI/Plater.cpp:238 src/slic3r/GUI/Plater.cpp:1152 -msgid "Used Filament (m)" -msgstr "ВикориÑтано філаметну (м)" - -#: src/slic3r/GUI/Plater.cpp:239 src/slic3r/GUI/Plater.cpp:1164 -msgid "Used Filament (mm³)" -msgstr "ВикориÑтано філаметну (мм³)" - -#: src/slic3r/GUI/Plater.cpp:240 src/slic3r/GUI/Plater.cpp:1171 -msgid "Used Filament (g)" -msgstr "ВикориÑтано філаметну (г)" - -#: src/slic3r/GUI/Plater.cpp:241 -msgid "Used Material (unit)" -msgstr "ВикориÑтано матеріалу (одиниць)" - -#: src/slic3r/GUI/Plater.cpp:242 -msgid "Cost (money)" -msgstr "ВартіÑÑ‚ÑŒ (г.о.)" - -#: src/slic3r/GUI/Plater.cpp:244 -msgid "Number of tool changes" -msgstr "КількіÑÑ‚ÑŒ змін інÑтрументу" - -#: src/slic3r/GUI/Plater.cpp:361 -msgid "Select what kind of support do you need" -msgstr "Виберіть необхідну вам підтримку" - -#: src/slic3r/GUI/Plater.cpp:363 src/libslic3r/PrintConfig.cpp:2130 -#: src/libslic3r/PrintConfig.cpp:2925 -msgid "Support on build plate only" -msgstr "Підтримки тільки на Ñтолі" - -#: src/slic3r/GUI/Plater.cpp:364 src/slic3r/GUI/Plater.cpp:490 -msgid "For support enforcers only" -msgstr "Тільки примуÑові підтримки" - -#: src/slic3r/GUI/Plater.cpp:365 -msgid "Everywhere" -msgstr "Ð’Ñюди" - -#: src/slic3r/GUI/Plater.cpp:397 src/slic3r/GUI/Tab.cpp:1476 -msgid "Brim" -msgstr "Край" - -#: src/slic3r/GUI/Plater.cpp:399 -======= #: src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:157 #: src/slic3r/GUI/MainFrame.cpp:1162 src/slic3r/GUI/MainFrame.cpp:1619 #: src/slic3r/GUI/PrintHostDialogs.cpp:373 @@ -9020,218 +3604,10 @@ msgid "Language selection" msgstr "Вибір мови" #: src/slic3r/GUI/GUI_App.cpp:2369 ->>>>>>> master msgid "" "Switching the language will trigger application restart.\n" "You will lose content of the plater." msgstr "" -<<<<<<< HEAD -"Цей прапорець дозволÑÑ” позначити край, Ñкий буде надруковано навколо кожного " -"об'єкта на першому шарі." - -#: src/slic3r/GUI/Plater.cpp:407 -msgid "Purging volumes" -msgstr "ОбÑÑги очищеннÑ" - -#: src/slic3r/GUI/Plater.cpp:504 -msgid "Select what kind of pad do you need" -msgstr "Виберіть необхідну вам подушку" - -#: src/slic3r/GUI/Plater.cpp:506 -msgid "Below object" -msgstr "Під об’єктем" - -#: src/slic3r/GUI/Plater.cpp:507 -msgid "Around object" -msgstr "Ðавколо об'єкта" - -#: src/slic3r/GUI/Plater.cpp:757 src/slic3r/GUI/Plater.cpp:6076 -msgid "Send to printer" -msgstr "ÐадіÑлати на принтер" - -#: src/slic3r/GUI/Plater.cpp:772 src/slic3r/GUI/Plater.cpp:3017 -#: src/slic3r/GUI/Plater.cpp:5606 -msgid "Slice now" -msgstr "Ðарізати зараз" - -#: src/slic3r/GUI/Plater.cpp:927 -msgid "Hold Shift to Slice & Export G-code" -msgstr "Утримуйте Shift, щоб нарізати та екÑпортувати G-код" - -#: src/slic3r/GUI/Plater.cpp:1072 -#, c-format -msgid "%d (%d shells)" -msgstr "%d (%d оболонок)" - -#: src/slic3r/GUI/Plater.cpp:1077 -#, c-format -msgid "Auto-repaired (%d errors)" -msgstr "Ðвто-Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ (%d помилок)" - -#: src/slic3r/GUI/Plater.cpp:1080 -#, c-format -msgid "" -"%d degenerate facets, %d edges fixed, %d facets removed, %d facets added, %d " -"facets reversed, %d backwards edges" -msgstr "" -"вироджено %d грані, виправлено %d країв, вилучено %d грані, додано %d грані, " -"змінено %d грані, повернуто %d країв" - -#: src/slic3r/GUI/Plater.cpp:1090 -msgid "Yes" -msgstr "Так" - -#: src/slic3r/GUI/Plater.cpp:1111 -msgid "Used Material (ml)" -msgstr "ВикориÑтано матеріалу (мл)" - -#: src/slic3r/GUI/Plater.cpp:1114 -msgid "object(s)" -msgstr "об'єкт(и)" - -#: src/slic3r/GUI/Plater.cpp:1114 -msgid "supports and pad" -msgstr "підтримки та подушка" - -#: src/slic3r/GUI/Plater.cpp:1152 -msgid "Used Filament (in)" -msgstr "ВикориÑтано філаметну (дюйми)" - -#: src/slic3r/GUI/Plater.cpp:1154 src/slic3r/GUI/Plater.cpp:1207 -msgid "objects" -msgstr "об'єкти" - -#: src/slic3r/GUI/Plater.cpp:1154 src/slic3r/GUI/Plater.cpp:1207 -msgid "wipe tower" -msgstr "вежа витираннÑ" - -#: src/slic3r/GUI/Plater.cpp:1164 -msgid "Used Filament (in³)" -msgstr "ВикориÑтано філаметну (дюйми³)" - -#: src/slic3r/GUI/Plater.cpp:1190 -msgid "Filament at extruder %1%" -msgstr "Філамент екÑтрудеру %1%" - -#: src/slic3r/GUI/Plater.cpp:1196 -msgid "(including spool)" -msgstr "(включаючи котушку)" - -#: src/slic3r/GUI/Plater.cpp:1205 src/libslic3r/PrintConfig.cpp:822 -#: src/libslic3r/PrintConfig.cpp:2740 src/libslic3r/PrintConfig.cpp:2741 -msgid "Cost" -msgstr "ВартіÑÑ‚ÑŒ" - -#: src/slic3r/GUI/Plater.cpp:1223 -msgid "normal mode" -msgstr "нормальний режим" - -#: src/slic3r/GUI/Plater.cpp:1233 -msgid "stealth mode" -msgstr "тихий режим" - -#: src/slic3r/GUI/Plater.cpp:1404 src/slic3r/GUI/Plater.cpp:4940 -#, c-format -msgid "%s - Drop project file" -msgstr "%s - ПеретÑгнути файл проекту" - -#: src/slic3r/GUI/Plater.cpp:1411 src/slic3r/GUI/Plater.cpp:4947 -msgid "Open as project" -msgstr "Відкрити Ñк проект" - -#: src/slic3r/GUI/Plater.cpp:1412 src/slic3r/GUI/Plater.cpp:4948 -msgid "Import geometry only" -msgstr "Імпорт тільки геометрії" - -#: src/slic3r/GUI/Plater.cpp:1413 src/slic3r/GUI/Plater.cpp:4949 -msgid "Import config only" -msgstr "Імпорт тільки конфігурації" - -#: src/slic3r/GUI/Plater.cpp:1416 src/slic3r/GUI/Plater.cpp:4952 -msgid "Select an action to apply to the file" -msgstr "Виберіть дію, Ñку потрібно заÑтоÑувати до файлу" - -#: src/slic3r/GUI/Plater.cpp:1417 src/slic3r/GUI/Plater.cpp:4953 -msgid "Action" -msgstr "ДіÑ" - -#: src/slic3r/GUI/Plater.cpp:1425 src/slic3r/GUI/Plater.cpp:4961 -msgid "Don't show again" -msgstr "Ðе показувати знову" - -#: src/slic3r/GUI/Plater.cpp:1470 src/slic3r/GUI/Plater.cpp:4998 -msgid "You can open only one .gcode file at a time." -msgstr "ОдночаÑно можна відкрити лише один файл .gcode." - -#: src/slic3r/GUI/Plater.cpp:1471 src/slic3r/GUI/Plater.cpp:4999 -msgid "Drag and drop G-code file" -msgstr "ПеретÑÐ³ÑƒÐ²Ð°Ð½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñƒ G-коду" - -#: src/slic3r/GUI/Plater.cpp:1525 src/slic3r/GUI/Plater.cpp:4815 -#: src/slic3r/GUI/Plater.cpp:5053 -msgid "Import Object" -msgstr "Імпорт об'єкту" - -#: src/slic3r/GUI/Plater.cpp:1547 src/slic3r/GUI/Plater.cpp:5079 -msgid "Load File" -msgstr "Завантажити файл" - -#: src/slic3r/GUI/Plater.cpp:1552 src/slic3r/GUI/Plater.cpp:5084 -msgid "Load Files" -msgstr "Завантажити файли" - -#: src/slic3r/GUI/Plater.cpp:1655 -msgid "Fill bed" -msgstr "Заповнити Ñтіл" - -#: src/slic3r/GUI/Plater.cpp:1661 -msgid "Optimize Rotation" -msgstr "Оптимізувати обертаннÑ" - -#: src/slic3r/GUI/Plater.cpp:1667 -msgid "Import SLA archive" -msgstr "Імпорт SLÐ-архіву" - -#: src/slic3r/GUI/Plater.cpp:2130 -#, c-format -msgid "" -"Successfully unmounted. The device %s(%s) can now be safely removed from the " -"computer." -msgstr "" -"УÑпішно від'єднано. ПриÑтрій %s(%s) тепер можна безпечно вилучити з " -"комп’ютера." - -#: src/slic3r/GUI/Plater.cpp:2135 -#, c-format -msgid "Ejecting of device %s(%s) has failed." -msgstr "Ðе вдалоÑÑ Ð²Ñ–Ð´'єднати приÑтрій %s (%s)." - -#: src/slic3r/GUI/Plater.cpp:2154 -msgid "New Project" -msgstr "Ðовий проект" - -#: src/slic3r/GUI/Plater.cpp:2247 -msgid "Expand sidebar" -msgstr "Розгорнути бічну панель" - -#: src/slic3r/GUI/Plater.cpp:2320 -msgid "Loading" -msgstr "ЗавантаженнÑ" - -#: src/slic3r/GUI/Plater.cpp:2330 -msgid "Loading file" -msgstr "Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñƒ" - -#: src/slic3r/GUI/Plater.cpp:2399 -msgid "Failed loading file \"%1%\" due to an invalid configuration." -msgstr "Ðе вдалоÑÑ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸ файл \"%1%\" через неприпуÑтиму конфігурацію." - -#: src/slic3r/GUI/Plater.cpp:2423 -#, c-format -msgid "" -"Some object(s) in file %s looks like saved in inches.\n" -"Should I consider them as a saved in inches and convert them?" -======= "ÐŸÐµÑ€ÐµÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ Ð¼Ð¾Ð²Ð¸ Ñпричинить перезапуÑк програми.\n" "Ви втратите вміÑÑ‚ платеру." @@ -9316,70 +3692,8 @@ msgstr "" #: src/slic3r/GUI/GUI_App.cpp:3077 msgid "You will not be asked about it again on hyperlinks hovering." ->>>>>>> master msgstr "" -"Схоже на те, що деÑкі об’єкти у файлі %s збережені в дюймах.\n" -"Чи Ñлід розглÑдати Ñ—Ñ… Ñк збережені в дюймах Ñ– конвертувати?" - -<<<<<<< HEAD -#: src/slic3r/GUI/Plater.cpp:2425 -msgid "The object appears to be saved in inches" -msgstr "ЗдаєтьÑÑ, об’єкт був збережений у дюймах" -#: src/slic3r/GUI/Plater.cpp:2433 -msgid "" -"This file contains several objects positioned at multiple heights.\n" -"Instead of considering them as multiple objects, should I consider\n" -"this file as a single object having multiple parts?" -msgstr "" -"Цей файл міÑтить кілька об'єктів, розташованих на декількох виÑотах. \n" -"ЗаміÑÑ‚ÑŒ того, щоб розглÑдати Ñ—Ñ… Ñк кілька об'єктів, чи потрібно розглÑнути\n" -"цей файл Ñк єдиний об'єкт, що має декілька чаÑтин?" - -#: src/slic3r/GUI/Plater.cpp:2436 src/slic3r/GUI/Plater.cpp:2489 -msgid "Multi-part object detected" -msgstr "ВиÑвлено об'єкт, що ÑкладаєтьÑÑ Ð· кількох чаÑтин" - -#: src/slic3r/GUI/Plater.cpp:2443 -msgid "" -"This file cannot be loaded in a simple mode. Do you want to switch to an " -"advanced mode?" -msgstr "" -"Цей файл не можна завантажити у проÑтому режимі. Ви хочете перейти в " -"розширений режим?" - -#: src/slic3r/GUI/Plater.cpp:2444 -msgid "Detected advanced data" -msgstr "ВиÑвлено розширені дані" - -#: src/slic3r/GUI/Plater.cpp:2466 -#, c-format -msgid "" -"You can't to add the object(s) from %s because of one or some of them " -"is(are) multi-part" -msgstr "" -"Ви не можете додати об’єкт(и) із %s через те, що один або деÑкі з них " -"ÑкладаєтьÑÑ Ð· декількох чаÑтин" - -#: src/slic3r/GUI/Plater.cpp:2486 -msgid "" -"Multiple objects were loaded for a multi-material printer.\n" -"Instead of considering them as multiple objects, should I consider\n" -"these files to represent a single object having multiple parts?" -msgstr "" -"До мульти-матеріального принтеру завантажено кілька об'єктів.\n" -"ЗаміÑÑ‚ÑŒ того, щоб розглÑдати Ñ—Ñ… Ñк кілька об'єктів, чи потрібно розглÑнути\n" -"ці файл Ñк єдиний об'єкт, що має декілька чаÑтин?" - -#: src/slic3r/GUI/Plater.cpp:2502 -msgid "Loaded" -msgstr "Завантажено" - -#: src/slic3r/GUI/Plater.cpp:2604 -msgid "" -"Your object appears to be too large, so it was automatically scaled down to " -"fit your print bed." -======= #: src/slic3r/GUI/GUI_App.cpp:3078 src/slic3r/GUI/Plater.cpp:1738 #, boost-format msgid "" @@ -9458,99 +3772,8 @@ msgstr "ПраÑуваннÑ" #: src/libslic3r/PrintConfig.cpp:1261 src/libslic3r/PrintConfig.cpp:1276 #: src/libslic3r/PrintConfig.cpp:1286 msgid "Fuzzy Skin" ->>>>>>> master msgstr "" -<<<<<<< HEAD -#: src/slic3r/GUI/Plater.cpp:2605 -msgid "Object too large?" -msgstr "Об'єкт занадто великий?" - -#: src/slic3r/GUI/Plater.cpp:2667 -msgid "Export STL file:" -msgstr "ЕкÑпорт STL-файлу:" - -#: src/slic3r/GUI/Plater.cpp:2674 -msgid "Export AMF file:" -msgstr "ЕкÑпортувати AMF-файл:" - -#: src/slic3r/GUI/Plater.cpp:2680 -msgid "Save file as:" -msgstr "Зберегти файл Ñк:" - -#: src/slic3r/GUI/Plater.cpp:2686 -msgid "Export OBJ file:" -msgstr "ЕкÑпорт OBJ-файлу:" - -#: src/slic3r/GUI/Plater.cpp:2782 -msgid "Delete Object" -msgstr "Видалити об'єкт" - -#: src/slic3r/GUI/Plater.cpp:2793 -msgid "Reset Project" -msgstr "Скинути проект" - -#: src/slic3r/GUI/Plater.cpp:2865 -msgid "" -"The selected object can't be split because it contains more than one volume/" -"material." -msgstr "" -"Вибраний об'єкт не можна розділити, оÑкільки міÑтить більше одного об'єму/" -"матеріалу." - -#: src/slic3r/GUI/Plater.cpp:2876 -msgid "Split to Objects" -msgstr "Розділити на об'єкти" - -#: src/slic3r/GUI/Plater.cpp:3001 src/slic3r/GUI/Plater.cpp:3738 -msgid "Invalid data" -msgstr "Ðекоректні дані" - -#: src/slic3r/GUI/Plater.cpp:3011 -msgid "Ready to slice" -msgstr "Готово до нарізки" - -#: src/slic3r/GUI/Plater.cpp:3049 src/slic3r/GUI/PrintHostDialogs.cpp:275 -msgid "Cancelling" -msgstr "СкаÑуваннÑ" - -#: src/slic3r/GUI/Plater.cpp:3068 -msgid "Another export job is currently running." -msgstr "Ðа даний Ñ‡Ð°Ñ Ð²Ð¸ÐºÐ¾Ð½ÑƒÑ”Ñ‚ÑŒÑÑ Ñ–Ð½ÑˆÐ¸Ð¹ екÑпорт." - -#: src/slic3r/GUI/Plater.cpp:3185 -msgid "Please select the file to reload" -msgstr "Будь лаÑка, виберіть файл Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ" - -#: src/slic3r/GUI/Plater.cpp:3220 -msgid "It is not allowed to change the file to reload" -msgstr "Ðе дозволÑєтьÑÑ Ð·Ð¼Ñ–Ð½ÑŽÐ²Ð°Ñ‚Ð¸ файл Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ" - -#: src/slic3r/GUI/Plater.cpp:3220 -msgid "Do you want to retry" -msgstr "Повторити Ñпробу" - -#: src/slic3r/GUI/Plater.cpp:3238 -msgid "Reload from:" -msgstr "Перезавантажити з:" - -#: src/slic3r/GUI/Plater.cpp:3331 -msgid "Unable to reload:" -msgstr "Ðе вдаєтьÑÑ Ð¿ÐµÑ€ÐµÐ·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸:" - -#: src/slic3r/GUI/Plater.cpp:3336 -msgid "Error during reload" -msgstr "Помилка під Ñ‡Ð°Ñ Ð¿ÐµÑ€ÐµÐ·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ" - -#: src/slic3r/GUI/Plater.cpp:3355 -msgid "Reload all from disk" -msgstr "Перезавантажити вÑе з диÑка" - -#: src/slic3r/GUI/Plater.cpp:3382 -msgid "" -"ERROR: Please close all manipulators available from the left toolbar before " -"fixing the mesh." -======= #: src/slic3r/GUI/GUI_Factories.cpp:132 src/slic3r/GUI/GUI_Preview.cpp:220 #: src/slic3r/GUI/Tab.cpp:1584 src/libslic3r/PrintConfig.cpp:484 #: src/libslic3r/PrintConfig.cpp:740 src/libslic3r/PrintConfig.cpp:1303 @@ -9682,254 +3905,8 @@ msgstr "Плита" #: src/slic3r/GUI/GUI_Factories.cpp:471 msgid "Gallery" ->>>>>>> master msgstr "" -"ПОМИЛКÐ: Будь лаÑка, закрийте вÑÑ– маніпулÑтори, доÑтупні на лівій панелі " -"інÑтрументів, перш ніж фікÑувати Ñітку." - -#: src/slic3r/GUI/Plater.cpp:3388 -msgid "Fix through NetFabb" -msgstr "Виправити за допомогою NetFabb" - -#: src/slic3r/GUI/Plater.cpp:3405 -msgid "Custom supports and seams were removed after repairing the mesh." -msgstr "КориÑтувацькі підтримки та шви були видалені піÑÐ»Ñ Ñ€ÐµÐ¼Ð¾Ð½Ñ‚Ñƒ Ñітки." - -<<<<<<< HEAD -#: src/slic3r/GUI/Plater.cpp:3696 -msgid "There are active warnings concerning sliced models:" -msgstr "ІÑнують активні Ð¿Ð¾Ð¿ÐµÑ€ÐµÐ´Ð¶ÐµÐ½Ð½Ñ Ñ‰Ð¾Ð´Ð¾ нарізаних моделей:" - -#: src/slic3r/GUI/Plater.cpp:3706 -msgid "generated warnings" -msgstr "згенеровані попередженнÑ" -#: src/slic3r/GUI/Plater.cpp:3746 src/slic3r/GUI/PrintHostDialogs.cpp:276 -msgid "Cancelled" -msgstr "СкаÑовано" - -#: src/slic3r/GUI/Plater.cpp:4015 src/slic3r/GUI/Plater.cpp:4039 -msgid "Remove the selected object" -msgstr "Видалити вибраний об'єкт" - -#: src/slic3r/GUI/Plater.cpp:4024 -msgid "Add one more instance of the selected object" -msgstr "Додати ще один екземплÑÑ€ вибраного об’єкта" - -#: src/slic3r/GUI/Plater.cpp:4026 -msgid "Remove one instance of the selected object" -msgstr "Видалити один екземплÑÑ€ вибраного об’єкта" - -#: src/slic3r/GUI/Plater.cpp:4028 -msgid "Set number of instances" -msgstr "Ð’Ñтановити кількіÑÑ‚ÑŒ екземплÑрів" - -#: src/slic3r/GUI/Plater.cpp:4028 -msgid "Change the number of instances of the selected object" -msgstr "Змінити кількіÑÑ‚ÑŒ екземплÑрів виділеного об'єкта" - -#: src/slic3r/GUI/Plater.cpp:4030 -msgid "Fill bed with instances" -msgstr "Заповнити Ñтіл екземплÑрами" - -#: src/slic3r/GUI/Plater.cpp:4030 -msgid "Fill the remaining area of bed with instances of the selected object" -msgstr "Заповнити залишок Ñтолу екземплÑрами обраного об'єкта" - -#: src/slic3r/GUI/Plater.cpp:4049 -msgid "Reload the selected object from disk" -msgstr "Перезавантажити вибраний об'єкт із диÑка" - -#: src/slic3r/GUI/Plater.cpp:4052 -msgid "Export the selected object as STL file" -msgstr "ЕкÑпорт вибраного об'єкту Ñк STL-файл" - -#: src/slic3r/GUI/Plater.cpp:4082 -msgid "Along X axis" -msgstr "Уздовж оÑÑ– X" - -#: src/slic3r/GUI/Plater.cpp:4082 -msgid "Mirror the selected object along the X axis" -msgstr "Віддзеркалити виділений об'єкт уздовж оÑÑ– Ð¥" - -#: src/slic3r/GUI/Plater.cpp:4084 -msgid "Along Y axis" -msgstr "Уздовж оÑÑ– Y" - -#: src/slic3r/GUI/Plater.cpp:4084 -msgid "Mirror the selected object along the Y axis" -msgstr "Віддзеркалити виділений об'єкт уздовж оÑÑ– Y" - -#: src/slic3r/GUI/Plater.cpp:4086 -msgid "Along Z axis" -msgstr "Уздовж оÑÑ– Z" - -#: src/slic3r/GUI/Plater.cpp:4086 -msgid "Mirror the selected object along the Z axis" -msgstr "Віддзеркалити виділений об'єкт уздовж оÑÑ– Z" - -#: src/slic3r/GUI/Plater.cpp:4089 -msgid "Mirror" -msgstr "Віддзеркалити" - -#: src/slic3r/GUI/Plater.cpp:4089 -msgid "Mirror the selected object" -msgstr "Віддзеркалити виділений об'єкт" - -#: src/slic3r/GUI/Plater.cpp:4101 -msgid "To objects" -msgstr "Ðа об'єкти" - -#: src/slic3r/GUI/Plater.cpp:4101 src/slic3r/GUI/Plater.cpp:4121 -msgid "Split the selected object into individual objects" -msgstr "Розділити вибраний об'єкт на окремі об'єкти" - -#: src/slic3r/GUI/Plater.cpp:4103 -msgid "To parts" -msgstr "Ðа чаÑтини" - -#: src/slic3r/GUI/Plater.cpp:4103 src/slic3r/GUI/Plater.cpp:4139 -msgid "Split the selected object into individual sub-parts" -msgstr "Розділити вибраний об'єкт на окремі чаÑтини" - -#: src/slic3r/GUI/Plater.cpp:4106 src/slic3r/GUI/Plater.cpp:4121 -#: src/slic3r/GUI/Plater.cpp:4139 src/libslic3r/PrintConfig.cpp:3763 -msgid "Split" -msgstr "Розділити" - -#: src/slic3r/GUI/Plater.cpp:4106 -msgid "Split the selected object" -msgstr "Розділити вибраний об'єкт" - -#: src/slic3r/GUI/Plater.cpp:4128 -msgid "Optimize orientation" -msgstr "Оптимізувати орієнтацію" - -#: src/slic3r/GUI/Plater.cpp:4129 -msgid "Optimize the rotation of the object for better print results." -msgstr "Оптимізуйте Ð¾Ð±ÐµÑ€Ñ‚Ð°Ð½Ð½Ñ Ð¾Ð±â€™Ñ”ÐºÑ‚Ð° Ð´Ð»Ñ ÐºÑ€Ð°Ñ‰Ð¸Ñ… результатів друку." - -#: src/slic3r/GUI/Plater.cpp:4209 -msgid "3D editor view" -msgstr "ПереглÑд у 3D-редакторі" - -#: src/slic3r/GUI/Plater.cpp:4581 -msgid "" -"%1% printer was active at the time the target Undo / Redo snapshot was " -"taken. Switching to %1% printer requires reloading of %1% presets." -msgstr "" -"Ðа момент ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Undo/Redo знімка був активний принтер %1%. Ð”Ð»Ñ " -"Ð¿ÐµÑ€ÐµÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ Ð½Ð° принтер %1% потрібно перезавантажити преÑет %1%." - -#: src/slic3r/GUI/Plater.cpp:4787 -msgid "Load Project" -msgstr "Завантажити проект" - -#: src/slic3r/GUI/Plater.cpp:4819 -msgid "Import Objects" -msgstr "Імпорт об'єктів" - -#: src/slic3r/GUI/Plater.cpp:4885 -msgid "The selected file" -msgstr "Вибраний файл" - -#: src/slic3r/GUI/Plater.cpp:4885 -msgid "does not contain valid gcode." -msgstr "не міÑтить дійÑного G-коду." - -#: src/slic3r/GUI/Plater.cpp:4886 -msgid "Error while loading .gcode file" -msgstr "Помилка під Ñ‡Ð°Ñ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ GCODE-файлу" - -#: src/slic3r/GUI/Plater.cpp:5128 -msgid "All objects will be removed, continue?" -msgstr "УÑÑ– об’єкти буде видалено, продовжити?" - -#: src/slic3r/GUI/Plater.cpp:5136 -msgid "Delete Selected Objects" -msgstr "Видалити вибрані об'єкти" - -#: src/slic3r/GUI/Plater.cpp:5144 -msgid "Increase Instances" -msgstr "Збільшити кількіÑÑ‚ÑŒ копій" - -#: src/slic3r/GUI/Plater.cpp:5178 -msgid "Decrease Instances" -msgstr "Зменшити кількіÑÑ‚ÑŒ копій" - -#: src/slic3r/GUI/Plater.cpp:5209 -msgid "Enter the number of copies:" -msgstr "Введіть кількіÑÑ‚ÑŒ копій об'єкта:" - -#: src/slic3r/GUI/Plater.cpp:5210 -msgid "Copies of the selected object" -msgstr "КількіÑÑ‚ÑŒ копій обраного об'єкта" - -#: src/slic3r/GUI/Plater.cpp:5214 -#, c-format -msgid "Set numbers of copies to %d" -msgstr "Ð’Ñтановити кількіÑÑ‚ÑŒ копій на %d" - -#: src/slic3r/GUI/Plater.cpp:5280 -msgid "Cut by Plane" -msgstr "Вирізати площиною" - -#: src/slic3r/GUI/Plater.cpp:5338 -msgid "Save G-code file as:" -msgstr "Зберегти G-код файл Ñк:" - -#: src/slic3r/GUI/Plater.cpp:5338 -msgid "Save SL1 / SL1S file as:" -msgstr "Зберегти SL1 / SL1S файл Ñк:" - -#: src/slic3r/GUI/Plater.cpp:5485 -#, c-format -msgid "STL file exported to %s" -msgstr "STL-файл екÑпортовано в %s" - -#: src/slic3r/GUI/Plater.cpp:5502 -#, c-format -msgid "AMF file exported to %s" -msgstr "AMF-файл екÑпортовано в %s" - -#: src/slic3r/GUI/Plater.cpp:5505 -#, c-format -msgid "Error exporting AMF file %s" -msgstr "Помилка екÑÐ¿Ð¾Ñ€Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ AMF-файлу %s" - -#: src/slic3r/GUI/Plater.cpp:5534 -#, c-format -msgid "3MF file exported to %s" -msgstr "3MF-файл екÑпортовано в %s" - -#: src/slic3r/GUI/Plater.cpp:5539 -#, c-format -msgid "Error exporting 3MF file %s" -msgstr "Помилка екÑÐ¿Ð¾Ñ€Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ 3MF-файлу %s" - -#: src/slic3r/GUI/Plater.cpp:6075 -msgid "Export" -msgstr "ЕкÑпорт" - -#: src/slic3r/GUI/Plater.cpp:6170 -msgid "Paste From Clipboard" -msgstr "Ð’Ñтавити з буферу обміну" - -#: src/slic3r/GUI/Preferences.cpp:56 src/slic3r/GUI/Tab.cpp:2105 -#: src/slic3r/GUI/Tab.cpp:2292 src/slic3r/GUI/Tab.cpp:2400 -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:1080 -msgid "General" -msgstr "Загальне" - -#: src/slic3r/GUI/Preferences.cpp:69 -msgid "Remember output directory" -msgstr "Пам'Ñтати вихідний каталог" - -#: src/slic3r/GUI/Preferences.cpp:71 -msgid "" -"If this is enabled, Slic3r will prompt the last output directory instead of " -"the one containing the input files." -======= #: src/slic3r/GUI/GUI_Factories.cpp:488 src/slic3r/GUI/GUI_Factories.cpp:526 msgid "Height range Modifier" msgstr "Модифікатор діапазону виÑот" @@ -10337,28 +4314,9 @@ msgstr "Видалити діапазон виÑот" #: src/slic3r/GUI/GUI_ObjectList.cpp:1949 msgid "From Object List You can't delete the last solid part from object." ->>>>>>> master msgstr "" "Зі ÑпиÑку об’єктів Ви не можете видалити оÑтанню Ñуцільну чаÑтину з об’єкта." -<<<<<<< HEAD -#: src/slic3r/GUI/Preferences.cpp:77 -msgid "Auto-center parts" -msgstr "Ðвтоцентрувати чаÑтини" - -#: src/slic3r/GUI/Preferences.cpp:79 -msgid "" -"If this is enabled, Slic3r will auto-center objects around the print bed " -"center." -msgstr "" -"Якщо вибрано, Slic3r автоматично орієнтує об'єкти навколо центру друку." - -#: src/slic3r/GUI/Preferences.cpp:85 -msgid "Background processing" -msgstr "Фонова обробка" - -#: src/slic3r/GUI/Preferences.cpp:87 -======= #: src/slic3r/GUI/GUI_ObjectList.cpp:1953 msgid "Delete Subobject" msgstr "Видалити підоб'єкт" @@ -10372,808 +4330,11 @@ msgid "Delete Instance" msgstr "Видалити екземплÑÑ€" #: src/slic3r/GUI/GUI_ObjectList.cpp:2004 ->>>>>>> master msgid "" "The selected object couldn't be split because it contains only one part." msgstr "" "Вибраний об'єкт не можна розділити, оÑкільки він міÑтить лише одну чаÑтину." -<<<<<<< HEAD -#: src/slic3r/GUI/Preferences.cpp:96 -msgid "" -"If enabled, PrusaSlicer will check for the new versions of itself online. " -"When a new version becomes available a notification is displayed at the next " -"application startup (never during program usage). This is only a " -"notification mechanisms, no automatic installation is done." -msgstr "" -"Якщо увімкнено, PrusaSlicer перевірить наÑвніÑÑ‚ÑŒ нових верÑій в Інтернеті. " -"Коли нова верÑÑ–Ñ Ñтає доÑтупною, під Ñ‡Ð°Ñ Ð½Ð°Ñтупного запуÑку програми " -"з'ÑвитьÑÑ ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ (ніколи під Ñ‡Ð°Ñ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ð½Ð½Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¸). Це лише " -"механізми ÑповіщеннÑ, автоматична уÑтановка не виконуєтьÑÑ." - -#: src/slic3r/GUI/Preferences.cpp:102 -msgid "Export sources full pathnames to 3mf and amf" -msgstr "ЕкÑпортувати повні назви шлÑхів до 3MF та amf" - -#: src/slic3r/GUI/Preferences.cpp:104 -msgid "" -"If enabled, allows the Reload from disk command to automatically find and " -"load the files when invoked." -msgstr "" -"Якщо увімкнено, дозволÑÑ” команді Перезавантажити з диÑка автоматично " -"знаходити Ñ– завантажувати файли під Ñ‡Ð°Ñ Ð²Ð¸ÐºÐ»Ð¸ÐºÑƒ." - -#: src/slic3r/GUI/Preferences.cpp:114 -msgid "If enabled, sets PrusaSlicer as default application to open .3mf files." -msgstr "" -"Якщо увімкнено, вÑтановлює PrusaSlicer Ñк типову програму Ð´Ð»Ñ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ñ‚Ñ 3MF-" -"файлів." - -#: src/slic3r/GUI/Preferences.cpp:121 -msgid "If enabled, sets PrusaSlicer as default application to open .stl files." -msgstr "" -"Якщо ввімкнено, програма PrusaSlicer за промовчаннÑм відкриває STL-файли." - -#: src/slic3r/GUI/Preferences.cpp:131 -msgid "" -"If enabled, Slic3r downloads updates of built-in system presets in the " -"background. These updates are downloaded into a separate temporary location. " -"When a new preset version becomes available it is offered at application " -"startup." -msgstr "" -"Якщо цей параметр увімкнено, Slic3r завантажує Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð²Ð±ÑƒÐ´Ð¾Ð²Ð°Ð½Ð¸Ñ… преÑетів " -"ÑиÑтеми у фоновому режимі. Ці Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÑƒÑŽÑ‚ÑŒÑÑ Ð² окреме тимчаÑове " -"міÑце розташуваннÑ. Коли нова верÑÑ–Ñ Ð¿Ñ€ÐµÑетів Ñтає доÑтупною, вона " -"пропонуєтьÑÑ Ð¿Ñ–Ð´ Ñ‡Ð°Ñ Ð·Ð°Ð¿ÑƒÑку додатка." - -#: src/slic3r/GUI/Preferences.cpp:136 -msgid "Suppress \" - default - \" presets" -msgstr "Заборонити Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ \"- за замовчуваннÑм -\"" - -#: src/slic3r/GUI/Preferences.cpp:138 -msgid "" -"Suppress \" - default - \" presets in the Print / Filament / Printer " -"selections once there are any other valid presets available." -msgstr "" -"Заборонити Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ \"- за замовчуваннÑм -\" у параметрах Друк / " -"Філамент / Принтер, Ñкщо доÑтупні інші діючі налаштуваннÑ." - -#: src/slic3r/GUI/Preferences.cpp:144 -msgid "Show incompatible print and filament presets" -msgstr "Показувати неÑуміÑні Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ñ€ÑƒÐºÑƒ та філаменту" - -#: src/slic3r/GUI/Preferences.cpp:146 -msgid "" -"When checked, the print and filament presets are shown in the preset editor " -"even if they are marked as incompatible with the active printer" -msgstr "" -"Якщо вибрано, преÑети Ð´Ð»Ñ Ð´Ñ€ÑƒÐºÑƒ та філаменту відображаютьÑÑ Ñƒ ÑпиÑку " -"преÑетів, навіть Ñкщо вони позначені Ñк неÑуміÑні з активним принтером" - -#: src/slic3r/GUI/Preferences.cpp:152 -msgid "Show drop project dialog" -msgstr "Показати діалогове вікно при перетÑгуванні проекту" - -#: src/slic3r/GUI/Preferences.cpp:154 -msgid "" -"When checked, whenever dragging and dropping a project file on the " -"application, shows a dialog asking to select the action to take on the file " -"to load." -msgstr "" -"Якщо вибрано, при перетÑгуванні файлу проекту у програмі відображаєтьÑÑ " -"діалогове вікно із запитом вибрати дію щодо файлу, Ñкий потрібно завантажити." - -#: src/slic3r/GUI/Preferences.cpp:161 src/slic3r/GUI/Preferences.cpp:165 -msgid "Allow just a single PrusaSlicer instance" -msgstr "Дозволити лише один екземплÑÑ€ PrusaSlicer" - -#: src/slic3r/GUI/Preferences.cpp:163 -msgid "" -"On OSX there is always only one instance of app running by default. However " -"it is allowed to run multiple instances of same app from the command line. " -"In such case this settings will allow only one instance." -msgstr "" -"Ðа OSX завжди Ñ” лише один екземплÑÑ€ програми, Ñкий працює за замовчуваннÑм. " -"Однак дозволÑєтьÑÑ Ð·Ð°Ð¿ÑƒÑкати кілька екземплÑрів одного додатка з командного " -"Ñ€Ñдка. У такому випадку ці Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ð¾Ð·Ð²Ð¾Ð»ÑÑ‚ÑŒ лише один екземплÑÑ€." - -#: src/slic3r/GUI/Preferences.cpp:167 -msgid "" -"If this is enabled, when starting PrusaSlicer and another instance of the " -"same PrusaSlicer is already running, that instance will be reactivated " -"instead." -msgstr "" -"Якщо увімкнено, то під Ñ‡Ð°Ñ Ð·Ð°Ð¿ÑƒÑку нового екземплÑра PrusaSlicer при " -"наÑвноÑÑ‚Ñ– вже запущеного того Ñамого PrusaSlicer, буде тільки повторно " -"активовано Ñтарий екземплÑÑ€." - -#: src/slic3r/GUI/Preferences.cpp:173 -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:671 -msgid "Ask for unsaved changes when closing application" -msgstr "Питати про незбережені зміни при закритті програми" - -#: src/slic3r/GUI/Preferences.cpp:175 -msgid "When closing the application, always ask for unsaved changes" -msgstr "Завжди питати про незбережені зміни при закритті програми" - -#: src/slic3r/GUI/Preferences.cpp:180 -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:672 -msgid "Ask for unsaved changes when selecting new preset" -msgstr "Питати про незбережені зміни при виборі нового преÑету" - -#: src/slic3r/GUI/Preferences.cpp:182 -msgid "Always ask for unsaved changes when selecting new preset" -msgstr "Завжди запитуйте про незбережені зміни при виборі нового преÑету" - -#: src/slic3r/GUI/Preferences.cpp:190 -msgid "Associate .gcode files to PrusaSlicer G-code Viewer" -msgstr "Зв’Ñзати gcode-файли з PrusaSlicer ПереглÑдачем G-коду" - -#: src/slic3r/GUI/Preferences.cpp:192 -msgid "" -"If enabled, sets PrusaSlicer G-code Viewer as default application to open ." -"gcode files." -msgstr "" -"Якщо увімкнено, вÑтановлює \"PrusaSlicer ПереглÑдач G-коду\" Ñк програму за " -"замовчуваннÑм Ð´Ð»Ñ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ñ‚Ñ GCODE-файлів." - -#: src/slic3r/GUI/Preferences.cpp:201 -msgid "Use Retina resolution for the 3D scene" -msgstr "ВикориÑтовувати роздільну здатніÑÑ‚ÑŒ Retina Ð´Ð»Ñ 3D Ñцени" - -#: src/slic3r/GUI/Preferences.cpp:203 -msgid "" -"If enabled, the 3D scene will be rendered in Retina resolution. If you are " -"experiencing 3D performance problems, disabling this option may help." -msgstr "" -"Якщо увімкнено, 3D-Ñцена відображатиметьÑÑ Ð· роздільною здатніÑÑ‚ÑŽ Retina. " -"Якщо у Ð²Ð°Ñ Ð²Ð¸Ð½Ð¸ÐºÐ°ÑŽÑ‚ÑŒ проблеми з продуктивніÑÑ‚ÑŽ 3D, Ð²Ð¸Ð¼ÐºÐ½ÐµÐ½Ð½Ñ Ñ†Ñ–Ñ”Ñ— опції може " -"допомогти." - -#: src/slic3r/GUI/Preferences.cpp:211 src/slic3r/GUI/Preferences.cpp:213 -msgid "Show splash screen" -msgstr "Показувати заÑтавку" - -#: src/slic3r/GUI/Preferences.cpp:220 -msgid "Enable support for legacy 3DConnexion devices" -msgstr "Увімкнути підтримку заÑтарілих приÑтроїв 3DConnexion" - -#: src/slic3r/GUI/Preferences.cpp:222 -msgid "" -"If enabled, the legacy 3DConnexion devices settings dialog is available by " -"pressing CTRL+M" -msgstr "" -"Якщо увімкнено, діалогове вікно налаштувань приÑтроїв 3DConnexion доÑтупне, " -"натиÑнувши CTRL+M" - -#: src/slic3r/GUI/Preferences.cpp:232 -msgid "Camera" -msgstr "Камера" - -#: src/slic3r/GUI/Preferences.cpp:237 -msgid "Use perspective camera" -msgstr "ВикориÑтовувати перÑпективну камеру" - -#: src/slic3r/GUI/Preferences.cpp:239 -msgid "" -"If enabled, use perspective camera. If not enabled, use orthographic camera." -msgstr "" -"Якщо увімкнено, викориÑтовуватиметьÑÑ Ð¿ÐµÑ€Ñпективна камера. Якщо вимкнено, " -"викориÑтовуватиметьÑÑ Ð¾Ñ€Ñ‚Ð¾Ð³Ñ€Ð°Ñ„Ñ–Ñ‡Ð½Ð° камера." - -#: src/slic3r/GUI/Preferences.cpp:244 -msgid "Use free camera" -msgstr "ВикориÑтовувати вільну камеру" - -#: src/slic3r/GUI/Preferences.cpp:246 -msgid "If enabled, use free camera. If not enabled, use constrained camera." -msgstr "" -"Якщо увімкнено, викориÑтовуватиметьÑÑ Ð²Ñ–Ð»ÑŒÐ½Ð° камера. Якщо вимкнено, " -"викориÑтовуватиметьÑÑ ÐºÐ°Ð¼ÐµÑ€Ð° з обмеженими можливоÑÑ‚Ñми." - -#: src/slic3r/GUI/Preferences.cpp:251 -msgid "Reverse direction of zoom with mouse wheel" -msgstr "Зворотний напрÑмок маÑÑˆÑ‚Ð°Ð±ÑƒÐ²Ð°Ð½Ð½Ñ Ð·Ð° допомогою колеÑа миші" - -#: src/slic3r/GUI/Preferences.cpp:253 -msgid "If enabled, reverses the direction of zoom with mouse wheel" -msgstr "Якщо увімкнено, змінює напрÑмок маÑÑˆÑ‚Ð°Ð±ÑƒÐ²Ð°Ð½Ð½Ñ Ð·Ð° допомогою колеÑа миші" - -#: src/slic3r/GUI/Preferences.cpp:261 -msgid "GUI" -msgstr "Графічний інтерфейÑ" - -#: src/slic3r/GUI/Preferences.cpp:276 -msgid "Sequential slider applied only to top layer" -msgstr "ПоÑлідовний повзунок заÑтоÑовуєтьÑÑ Ð»Ð¸ÑˆÐµ до верхнього шару" - -#: src/slic3r/GUI/Preferences.cpp:278 -msgid "" -"If enabled, changes made using the sequential slider, in preview, apply only " -"to gcode top layer. If disabled, changes made using the sequential slider, " -"in preview, apply to the whole gcode." -msgstr "" -"Якщо увімкнено, зміни, внеÑені за допомогою поÑлідовного повзунка, у " -"попередньому переглÑді заÑтоÑовуютьÑÑ Ð»Ð¸ÑˆÐµ до верхнього шару G-коду. Якщо " -"вимкнено, зміни, внеÑені за допомогою поÑлідовного повзунка, у попередньому " -"переглÑді заÑтоÑовуютьÑÑ Ð´Ð¾ цілого G-коду." - -#: src/slic3r/GUI/Preferences.cpp:285 -msgid "Show sidebar collapse/expand button" -msgstr "Показувати кнопку згортаннÑ/Ñ€Ð¾Ð·Ð³Ð¾Ñ€Ñ‚Ð°Ð½Ð½Ñ Ð±Ñ–Ñ‡Ð½Ð¾Ñ— панелі" - -#: src/slic3r/GUI/Preferences.cpp:287 -msgid "" -"If enabled, the button for the collapse sidebar will be appeared in top " -"right corner of the 3D Scene" -msgstr "" -"Якщо увімкнено, у верхньому правому куті 3D-Ñцени з’ÑвитьÑÑ ÐºÐ½Ð¾Ð¿ÐºÐ° Ð·Ð³Ð¾Ñ€Ñ‚Ð°Ð½Ð½Ñ " -"бічної панелі" - -#: src/slic3r/GUI/Preferences.cpp:292 -msgid "Suppress to open hyperlink in browser" -msgstr "Заборонити Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ð³Ñ–Ð¿ÐµÑ€Ð¿Ð¾Ñилань у браузері" - -#: src/slic3r/GUI/Preferences.cpp:294 -msgid "" -"If enabled, the descriptions of configuration parameters in settings tabs " -"wouldn't work as hyperlinks. If disabled, the descriptions of configuration " -"parameters in settings tabs will work as hyperlinks." -msgstr "" -"Якщо увімкнено, опиÑи параметрів конфігурації на вкладках параметрів не " -"працюватимуть Ñк гіперпоÑиланнÑ. Якщо вимкнено, опиÑи параметрів " -"конфігурації на вкладках параметрів працюватимуть Ñк гіперпоÑиланнÑ." - -#: src/slic3r/GUI/Preferences.cpp:300 -msgid "Use custom size for toolbar icons" -msgstr "" -"ВикориÑтовуйте кориÑтувацький розмір Ð´Ð»Ñ Ð¿Ñ–ÐºÑ‚Ð¾Ð³Ñ€Ð°Ð¼ на панелі інÑтрументів" - -#: src/slic3r/GUI/Preferences.cpp:302 -msgid "If enabled, you can change size of toolbar icons manually." -msgstr "" -"Якщо увімкнено, ви можете змінювати розмір піктограм на панелі інÑтрументів " -"вручну." - -#: src/slic3r/GUI/Preferences.cpp:320 -msgid "Render" -msgstr "Візуалізувати" - -#: src/slic3r/GUI/Preferences.cpp:325 -msgid "Use environment map" -msgstr "ВикориÑтовуйте карту Ñередовища" - -#: src/slic3r/GUI/Preferences.cpp:327 -msgid "If enabled, renders object using the environment map." -msgstr "Якщо увімкнено, візуалізує об’єкт за допомогою карти Ñередовища." - -#: src/slic3r/GUI/Preferences.cpp:352 -#, c-format -msgid "You need to restart %s to make the changes effective." -msgstr "З метою ефективноÑÑ‚Ñ– зміни, Вам потрібно буде перезапуÑтити %s." - -#: src/slic3r/GUI/Preferences.cpp:427 -msgid "Icon size in a respect to the default size" -msgstr "Розмір піктограми відноÑно розміру за промовчаннÑм" - -#: src/slic3r/GUI/Preferences.cpp:442 -msgid "Select toolbar icon size in respect to the default one." -msgstr "" -"Виберіть розмір піктограми панелі інÑтрументів щодо розміру за замовчуваннÑм." - -#: src/slic3r/GUI/Preferences.cpp:473 -msgid "Old regular layout with the tab bar" -msgstr "Старий звичайний макет із панеллю вкладок" - -#: src/slic3r/GUI/Preferences.cpp:474 -msgid "New layout, access via settings button in the top menu" -msgstr "Ðове розташуваннÑ, доÑтуп через кнопку налаштувань у верхньому меню" - -#: src/slic3r/GUI/Preferences.cpp:475 -msgid "Settings in non-modal window" -msgstr "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ñƒ немодальному вікні" - -#: src/slic3r/GUI/Preferences.cpp:484 -msgid "Layout Options" -msgstr "Параметри розташуваннÑ" - -#: src/slic3r/GUI/PresetComboBoxes.cpp:224 -#: src/slic3r/GUI/PresetComboBoxes.cpp:262 -#: src/slic3r/GUI/PresetComboBoxes.cpp:788 -#: src/slic3r/GUI/PresetComboBoxes.cpp:838 -#: src/slic3r/GUI/PresetComboBoxes.cpp:959 -#: src/slic3r/GUI/PresetComboBoxes.cpp:1003 -msgid "System presets" -msgstr "СиÑтемні налаштуваннÑ" - -#: src/slic3r/GUI/PresetComboBoxes.cpp:266 -#: src/slic3r/GUI/PresetComboBoxes.cpp:842 -#: src/slic3r/GUI/PresetComboBoxes.cpp:1007 -msgid "User presets" -msgstr "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ ÐºÐ¾Ñ€Ð¸Ñтувача" - -#: src/slic3r/GUI/PresetComboBoxes.cpp:277 -msgid "Incompatible presets" -msgstr "ÐеÑуміÑні преÑети" - -#: src/slic3r/GUI/PresetComboBoxes.cpp:312 -msgid "Are you sure you want to delete \"%1%\" printer?" -msgstr "Ви впевнені, що хочете видалити принтер \"%1%\"?" - -#: src/slic3r/GUI/PresetComboBoxes.cpp:314 -msgid "Delete Physical Printer" -msgstr "Видалити фізичний принтер" - -#: src/slic3r/GUI/PresetComboBoxes.cpp:651 -msgid "Click to edit preset" -msgstr "Клацніть, щоб змінити преÑет" - -#: src/slic3r/GUI/PresetComboBoxes.cpp:707 -#: src/slic3r/GUI/PresetComboBoxes.cpp:737 -msgid "Add/Remove presets" -msgstr "Додати/Видалити преÑети" - -#: src/slic3r/GUI/PresetComboBoxes.cpp:712 -#: src/slic3r/GUI/PresetComboBoxes.cpp:742 src/slic3r/GUI/Tab.cpp:2997 -msgid "Add physical printer" -msgstr "Додати фізичний принтер" - -#: src/slic3r/GUI/PresetComboBoxes.cpp:726 -msgid "Edit preset" -msgstr "Редагувати преÑет" - -#: src/slic3r/GUI/PresetComboBoxes.cpp:730 src/slic3r/GUI/Tab.cpp:2997 -msgid "Edit physical printer" -msgstr "Редагувати фізичний принтер" - -#: src/slic3r/GUI/PresetComboBoxes.cpp:733 -msgid "Delete physical printer" -msgstr "Видалити фізичний принтер" - -#: src/slic3r/GUI/PresetComboBoxes.cpp:853 -#: src/slic3r/GUI/PresetComboBoxes.cpp:1021 -msgid "Physical printers" -msgstr "Фізичний принтер" - -#: src/slic3r/GUI/PresetComboBoxes.cpp:877 -msgid "Add/Remove filaments" -msgstr "Додати/Видалити філаменти" - -#: src/slic3r/GUI/PresetComboBoxes.cpp:879 -msgid "Add/Remove materials" -msgstr "Додати/Видалити матеріали" - -#: src/slic3r/GUI/PresetComboBoxes.cpp:881 -#: src/slic3r/GUI/PresetComboBoxes.cpp:1045 -msgid "Add/Remove printers" -msgstr "Додати/Видалити прінтери" - -#: src/slic3r/GUI/PresetHints.cpp:32 -msgid "" -"If estimated layer time is below ~%1%s, fan will run at %2%%% and print " -"speed will be reduced so that no less than %3%s are spent on that layer " -"(however, speed will never be reduced below %4%mm/s)." -msgstr "" -"Якщо передбачуваний Ñ‡Ð°Ñ ÑˆÐ°Ñ€Ñƒ менше ~%1%s, вентилÑтор працюватиме на %2%%% Ñ– " -"швидкіÑÑ‚ÑŒ друку буде зменшена, так що на цей шар буде витрачено не менше " -"%3%s (однак швидкіÑÑ‚ÑŒ ніколи не зменшитьÑÑ Ð½Ð¸Ð¶Ñ‡Ðµ %4%мм/Ñ)." - -#: src/slic3r/GUI/PresetHints.cpp:39 -msgid "" -"If estimated layer time is greater, but still below ~%1%s, fan will run at a " -"proportionally decreasing speed between %2%%% and %3%%%." -msgstr "" -"Якщо передбачуваний Ñ‡Ð°Ñ ÑˆÐ°Ñ€Ñƒ більше, але вÑе ще менше ~%1%s, вентилÑтор " -"працюватиме із пропорційно зменшуваною швидкіÑÑ‚ÑŽ між %2%%% Ñ– %3%%%." - -#: src/slic3r/GUI/PresetHints.cpp:49 -msgid "Fan speed will be ramped from zero at layer %1% to %2%%% at layer %3%." -msgstr "" -"ШвидкіÑÑ‚ÑŒ вентилÑтора буде збільшена з Ð½ÑƒÐ»Ñ Ð½Ð° шарі %1% до %2%%% на шарі %3%." - -#: src/slic3r/GUI/PresetHints.cpp:51 -msgid "During the other layers, fan will always run at %1%%%" -msgstr "Під Ñ‡Ð°Ñ Ñ–Ð½ÑˆÐ¸Ñ… шарів вентилÑтор завжди працюватиме на %1%%%" - -#: src/slic3r/GUI/PresetHints.cpp:51 -msgid "Fan will always run at %1%%%" -msgstr "ВентилÑтор завжди працюватиме на %1%%%" - -#: src/slic3r/GUI/PresetHints.cpp:53 -msgid "except for the first %1% layers." -msgstr "за винÑтком перших %1% шарів." - -#: src/slic3r/GUI/PresetHints.cpp:55 -msgid "except for the first layer." -msgstr "за винÑтком першого шару." - -#: src/slic3r/GUI/PresetHints.cpp:58 -msgid "During the other layers, fan will be turned off." -msgstr "Під Ñ‡Ð°Ñ Ñ–Ð½ÑˆÐ¸Ñ… шарів вентилÑтор буде вимкнено." - -#: src/slic3r/GUI/PresetHints.cpp:58 -msgid "Fan will be turned off." -msgstr "ВентилÑтор буде вимкнено." - -#: src/slic3r/GUI/PresetHints.cpp:159 -msgid "external perimeters" -msgstr "зовнішні периметри" - -#: src/slic3r/GUI/PresetHints.cpp:168 -msgid "perimeters" -msgstr "периметри" - -#: src/slic3r/GUI/PresetHints.cpp:177 -msgid "infill" -msgstr "наповненнÑ" - -#: src/slic3r/GUI/PresetHints.cpp:187 -msgid "solid infill" -msgstr "Ñуцільне наповненнÑ" - -#: src/slic3r/GUI/PresetHints.cpp:195 -msgid "top solid infill" -msgstr "верхній Ñуцільне наповненнÑ" - -#: src/slic3r/GUI/PresetHints.cpp:206 -msgid "support" -msgstr "підтримка" - -#: src/slic3r/GUI/PresetHints.cpp:216 -msgid "support interface" -msgstr "Ñ–Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ Ð¿Ñ–Ð´Ñ‚Ñ€Ð¸Ð¼ÐºÐ¸" - -#: src/slic3r/GUI/PresetHints.cpp:222 -msgid "First layer volumetric" -msgstr "Об'єм першого шару" - -#: src/slic3r/GUI/PresetHints.cpp:222 -msgid "Bridging volumetric" -msgstr "Об'єм моÑтів" - -#: src/slic3r/GUI/PresetHints.cpp:222 -msgid "Volumetric" -msgstr "Об'ємний" - -#: src/slic3r/GUI/PresetHints.cpp:223 -msgid "flow rate is maximized" -msgstr "швидкіÑÑ‚ÑŒ потоку макÑимізуєтьÑÑ" - -#: src/slic3r/GUI/PresetHints.cpp:226 -msgid "by the print profile maximum" -msgstr "за профілем друку макÑимум" - -#: src/slic3r/GUI/PresetHints.cpp:227 -msgid "when printing" -msgstr "коли друкуємо" - -#: src/slic3r/GUI/PresetHints.cpp:228 -msgid "with a volumetric rate" -msgstr "з об'ємною швидкіÑÑ‚ÑŽ" - -#: src/slic3r/GUI/PresetHints.cpp:232 -#, c-format -msgid "%3.2f mm³/s at filament speed %3.2f mm/s." -msgstr "%3.2f мм³/Ñ Ð¿Ñ€Ð¸ швидкоÑÑ‚Ñ– філаменту %3.2f мм/Ñ." - -#: src/slic3r/GUI/PresetHints.cpp:250 -msgid "" -"Recommended object thin wall thickness: Not available due to invalid layer " -"height." -msgstr "" -"Рекомендована товщина Ñтінки об'єкту: ÐедоÑтупний через невірне Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ " -"виÑоти шару." - -#: src/slic3r/GUI/PresetHints.cpp:266 -#, c-format -msgid "Recommended object thin wall thickness for layer height %.2f and" -msgstr "Рекомендована товщина Ñтінки об'єкту Ð´Ð»Ñ Ð²Ð¸Ñоти шару %.2f та" - -#: src/slic3r/GUI/PresetHints.cpp:273 -#, c-format -msgid "%d lines: %.2f mm" -msgstr "%d Ñ€Ñдків: %.2f мм" - -#: src/slic3r/GUI/PresetHints.cpp:277 -msgid "" -"Recommended object thin wall thickness: Not available due to excessively " -"small extrusion width." -msgstr "" -"Рекомендована товщина Ñтінки об'єкту: ÐедоÑтупний через надмірно малу ширину " -"екÑтрузії." - -#: src/slic3r/GUI/PresetHints.cpp:306 -msgid "" -"Top / bottom shell thickness hint: Not available due to invalid layer height." -msgstr "" -"Підказка щодо товщини верхньої/нижньої оболонки: ÐедоÑтупна через " -"неправильну виÑоту шару." - -#: src/slic3r/GUI/PresetHints.cpp:319 -msgid "Top shell is %1% mm thick for layer height %2% mm." -msgstr "Ð’ÐµÑ€Ñ…Ð½Ñ Ð¾Ð±Ð¾Ð»Ð¾Ð½ÐºÐ° має товщину %1% мм Ð´Ð»Ñ Ð²Ð¸Ñоти шару %2% мм." - -#: src/slic3r/GUI/PresetHints.cpp:322 -msgid "Minimum top shell thickness is %1% mm." -msgstr "Мінімальна товщина верхньої оболонки Ñтановить %1% мм." - -#: src/slic3r/GUI/PresetHints.cpp:325 -msgid "Top is open." -msgstr "Верх відкритий." - -#: src/slic3r/GUI/PresetHints.cpp:338 -msgid "Bottom shell is %1% mm thick for layer height %2% mm." -msgstr "ÐÐ¸Ð¶Ð½Ñ Ð¾Ð±Ð¾Ð»Ð¾Ð½ÐºÐ° має товщину %1% мм Ð´Ð»Ñ Ð²Ð¸Ñоти шару %2% мм." - -#: src/slic3r/GUI/PresetHints.cpp:341 -msgid "Minimum bottom shell thickness is %1% mm." -msgstr "Мінімальна товщина нижньої оболонки Ñтановить %1% мм." - -#: src/slic3r/GUI/PresetHints.cpp:344 -msgid "Bottom is open." -msgstr "Внизу відкрито." - -#: src/slic3r/GUI/PrintHostDialogs.cpp:35 -msgid "Send G-Code to printer host" -msgstr "ÐадіÑÐ»Ð°Ð½Ð½Ñ G-коду на хоÑÑ‚ друку" - -#: src/slic3r/GUI/PrintHostDialogs.cpp:35 -msgid "Upload to Printer Host with the following filename:" -msgstr "Завантажити на хоÑÑ‚ принтера з таким ім’Ñм файлу:" - -#: src/slic3r/GUI/PrintHostDialogs.cpp:37 -msgid "Start printing after upload" -msgstr "Почати друк піÑÐ»Ñ Ð·Ð°Ð²ÐµÐ´ÐµÐ½Ð½Ñ" - -#: src/slic3r/GUI/PrintHostDialogs.cpp:45 -msgid "Use forward slashes ( / ) as a directory separator if needed." -msgstr "За потреби викориÑтовуйте ÑкіÑні риÑки (/) Ñк роздільник каталогів." - -#: src/slic3r/GUI/PrintHostDialogs.cpp:58 -msgid "Group" -msgstr "Group" - -#: src/slic3r/GUI/PrintHostDialogs.cpp:187 -msgid "ID" -msgstr "ID" - -#: src/slic3r/GUI/PrintHostDialogs.cpp:188 -msgid "Progress" -msgstr "ПрогреÑ" - -#: src/slic3r/GUI/PrintHostDialogs.cpp:189 -msgid "Status" -msgstr "СтатуÑ" - -#: src/slic3r/GUI/PrintHostDialogs.cpp:190 -msgid "Host" -msgstr "ХоÑÑ‚" - -#: src/slic3r/GUI/PrintHostDialogs.cpp:191 -msgid "Filename" -msgstr "Ім'Ñ Ñ„Ð°Ð¹Ð»Ñƒ" - -#: src/slic3r/GUI/PrintHostDialogs.cpp:192 -msgid "Error Message" -msgstr "ÐŸÐ¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ помилку" - -#: src/slic3r/GUI/PrintHostDialogs.cpp:195 -msgid "Cancel selected" -msgstr "СкаÑувати вибране" - -#: src/slic3r/GUI/PrintHostDialogs.cpp:197 -msgid "Show error message" -msgstr "Показати Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ помилку" - -#: src/slic3r/GUI/PrintHostDialogs.cpp:239 -#: src/slic3r/GUI/PrintHostDialogs.cpp:272 -msgid "Enqueued" -msgstr "У черзі" - -#: src/slic3r/GUI/PrintHostDialogs.cpp:273 -msgid "Uploading" -msgstr "ЗавантаженнÑ" - -#: src/slic3r/GUI/PrintHostDialogs.cpp:277 -msgid "Completed" -msgstr "Завершено" - -#: src/slic3r/GUI/PrintHostDialogs.cpp:315 -msgid "Error uploading to print host:" -msgstr "Помилка Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð½Ð° хоÑÑ‚ друку:" - -#: src/slic3r/GUI/RammingChart.cpp:23 -msgid "NO RAMMING AT ALL" -msgstr "ВЗÐГÐЛІ БЕЗ раммінгу" - -#: src/slic3r/GUI/RammingChart.cpp:76 src/slic3r/GUI/WipeTowerDialog.cpp:83 -#: src/libslic3r/PrintConfig.cpp:706 src/libslic3r/PrintConfig.cpp:750 -#: src/libslic3r/PrintConfig.cpp:765 src/libslic3r/PrintConfig.cpp:2638 -#: src/libslic3r/PrintConfig.cpp:2647 src/libslic3r/PrintConfig.cpp:2757 -#: src/libslic3r/PrintConfig.cpp:2765 src/libslic3r/PrintConfig.cpp:2773 -#: src/libslic3r/PrintConfig.cpp:2780 src/libslic3r/PrintConfig.cpp:2788 -#: src/libslic3r/PrintConfig.cpp:2796 -msgid "s" -msgstr "Ñ" - -#: src/slic3r/GUI/RammingChart.cpp:81 -msgid "Volumetric speed" -msgstr "Об'ємна швидкіÑÑ‚ÑŒ" - -#: src/slic3r/GUI/RammingChart.cpp:81 src/libslic3r/PrintConfig.cpp:663 -#: src/libslic3r/PrintConfig.cpp:1458 -msgid "mm³/s" -msgstr "мм³/Ñ" - -#: src/slic3r/GUI/SavePresetDialog.cpp:57 -#, c-format -msgid "Save %s as:" -msgstr "Зберегти %s Ñк:" - -#: src/slic3r/GUI/SavePresetDialog.cpp:110 -msgid "the following suffix is not allowed:" -msgstr "такий ÑÑƒÑ„Ñ–ÐºÑ Ð½Ðµ допуÑкаєтьÑÑ:" - -#: src/slic3r/GUI/SavePresetDialog.cpp:116 -msgid "The supplied name is not available." -msgstr "Ðадане ім'Ñ Ð½ÐµÐ´Ð¾Ñтупне." - -#: src/slic3r/GUI/SavePresetDialog.cpp:122 -msgid "Cannot overwrite a system profile." -msgstr "Ðеможливо замінити ÑиÑтемний профіль." - -#: src/slic3r/GUI/SavePresetDialog.cpp:127 -msgid "Cannot overwrite an external profile." -msgstr "Ðеможливо замінити Ñторонній профіль." - -#: src/slic3r/GUI/SavePresetDialog.cpp:134 -msgid "Preset with name \"%1%\" already exists." -msgstr "ПреÑет з ім'Ñм \"%1%\" вже Ñ–Ñнує." - -#: src/slic3r/GUI/SavePresetDialog.cpp:136 -msgid "" -"Preset with name \"%1%\" already exists and is incompatible with selected " -"printer." -msgstr "ПреÑет з ім'Ñм \"%1%\" вже Ñ–Ñнує Ñ– неÑуміÑний з вибраним принтером." - -#: src/slic3r/GUI/SavePresetDialog.cpp:137 -msgid "Note: This preset will be replaced after saving" -msgstr "Примітка: Цей преÑет буде замінено піÑÐ»Ñ Ð·Ð±ÐµÑ€ÐµÐ¶ÐµÐ½Ð½Ñ" - -#: src/slic3r/GUI/SavePresetDialog.cpp:142 -msgid "The name cannot be empty." -msgstr "Ім'Ñ Ð½Ðµ може бути порожнім." - -#: src/slic3r/GUI/SavePresetDialog.cpp:147 -msgid "The name cannot start with space character." -msgstr "Ім'Ñ Ð½Ðµ може починатиÑÑ Ð· пробілу." - -#: src/slic3r/GUI/SavePresetDialog.cpp:152 -msgid "The name cannot end with space character." -msgstr "Ім'Ñ Ð½Ðµ може закінчуватиÑÑ Ð¿Ñ€Ð¾Ð±Ñ–Ð»Ð¾Ð¼." - -#: src/slic3r/GUI/SavePresetDialog.cpp:186 -#: src/slic3r/GUI/SavePresetDialog.cpp:192 -msgid "Save preset" -msgstr "Зберегти налаштуваннÑ" - -#: src/slic3r/GUI/SavePresetDialog.cpp:215 -msgctxt "PresetName" -msgid "Copy" -msgstr "КопіÑ" - -#: src/slic3r/GUI/SavePresetDialog.cpp:273 -msgid "" -"You have selected physical printer \"%1%\" \n" -"with related printer preset \"%2%\"" -msgstr "" -"Ви вибрали фізичний принтер \"%1%\"\n" -"із пов'Ñзаним преÑетом \"%2%\"" - -#: src/slic3r/GUI/SavePresetDialog.cpp:306 -msgid "What would you like to do with \"%1%\" preset after saving?" -msgstr "Що ви хочете зробити із преÑетом \"%1%\" піÑÐ»Ñ Ð·Ð±ÐµÑ€ÐµÐ¶ÐµÐ½Ð½Ñ?" - -#: src/slic3r/GUI/SavePresetDialog.cpp:309 -msgid "Change \"%1%\" to \"%2%\" for this physical printer \"%3%\"" -msgstr "Ð”Ð»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ фізичного принтера \"%3%\" змінити \"%1%\" на \"%2%\"" - -#: src/slic3r/GUI/SavePresetDialog.cpp:310 -msgid "Add \"%1%\" as a next preset for the the physical printer \"%2%\"" -msgstr "Додати \"%1%\" Ñк наÑтупний преÑет Ð´Ð»Ñ Ñ„Ñ–Ð·Ð¸Ñ‡Ð½Ð¾Ð³Ð¾ принтера \"%2%\"" - -#: src/slic3r/GUI/SavePresetDialog.cpp:311 -msgid "Just switch to \"%1%\" preset" -msgstr "ПроÑто переключитиÑÑ Ð´Ð¾ преÑету \"%1%\"" - -#: src/slic3r/GUI/Search.cpp:77 src/slic3r/GUI/Tab.cpp:2428 -msgid "Stealth" -msgstr "Тихий" - -#: src/slic3r/GUI/Search.cpp:77 src/slic3r/GUI/Tab.cpp:2422 -msgid "Normal" -msgstr "Ðормальний" - -#: src/slic3r/GUI/Selection.cpp:172 -msgid "Selection-Add" -msgstr "Ð’Ð¸Ð´Ñ–Ð»ÐµÐ½Ð½Ñ - Додано" - -#: src/slic3r/GUI/Selection.cpp:213 -msgid "Selection-Remove" -msgstr "Ð’Ð¸Ð´Ñ–Ð»ÐµÐ½Ð½Ñ - Видалено" - -#: src/slic3r/GUI/Selection.cpp:245 -msgid "Selection-Add Object" -msgstr "Ð’Ð¸Ð´Ñ–Ð»ÐµÐ½Ð½Ñ - Додано об'єкт" - -#: src/slic3r/GUI/Selection.cpp:264 -msgid "Selection-Remove Object" -msgstr "Ð’Ð¸Ð´Ñ–Ð»ÐµÐ½Ð½Ñ - Видалено об'єкт" - -#: src/slic3r/GUI/Selection.cpp:282 -msgid "Selection-Add Instance" -msgstr "Ð’Ð¸Ð´Ñ–Ð»ÐµÐ½Ð½Ñ - Додано екземплÑÑ€" - -#: src/slic3r/GUI/Selection.cpp:301 -msgid "Selection-Remove Instance" -msgstr "Ð’Ð¸Ð´Ñ–Ð»ÐµÐ½Ð½Ñ - Видалено екземплÑÑ€" - -#: src/slic3r/GUI/Selection.cpp:402 -msgid "Selection-Add All" -msgstr "Ð’Ð¸Ð´Ñ–Ð»ÐµÐ½Ð½Ñ - Додано вÑе" - -#: src/slic3r/GUI/Selection.cpp:428 -msgid "Selection-Remove All" -msgstr "Ð’Ð¸Ð´Ñ–Ð»ÐµÐ½Ð½Ñ - Видалено вÑе" - -#: src/slic3r/GUI/Selection.cpp:960 -msgid "Scale To Fit" -msgstr "МаÑштабувати під облаÑÑ‚ÑŒ друку" - -#: src/slic3r/GUI/Selection.cpp:1487 -msgid "Set Printable Instance" -msgstr "Ð’Ñтановити екземплÑÑ€ \"Ð”Ð»Ñ Ð´Ñ€ÑƒÐºÑƒ\"" - -#: src/slic3r/GUI/Selection.cpp:1487 -msgid "Set Unprintable Instance" -msgstr "Ð’Ñтановити екземплÑÑ€ \"Ðе Ð´Ð»Ñ Ð´Ñ€ÑƒÐºÑƒ\"" - -#: src/slic3r/GUI/SysInfoDialog.cpp:82 -msgid "System Information" -msgstr "Ð†Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ Ð¿Ñ€Ð¾ ÑиÑтему" - -#: src/slic3r/GUI/SysInfoDialog.cpp:158 -msgid "Copy to Clipboard" -msgstr "Скопіювати в буфер обміну" - -#: src/slic3r/GUI/Tab.cpp:109 src/libslic3r/PrintConfig.cpp:321 -msgid "Compatible printers" -msgstr "СуміÑні принтери" - -#: src/slic3r/GUI/Tab.cpp:110 -msgid "Select the printers this profile is compatible with." -msgstr "Оберіть принтери, ÑуміÑні з цим профілем." - -#: src/slic3r/GUI/Tab.cpp:115 src/libslic3r/PrintConfig.cpp:336 -msgid "Compatible print profiles" -msgstr "СуміÑні преÑети друку" - -#: src/slic3r/GUI/Tab.cpp:116 -msgid "Select the print profiles this profile is compatible with." -msgstr "Оберіть профілі друку, з Ñкими цей профіль ÑуміÑний." - -#. TRN "Save current Settings" -#: src/slic3r/GUI/Tab.cpp:211 -#, c-format -msgid "Save current %s" -msgstr "Зберегти поточний %s" - -#: src/slic3r/GUI/Tab.cpp:212 -msgid "Delete this preset" -msgstr "Видалити це налаштуваннÑ" - -#: src/slic3r/GUI/Tab.cpp:216 -======= #: src/slic3r/GUI/GUI_ObjectList.cpp:2008 msgid "Split to Parts" msgstr "Розділити на чаÑтини" @@ -11484,472 +4645,9 @@ msgid "Translate" msgstr "ПереміÑтити" #: src/slic3r/GUI/GUI_ObjectManipulation.cpp:640 ->>>>>>> master msgid "" "You cannot use non-uniform scaling mode for multiple objects/parts selection" msgstr "" -<<<<<<< HEAD -"Ðаведіть курÑор на кнопки, щоб знайти додаткову інформацію\n" -"або натиÑніть цю кнопку." - -#: src/slic3r/GUI/Tab.cpp:220 -msgid "Search in settings [%1%]" -msgstr "Шукайте в налаштуваннÑÑ… [%1%]" - -#: src/slic3r/GUI/Tab.cpp:1244 -msgid "Detach from system preset" -msgstr "Від'єднати від ÑиÑтемного преÑету" - -#: src/slic3r/GUI/Tab.cpp:1257 -msgid "" -"A copy of the current system preset will be created, which will be detached " -"from the system preset." -msgstr "" -"Буде Ñтворено копію поточного ÑиÑтемного преÑету, Ñкий буде від'єднано від " -"ÑиÑтемного преÑету." - -#: src/slic3r/GUI/Tab.cpp:1258 -msgid "" -"The current custom preset will be detached from the parent system preset." -msgstr "" -"Поточний влаÑний преÑет буде від'єднаний від батьківÑького ÑиÑтемного " -"преÑету." - -#: src/slic3r/GUI/Tab.cpp:1261 -msgid "Modifications to the current profile will be saved." -msgstr "Зміни до поточного профілю буде збережено." - -#: src/slic3r/GUI/Tab.cpp:1264 -msgid "" -"This action is not revertable.\n" -"Do you want to proceed?" -msgstr "" -"Цю дію не можна повернути.\n" -"Ви хочете продовжити?" - -#: src/slic3r/GUI/Tab.cpp:1266 -msgid "Detach preset" -msgstr "Від'єднати преÑет" - -#: src/slic3r/GUI/Tab.cpp:1292 -msgid "This is a default preset." -msgstr "Цей преÑет Ñ” преÑетом за-замовчуваннÑм." - -#: src/slic3r/GUI/Tab.cpp:1294 -msgid "This is a system preset." -msgstr "Цей преÑет Ñ” ÑиÑтемним преÑетом." - -#: src/slic3r/GUI/Tab.cpp:1296 -msgid "Current preset is inherited from the default preset." -msgstr "Поточний преÑет уÑпадковуєтьÑÑ Ð²Ñ–Ð´ преÑету за замовчуваннÑм." - -#: src/slic3r/GUI/Tab.cpp:1300 -msgid "Current preset is inherited from" -msgstr "Поточний преÑет уÑпадковуєтьÑÑ Ð²Ñ–Ð´" - -#: src/slic3r/GUI/Tab.cpp:1304 -msgid "It can't be deleted or modified." -msgstr "Його не можна видалити або змінити." - -#: src/slic3r/GUI/Tab.cpp:1305 -msgid "" -"Any modifications should be saved as a new preset inherited from this one." -msgstr "" -"Будь-Ñкі модифікації Ñлід зберігати Ñк новий преÑет, уÑпадкований від цього." - -#: src/slic3r/GUI/Tab.cpp:1306 -msgid "To do that please specify a new name for the preset." -msgstr "Ð”Ð»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ вкажіть нову назву преÑету." - -#: src/slic3r/GUI/Tab.cpp:1310 -msgid "Additional information:" -msgstr "Додаткова інформаціÑ:" - -#: src/slic3r/GUI/Tab.cpp:1316 -msgid "printer model" -msgstr "модель принтеру" - -#: src/slic3r/GUI/Tab.cpp:1324 -msgid "default print profile" -msgstr "профіль друку за замовчаннÑм" - -#: src/slic3r/GUI/Tab.cpp:1327 -msgid "default filament profile" -msgstr "профіль філаметну за замовчаннÑм" - -#: src/slic3r/GUI/Tab.cpp:1341 -msgid "default SLA material profile" -msgstr "профіль SLA-матеріалу за замовчаннÑм" - -#: src/slic3r/GUI/Tab.cpp:1345 -msgid "default SLA print profile" -msgstr "профіль SLA-друку за замовчаннÑм" - -#: src/slic3r/GUI/Tab.cpp:1353 -msgid "full profile name" -msgstr "повне ім'Ñ Ð¿Ñ€Ð¾Ñ„Ñ–Ð»ÑŽ" - -#: src/slic3r/GUI/Tab.cpp:1354 -msgid "symbolic profile name" -msgstr "Ñимволічне ім'Ñ Ð¿Ñ€Ð¾Ñ„Ñ–Ð»ÑŽ" - -#: src/slic3r/GUI/Tab.cpp:1392 src/slic3r/GUI/Tab.cpp:4049 -msgid "Layers and perimeters" -msgstr "Шари та периметри" - -#: src/slic3r/GUI/Tab.cpp:1398 -msgid "Vertical shells" -msgstr "Вертикальні оболонки" - -#: src/slic3r/GUI/Tab.cpp:1410 -msgid "Horizontal shells" -msgstr "Горизонтальні оболонки" - -#: src/slic3r/GUI/Tab.cpp:1411 src/libslic3r/PrintConfig.cpp:1982 -msgid "Solid layers" -msgstr "Суцільні шари" - -#: src/slic3r/GUI/Tab.cpp:1416 -msgid "Minimum shell thickness" -msgstr "Мінімальна товщина оболонки" - -#: src/slic3r/GUI/Tab.cpp:1427 -msgid "Quality (slower slicing)" -msgstr "ЯкіÑÑ‚ÑŒ (повільне нарізаннÑ)" - -#: src/slic3r/GUI/Tab.cpp:1455 -msgid "Reducing printing time" -msgstr "Ð—Ð½Ð¸Ð¶ÐµÐ½Ð½Ñ Ñ‡Ð°Ñу друку" - -#: src/slic3r/GUI/Tab.cpp:1467 -msgid "Skirt and brim" -msgstr "ÐŸÐ»Ñ–Ð½Ñ‚ÑƒÑ Ñ‚Ð° край" - -#: src/slic3r/GUI/Tab.cpp:1487 -msgid "Raft" -msgstr "Пліт" - -#: src/slic3r/GUI/Tab.cpp:1491 -msgid "Options for support material and raft" -msgstr "Варіанти Ð´Ð»Ñ Ð¾Ð¿Ð¾Ñ€Ð½Ð¾Ð³Ð¾ матеріалу та плоту" - -#: src/slic3r/GUI/Tab.cpp:1506 -msgid "Speed for print moves" -msgstr "ШвидкіÑÑ‚ÑŒ друкарÑьких рухів" - -#: src/slic3r/GUI/Tab.cpp:1519 -msgid "Speed for non-print moves" -msgstr "ШвидкіÑÑ‚ÑŒ недрукарÑьких рухів" - -#: src/slic3r/GUI/Tab.cpp:1522 -msgid "Modifiers" -msgstr "Модифікатори" - -#: src/slic3r/GUI/Tab.cpp:1525 -msgid "Acceleration control (advanced)" -msgstr "Контроль приÑÐºÐ¾Ñ€ÐµÐ½Ð½Ñ (розширений)" - -#: src/slic3r/GUI/Tab.cpp:1532 -msgid "Autospeed (advanced)" -msgstr "Ðвтоматична швидкіÑÑ‚ÑŒ (розширена)" - -#: src/slic3r/GUI/Tab.cpp:1540 -msgid "Multiple Extruders" -msgstr "Кілька екÑтрудерів" - -#: src/slic3r/GUI/Tab.cpp:1548 -msgid "Ooze prevention" -msgstr "Ð—Ð°Ð¿Ð¾Ð±Ñ–Ð³Ð°Ð½Ð½Ñ Ð¿Ñ€Ð¾ÑочуваннÑ" - -#: src/slic3r/GUI/Tab.cpp:1566 -msgid "Extrusion width" -msgstr "Ширина екÑтрузії" - -#: src/slic3r/GUI/Tab.cpp:1576 -msgid "Overlap" -msgstr "ПерекриттÑ" - -#: src/slic3r/GUI/Tab.cpp:1579 -msgid "Flow" -msgstr "Потік" - -#: src/slic3r/GUI/Tab.cpp:1588 -msgid "Other" -msgstr "Інше" - -#: src/slic3r/GUI/Tab.cpp:1591 src/slic3r/GUI/Tab.cpp:4125 -msgid "Output options" -msgstr "Параметри виводу" - -#: src/slic3r/GUI/Tab.cpp:1592 -msgid "Sequential printing" -msgstr "ПоÑлідовне друкуваннÑ" - -#: src/slic3r/GUI/Tab.cpp:1594 -msgid "Extruder clearance" -msgstr "ОблаÑÑ‚ÑŒ Ð·Ñ–Ñ‚ÐºÐ½ÐµÐ½Ð½Ñ ÐµÐºÑтрудера" - -#: src/slic3r/GUI/Tab.cpp:1599 src/slic3r/GUI/Tab.cpp:4126 -msgid "Output file" -msgstr "Вихідний файл" - -#: src/slic3r/GUI/Tab.cpp:1606 src/libslic3r/PrintConfig.cpp:1664 -msgid "Post-processing scripts" -msgstr "Скрипти поÑÑ‚-обробки" - -#: src/slic3r/GUI/Tab.cpp:1612 src/slic3r/GUI/Tab.cpp:1613 -#: src/slic3r/GUI/Tab.cpp:1934 src/slic3r/GUI/Tab.cpp:1935 -#: src/slic3r/GUI/Tab.cpp:2273 src/slic3r/GUI/Tab.cpp:2274 -#: src/slic3r/GUI/Tab.cpp:2349 src/slic3r/GUI/Tab.cpp:2350 -#: src/slic3r/GUI/Tab.cpp:3992 src/slic3r/GUI/Tab.cpp:3993 -msgid "Notes" -msgstr "Примітки" - -#: src/slic3r/GUI/Tab.cpp:1619 src/slic3r/GUI/Tab.cpp:1942 -#: src/slic3r/GUI/Tab.cpp:2280 src/slic3r/GUI/Tab.cpp:2356 -#: src/slic3r/GUI/Tab.cpp:4000 src/slic3r/GUI/Tab.cpp:4131 -msgid "Dependencies" -msgstr "ЗалежноÑÑ‚Ñ–" - -#: src/slic3r/GUI/Tab.cpp:1620 src/slic3r/GUI/Tab.cpp:1943 -#: src/slic3r/GUI/Tab.cpp:2281 src/slic3r/GUI/Tab.cpp:2357 -#: src/slic3r/GUI/Tab.cpp:4001 src/slic3r/GUI/Tab.cpp:4132 -msgid "Profile dependencies" -msgstr "ЗалежноÑÑ‚Ñ– профілю" - -#: src/slic3r/GUI/Tab.cpp:1700 -msgid "Filament Overrides" -msgstr "ПерепиÑÑƒÐ²Ð°Ð½Ð½Ñ Ð³Ð»Ð¾Ð±Ð°Ð»ÑŒÐ½Ð¸Ñ… змінних" - -#: src/slic3r/GUI/Tab.cpp:1822 -msgid "Temperature" -msgstr "Температура" - -#: src/slic3r/GUI/Tab.cpp:1823 -msgid "Nozzle" -msgstr "Сопло" - -#: src/slic3r/GUI/Tab.cpp:1828 -msgid "Bed" -msgstr "Стіл" - -#: src/slic3r/GUI/Tab.cpp:1833 -msgid "Cooling" -msgstr "ОхолодженнÑ" - -#: src/slic3r/GUI/Tab.cpp:1835 src/libslic3r/PrintConfig.cpp:1567 -#: src/libslic3r/PrintConfig.cpp:2430 -msgid "Enable" -msgstr "Увімкнути" - -#: src/slic3r/GUI/Tab.cpp:1846 -msgid "Fan settings" -msgstr "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð²ÐµÐ½Ñ‚Ð¸Ð»Ñтора" - -#: src/slic3r/GUI/Tab.cpp:1857 -msgid "Cooling thresholds" -msgstr "Пороги охолодженнÑ" - -#: src/slic3r/GUI/Tab.cpp:1863 -msgid "Filament properties" -msgstr "ВлаÑтивоÑÑ‚Ñ– філаменту" - -#: src/slic3r/GUI/Tab.cpp:1870 -msgid "Print speed override" -msgstr "ÐŸÐµÑ€ÐµÐ²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ ÑˆÐ²Ð¸Ð´ÐºÐ¾ÑÑ‚Ñ– друку" - -#: src/slic3r/GUI/Tab.cpp:1880 -msgid "Wipe tower parameters" -msgstr "Параметри вежі витираннÑ" - -#: src/slic3r/GUI/Tab.cpp:1883 -msgid "Toolchange parameters with single extruder MM printers" -msgstr "Параметри зміни інÑтрументу в одно-екÑтрудерному ММ-принтері" - -#: src/slic3r/GUI/Tab.cpp:1896 -msgid "Ramming settings" -msgstr "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ñ€Ð°Ð¼Ð¼Ñ–Ð½Ð³Ñƒ" - -#: src/slic3r/GUI/Tab.cpp:1919 src/slic3r/GUI/Tab.cpp:2212 -#: src/libslic3r/PrintConfig.cpp:2065 -msgid "Custom G-code" -msgstr "КориÑтувацький G-код" - -#: src/slic3r/GUI/Tab.cpp:1920 src/slic3r/GUI/Tab.cpp:2213 -#: src/libslic3r/PrintConfig.cpp:2015 src/libslic3r/PrintConfig.cpp:2030 -msgid "Start G-code" -msgstr "Початок G-коду" - -#: src/slic3r/GUI/Tab.cpp:1927 src/slic3r/GUI/Tab.cpp:2220 -#: src/libslic3r/PrintConfig.cpp:441 src/libslic3r/PrintConfig.cpp:451 -msgid "End G-code" -msgstr "Ð—Ð°ÐºÑ–Ð½Ñ‡ÐµÐ½Ð½Ñ G-коду" - -#: src/slic3r/GUI/Tab.cpp:1977 -msgid "Volumetric flow hints not available" -msgstr "Підказки об'ємного потоку відÑутні" - -#: src/slic3r/GUI/Tab.cpp:2073 -msgid "" -"Note: All parameters from this group are moved to the Physical Printer " -"settings (see changelog).\n" -"\n" -"A new Physical Printer profile is created by clicking on the \"cog\" icon " -"right of the Printer profiles combo box, by selecting the \"Add physical " -"printer\" item in the Printer combo box. The Physical Printer profile editor " -"opens also when clicking on the \"cog\" icon in the Printer settings tab. " -"The Physical Printer profiles are being stored into PrusaSlicer/" -"physical_printer directory." -msgstr "" -"Примітка: УÑÑ– параметри з цієї групи переміщено до налаштувань фізичного " -"принтера (див. Журнал змін).\n" -"\n" -"Ðовий профіль фізичного принтера ÑтворюєтьÑÑ Ð½Ð°Ñ‚Ð¸ÑканнÑм на піктограму " -"\"гвинтик\" праворуч від ÑпиÑку \"Профілі принтера\", вибором пункту " -"\"Додати фізичний принтер\" у ÑпиÑку принтера. Редактор профілю фізичного " -"принтера відкриваєтьÑÑ Ñ‚Ð°ÐºÐ¾Ð¶ при натиÑканні на піктограму \"гвинтик\" на " -"вкладці \"Параметри принтеру\". Профілі фізичного принтера зберігаютьÑÑ Ð² " -"каталозі \"PrusaSlicer/physical_printer\"." - -#: src/slic3r/GUI/Tab.cpp:2106 src/slic3r/GUI/Tab.cpp:2293 -msgid "Size and coordinates" -msgstr "Розмір Ñ– координати" - -#: src/slic3r/GUI/Tab.cpp:2115 src/slic3r/GUI/UnsavedChangesDialog.cpp:1080 -msgid "Capabilities" -msgstr "МожливоÑÑ‚Ñ–" - -#: src/slic3r/GUI/Tab.cpp:2120 -msgid "Number of extruders of the printer." -msgstr "КількіÑÑ‚ÑŒ екÑтрудерів у принтері." - -#: src/slic3r/GUI/Tab.cpp:2148 -msgid "" -"Single Extruder Multi Material is selected, \n" -"and all extruders must have the same diameter.\n" -"Do you want to change the diameter for all extruders to first extruder " -"nozzle diameter value?" -msgstr "" -"Вибрано мульти-матеріальний (ММ) друк з одним екÑтрудером,\n" -"Ñ– вÑÑ– екÑтрудери повинні мати однаковий діаметр.\n" -"Хочете змінити діаметр Ð´Ð»Ñ Ð²ÑÑ–Ñ… екÑтрудерів на Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð´Ñ–Ð°Ð¼ÐµÑ‚Ñ€Ð° Ñопла " -"першого екÑтрудера?" - -#: src/slic3r/GUI/Tab.cpp:2151 src/slic3r/GUI/Tab.cpp:2559 -#: src/libslic3r/PrintConfig.cpp:1534 -msgid "Nozzle diameter" -msgstr "Діаметр Ñопла" - -#: src/slic3r/GUI/Tab.cpp:2227 src/libslic3r/PrintConfig.cpp:209 -msgid "Before layer change G-code" -msgstr "G-код перед зміною шару" - -#: src/slic3r/GUI/Tab.cpp:2234 src/libslic3r/PrintConfig.cpp:1273 -msgid "After layer change G-code" -msgstr "G-код піÑÐ»Ñ Ð·Ð¼Ñ–Ð½Ð¸ шару" - -#: src/slic3r/GUI/Tab.cpp:2241 src/libslic3r/PrintConfig.cpp:2323 -msgid "Tool change G-code" -msgstr "G-код зміни інÑтрументу" - -#: src/slic3r/GUI/Tab.cpp:2248 -msgid "Between objects G-code (for sequential printing)" -msgstr "G-код між об'єктами (Ð´Ð»Ñ Ð¿Ð¾Ñлідовного друку)" - -#: src/slic3r/GUI/Tab.cpp:2255 -msgid "Color Change G-code" -msgstr "G-код зміни кольору" - -#: src/slic3r/GUI/Tab.cpp:2261 src/libslic3r/PrintConfig.cpp:2056 -msgid "Pause Print G-code" -msgstr "G-код Ð´Ð»Ñ Ð¿Ð°ÑƒÐ·Ð¸ друку" - -#: src/slic3r/GUI/Tab.cpp:2267 -msgid "Template Custom G-code" -msgstr "Шаблон влаÑного G-коду" - -#: src/slic3r/GUI/Tab.cpp:2300 -msgid "Display" -msgstr "ДиÑплей" - -#: src/slic3r/GUI/Tab.cpp:2315 -msgid "Tilt" -msgstr "Ðахил" - -#: src/slic3r/GUI/Tab.cpp:2316 -msgid "Tilt time" -msgstr "Ð§Ð°Ñ Ð½Ð°Ñ…Ð¸Ð»Ñƒ" - -#: src/slic3r/GUI/Tab.cpp:2322 src/slic3r/GUI/Tab.cpp:3976 -msgid "Corrections" -msgstr "Поправки" - -#: src/slic3r/GUI/Tab.cpp:2339 src/slic3r/GUI/Tab.cpp:3972 -msgid "Exposure" -msgstr "ЕкÑпозиціÑ" - -#: src/slic3r/GUI/Tab.cpp:2398 src/slic3r/GUI/Tab.cpp:2492 -#: src/libslic3r/PrintConfig.cpp:1302 src/libslic3r/PrintConfig.cpp:1337 -#: src/libslic3r/PrintConfig.cpp:1354 src/libslic3r/PrintConfig.cpp:1371 -#: src/libslic3r/PrintConfig.cpp:1387 src/libslic3r/PrintConfig.cpp:1397 -#: src/libslic3r/PrintConfig.cpp:1407 src/libslic3r/PrintConfig.cpp:1417 -msgid "Machine limits" -msgstr "Механічних обмеженнÑ" - -#: src/slic3r/GUI/Tab.cpp:2421 -msgid "Values in this column are for Normal mode" -msgstr "Ð—Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð² цьому Ñтовпці Ð´Ð»Ñ Ð½Ð¾Ñ€Ð¼Ð°Ð»ÑŒÐ½Ð¾Ð³Ð¾ режиму" - -#: src/slic3r/GUI/Tab.cpp:2427 -msgid "Values in this column are for Stealth mode" -msgstr "Ð—Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð² цьому Ñтовпці Ð´Ð»Ñ Ñ‚Ð¸Ñ…Ð¾Ð³Ð¾ режиму" - -#: src/slic3r/GUI/Tab.cpp:2436 -msgid "Maximum feedrates" -msgstr "МакÑимальна швидкіÑÑ‚ÑŒ подачі" - -#: src/slic3r/GUI/Tab.cpp:2441 -msgid "Maximum accelerations" -msgstr "МакÑимальні приÑкореннÑ" - -#: src/slic3r/GUI/Tab.cpp:2448 -msgid "Jerk limits" -msgstr "ÐžÐ±Ð¼ÐµÐ¶ÐµÐ½Ð½Ñ Ñ€Ð¸Ð²ÐºÑƒ" - -#: src/slic3r/GUI/Tab.cpp:2453 -msgid "Minimum feedrates" -msgstr "Мінімальна швидкіÑÑ‚ÑŒ подачі" - -#: src/slic3r/GUI/Tab.cpp:2517 src/slic3r/GUI/Tab.cpp:2525 -msgid "Single extruder MM setup" -msgstr "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ MM екÑтрудера" - -#: src/slic3r/GUI/Tab.cpp:2526 -msgid "Single extruder multimaterial parameters" -msgstr "Параметри екÑтрудеру в багато-екÑтрудерному принтері" - -#: src/slic3r/GUI/Tab.cpp:2557 -msgid "" -"This is a single extruder multimaterial printer, diameters of all extruders " -"will be set to the new value. Do you want to proceed?" -msgstr "" -"Це одно-екÑтрудерний багато-матеріальний принтер, діаметри вÑÑ–Ñ… екÑтрудерів " -"будуть вÑтановлені на нове значеннÑ. Ви хочете продовжити?" - -#: src/slic3r/GUI/Tab.cpp:2581 -msgid "Layer height limits" -msgstr "Межі виÑоти шару" - -#: src/slic3r/GUI/Tab.cpp:2586 -msgid "Position (for multi-extruder printers)" -msgstr "ÐŸÐ¾Ð·Ð¸Ñ†Ñ–Ñ (Ð´Ð»Ñ Ð¼ÑƒÐ»ÑŒÑ‚Ð¸-екÑтрудерних принтерів)" - -#: src/slic3r/GUI/Tab.cpp:2592 -msgid "Only lift Z" -msgstr "Межі піднÑÑ‚Ñ‚Ñ Z" - -#: src/slic3r/GUI/Tab.cpp:2605 -======= "Ðе можна викориÑтовувати нерівномірний режим маÑштабуваннÑ, коли вибрано " "кілька об’єктів/чаÑтей" @@ -12447,7 +5145,6 @@ msgid "Remove Instance of the selected object" msgstr "Видалити екземплÑÑ€ вибраного об’єкта" #: src/slic3r/GUI/KBShortcutsDialog.cpp:136 ->>>>>>> master msgid "" "Press to select multiple objects\n" "or move multiple objects with mouse" @@ -12455,128 +5152,6 @@ msgstr "" "ÐатиÑніть, щоб вибрати кілька об'єктів\n" "або переміщуйте кілька об’єктів за допомогою миші" -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:2612 -msgid "Reset to Filament Color" -msgstr "Скинути до кольору філаменту" - -#: src/slic3r/GUI/Tab.cpp:2790 -msgid "" -"The Wipe option is not available when using the Firmware Retraction mode.\n" -"\n" -"Shall I disable it in order to enable Firmware Retraction?" -msgstr "" -"Параметр «ОчиÑтити» недоÑтупний при викориÑтанні режиму програмного " -"перериваннÑ.\n" -"\n" -"Відключити його Ð´Ð»Ñ ÑƒÐ²Ñ–Ð¼ÐºÐ½ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð½Ð¾Ð³Ð¾ перериваннÑ?" - -#: src/slic3r/GUI/Tab.cpp:2792 -msgid "Firmware Retraction" -msgstr "Програмне перериваннÑ" - -#: src/slic3r/GUI/Tab.cpp:3383 -msgid "Detached" -msgstr "Від'єднаний" - -#: src/slic3r/GUI/Tab.cpp:3446 -msgid "remove" -msgstr "видалити" - -#: src/slic3r/GUI/Tab.cpp:3446 -msgid "delete" -msgstr "видалити" - -#: src/slic3r/GUI/Tab.cpp:3455 -msgid "It's a last preset for this physical printer." -msgstr "Це оÑтанній преÑет Ð´Ð»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ фізичного принтера." - -#: src/slic3r/GUI/Tab.cpp:3460 -msgid "" -"Are you sure you want to delete \"%1%\" preset from the physical printer " -"\"%2%\"?" -msgstr "" -"Ви впевнені, що хочете видалити преÑет \"%1%\" із фізичного принтера \"%2%\"?" - -#: src/slic3r/GUI/Tab.cpp:3472 -msgid "" -"The physical printer(s) below is based on the preset, you are going to " -"delete." -msgstr "" -"Ðаведений(Ñ–) нижче фізичний(Ñ–) принтер(и) базуєтьÑÑ Ð½Ð° преÑеті, Ñкі ви " -"збираєтеÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸." - -#: src/slic3r/GUI/Tab.cpp:3476 -msgid "" -"Note, that selected preset will be deleted from this/those printer(s) too." -msgstr "" -"Зверніть увагу, що вибраний преÑет буде також видалено з цього/цих " -"принтеру(ів)." - -#: src/slic3r/GUI/Tab.cpp:3480 -msgid "" -"The physical printer(s) below is based only on the preset, you are going to " -"delete." -msgstr "" -"Ðаведений(Ñ–) нижче фізичний(Ñ–) принтер(и) базуєтьÑÑ Ñ‚Ñ–Ð»ÑŒÐºÐ¸ на преÑеті, Ñкі " -"ви збираєтеÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸." - -#: src/slic3r/GUI/Tab.cpp:3484 -msgid "" -"Note, that this/those printer(s) will be deleted after deleting of the " -"selected preset." -msgstr "" -"Зауважте, що цей/ці принтер(и) буде видалено піÑÐ»Ñ Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ð²Ð¸Ð±Ñ€Ð°Ð½Ð¾Ð³Ð¾ " -"преÑету." - -#: src/slic3r/GUI/Tab.cpp:3488 -msgid "Are you sure you want to %1% the selected preset?" -msgstr "Ви впевнені, що хочете %1% вибраний преÑет?" - -#. TRN Remove/Delete -#: src/slic3r/GUI/Tab.cpp:3493 -msgid "%1% Preset" -msgstr "%1% преÑет" - -#: src/slic3r/GUI/Tab.cpp:3574 src/slic3r/GUI/Tab.cpp:3646 -msgid "Set" -msgstr "Ð’Ñтановити" - -#: src/slic3r/GUI/Tab.cpp:3710 -msgid "" -"Machine limits will be emitted to G-code and used to estimate print time." -msgstr "" -"Механічних Ð¾Ð±Ð¼ÐµÐ¶ÐµÐ½Ð½Ñ Ð¿ÑƒÐ±Ð»Ñ–ÐºÑƒÐ²Ð°Ñ‚Ð¸Ð¼ÑƒÑ‚ÑŒÑÑ Ð² G-код Ñ– викориÑтовуватимутьÑÑ Ð´Ð»Ñ " -"розрахунку чаÑу друку." - -#: src/slic3r/GUI/Tab.cpp:3713 -msgid "" -"Machine limits will NOT be emitted to G-code, however they will be used to " -"estimate print time, which may therefore not be accurate as the printer may " -"apply a different set of machine limits." -msgstr "" -"Механічних Ð¾Ð±Ð¼ÐµÐ¶ÐµÐ½Ð½Ñ ÐЕ публікуватимутьÑÑ Ð² G-код, однак вони будуть " -"викориÑтовуватиÑÑ Ð´Ð»Ñ Ð¾Ñ†Ñ–Ð½ÐºÐ¸ чаÑу друку, що, отже, може бути неточним, " -"оÑкільки принтер може заÑтоÑовувати інший набір механічних обмежень." - -#: src/slic3r/GUI/Tab.cpp:3717 -msgid "" -"Machine limits are not set, therefore the print time estimate may not be " -"accurate." -msgstr "" -"Механічних Ð¾Ð±Ð¼ÐµÐ¶ÐµÐ½Ð½Ñ Ð½Ðµ вÑтановлені, тому оцінка чаÑу друку може бути " -"неточною." - -#: src/slic3r/GUI/Tab.cpp:3739 -msgid "LOCKED LOCK" -msgstr "ЗÐКРИТИЙ ЗÐМОК" - -#. TRN Description for "LOCKED LOCK" -#: src/slic3r/GUI/Tab.cpp:3741 -msgid "" -"indicates that the settings are the same as the system (or default) values " -"for the current option group" -======= #: src/slic3r/GUI/KBShortcutsDialog.cpp:137 msgid "Press to activate selection rectangle" msgstr "ÐатиÑніть, щоб активувати прÑмокутник виділеннÑ" @@ -12688,84 +5263,16 @@ msgstr "Gizmo точки SLA-підтримок" #: src/slic3r/GUI/KBShortcutsDialog.cpp:154 msgid "Gizmo FDM paint-on supports" ->>>>>>> master msgstr "" -"вказує на те, що параметри збігаютьÑÑ Ñ–Ð· ÑиÑтемними (або за замовчуваннÑм) " -"значеннÑми Ð´Ð»Ñ Ð¿Ð¾Ñ‚Ð¾Ñ‡Ð½Ð¾Ñ— групи опцій" -#: src/slic3r/GUI/Tab.cpp:3743 -msgid "UNLOCKED LOCK" -msgstr "ВІДКРИТИЙ ЗÐМОК" - -<<<<<<< HEAD -#. TRN Description for "UNLOCKED LOCK" -#: src/slic3r/GUI/Tab.cpp:3745 -msgid "" -"indicates that some settings were changed and are not equal to the system " -"(or default) values for the current option group.\n" -"Click the UNLOCKED LOCK icon to reset all settings for current option group " -"to the system (or default) values." -======= #: src/slic3r/GUI/KBShortcutsDialog.cpp:155 msgid "Gizmo FDM paint-on seam" ->>>>>>> master msgstr "" -"вказує на те, що деÑкі параметри були змінені Ñ– не дорівнюють ÑиÑтемним (або " -"за замовчуваннÑм) значеннÑм Ð´Ð»Ñ Ð¿Ð¾Ñ‚Ð¾Ñ‡Ð½Ð¾Ñ— групи опцій.\n" -"Клацніть, щоб Ñкинути вÑÑ– Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ð»Ñ Ð¿Ð¾Ñ‚Ð¾Ñ‡Ð½Ð¾Ñ— групи опцій до ÑиÑтемних " -"значень (або за замовчуваннÑм)." -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3750 -msgid "WHITE BULLET" -msgstr "БІЛРКУЛЯ" - -#. TRN Description for "WHITE BULLET" -#: src/slic3r/GUI/Tab.cpp:3752 -msgid "" -"for the left button: indicates a non-system (or non-default) preset,\n" -"for the right button: indicates that the settings hasn't been modified." -======= #: src/slic3r/GUI/KBShortcutsDialog.cpp:156 msgid "Gizmo Multi Material painting" ->>>>>>> master -msgstr "" -"Ð´Ð»Ñ Ð»Ñ–Ð²Ð¾Ñ— кнопки: вказує на неÑиÑтемний (або не за замовчуваннÑм) преÑет,\n" -"Ð´Ð»Ñ Ð¿Ñ€Ð°Ð²Ð¾Ñ— кнопки: вказує на те, що параметри не були змінені." - -#: src/slic3r/GUI/Tab.cpp:3755 -msgid "BACK ARROW" -msgstr "СТРІЛКРÐÐЗÐД" - -<<<<<<< HEAD -#. TRN Description for "BACK ARROW" -#: src/slic3r/GUI/Tab.cpp:3757 -msgid "" -"indicates that the settings were changed and are not equal to the last saved " -"preset for the current option group.\n" -"Click the BACK ARROW icon to reset all settings for the current option group " -"to the last saved preset." -msgstr "" -"вказує на те, що параметри були змінені Ñ– не дорівнюють оÑтанньому " -"збереженому преÑету Ð´Ð»Ñ Ð¿Ð¾Ñ‚Ð¾Ñ‡Ð½Ð¾Ñ— групи параметрів.\n" -"Клацніть, щоб Ñкинути вÑÑ– параметри Ð´Ð»Ñ Ð¿Ð¾Ñ‚Ð¾Ñ‡Ð½Ð¾Ñ— групи параметрів до " -"оÑтаннього збереженого преÑету." - -#: src/slic3r/GUI/Tab.cpp:3767 -msgid "" -"LOCKED LOCK icon indicates that the settings are the same as the system (or " -"default) values for the current option group" msgstr "" -"Значок \"ЗÐКРИТИЙ ЗÐМОК\" вказує на те, що параметри збігаютьÑÑ Ñ–Ð· " -"ÑиÑтемними (або за замовчуваннÑм) значеннÑми Ð´Ð»Ñ Ð¿Ð¾Ñ‚Ð¾Ñ‡Ð½Ð¾Ñ— групи опцій" -#: src/slic3r/GUI/Tab.cpp:3769 -msgid "" -"UNLOCKED LOCK icon indicates that some settings were changed and are not " -"equal to the system (or default) values for the current option group.\n" -"Click to reset all settings for current option group to the system (or " -"default) values." -======= #: src/slic3r/GUI/KBShortcutsDialog.cpp:157 msgid "Unselect gizmo or clear selection" msgstr "СкаÑуйте вибір gizmo або очиÑÑ‚Ñ–Ñ‚ÑŒ виділеннÑ" @@ -12815,54 +5322,8 @@ msgstr "Показати/Ñховати діалогове вікно налаш #: src/slic3r/GUI/KBShortcutsDialog.cpp:170 msgid "Minimize application" ->>>>>>> master -msgstr "" -"Значок \"ВІДКРИТИЙ ЗÐМОК\" вказує на те, що деÑкі параметри були змінені Ñ– " -"не дорівнюють ÑиÑтемним (або за замовчуваннÑм) значеннÑм Ð´Ð»Ñ Ð¿Ð¾Ñ‚Ð¾Ñ‡Ð½Ð¾Ñ— групи " -"опцій.\n" -"Клацніть, щоб Ñкинути вÑÑ– Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ð»Ñ Ð¿Ð¾Ñ‚Ð¾Ñ‡Ð½Ð¾Ñ— групи опцій до ÑиÑтемних " -"значень (або за замовчуваннÑм)." - -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3772 -msgid "WHITE BULLET icon indicates a non system (or non default) preset." msgstr "" -"Значок \"БІЛРКУЛЯ\" вказує на неÑиÑтемний (або не за замовчуваннÑм) преÑет." - -#: src/slic3r/GUI/Tab.cpp:3775 -msgid "" -"WHITE BULLET icon indicates that the settings are the same as in the last " -"saved preset for the current option group." -msgstr "" -"Значок \"БІЛРКУЛЯ\" вказує на те, що параметри збігаютьÑÑ Ñ‚Ð¸Ð¼Ð¸, Ñкі Ñ” в " -"оÑтанньому збереженому преÑеті Ð´Ð»Ñ Ð¿Ð¾Ñ‚Ð¾Ñ‡Ð½Ð¾Ñ— групи опцій." - -#: src/slic3r/GUI/Tab.cpp:3777 -msgid "" -"BACK ARROW icon indicates that the settings were changed and are not equal " -"to the last saved preset for the current option group.\n" -"Click to reset all settings for the current option group to the last saved " -"preset." -msgstr "" -"Значок \"СТРІЛКРÐÐЗÐД\" вказує на те, що параметри були змінені Ñ– не " -"дорівнюють оÑтанньому збереженому преÑету Ð´Ð»Ñ Ð¿Ð¾Ñ‚Ð¾Ñ‡Ð½Ð¾Ñ— групи параметрів.\n" -"Клацніть, щоб Ñкинути вÑÑ– параметри Ð´Ð»Ñ Ð¿Ð¾Ñ‚Ð¾Ñ‡Ð½Ð¾Ñ— групи параметрів до " -"оÑтаннього збереженого преÑету." - -#: src/slic3r/GUI/Tab.cpp:3783 -msgid "" -"LOCKED LOCK icon indicates that the value is the same as the system (or " -"default) value." -msgstr "" -"Значок \"ЗÐКРИТИЙ ЗÐМОК\" вказує на те, що Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð·Ð±Ñ–Ð³Ð°Ñ”Ñ‚ÑŒÑÑ Ñ–Ð· ÑиÑтемним " -"(або за замовчуваннÑм)." -#: src/slic3r/GUI/Tab.cpp:3784 -msgid "" -"UNLOCKED LOCK icon indicates that the value was changed and is not equal to " -"the system (or default) value.\n" -"Click to reset current value to the system (or default) value." -======= #: src/slic3r/GUI/KBShortcutsDialog.cpp:181 src/slic3r/GUI/MainFrame.cpp:284 #: src/slic3r/GUI/MainFrame.cpp:333 src/slic3r/GUI/MainFrame.cpp:445 #: src/slic3r/GUI/MainFrame.cpp:448 src/slic3r/GUI/MainFrame.cpp:470 @@ -12916,66 +5377,16 @@ msgstr "ÐаÑтупні гарÑчі клавіші заÑтоÑовуютьÑÑ #: src/slic3r/GUI/KBShortcutsDialog.cpp:196 msgid "Set selected items as Printable/Unprintable" ->>>>>>> master msgstr "" -"Значок \"ВІДКРИТИЙ ЗÐМОК\" вказує на те, що Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð±ÑƒÐ»Ð¾ змінено Ñ– не " -"дорівнює ÑиÑтемному (або за замовчуваннÑм) значенню.\n" -"Клацніть, щоб Ñкинути поточне Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð´Ð¾ ÑиÑтемного (або за замовчуваннÑм)." -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3790 -msgid "" -"WHITE BULLET icon indicates that the value is the same as in the last saved " -"preset." -======= #: src/slic3r/GUI/KBShortcutsDialog.cpp:197 msgid "Set default extruder for the selected items" ->>>>>>> master msgstr "" -"Значок \"БІЛРКУЛЯ\" вказує на те, що Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð·Ð±Ñ–Ð³Ð°Ñ”Ñ‚ÑŒÑÑ Ð· значеннÑм " -"збереженого преÑету." -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3791 -msgid "" -"BACK ARROW icon indicates that the value was changed and is not equal to the " -"last saved preset.\n" -"Click to reset current value to the last saved preset." -======= #: src/slic3r/GUI/KBShortcutsDialog.cpp:198 msgid "Set extruder number for the selected items" ->>>>>>> master msgstr "" -"Значок \"СТРІЛКРÐÐЗÐД\" вказує на те, що Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð±ÑƒÐ»Ð¾ змінено Ñ– не " -"дорівнює оÑтанньому збереженому преÑету.\n" -"Клацніть, щоб Ñкинути поточне Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð´Ð¾ оÑтаннього збереженого преÑету." - -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:3935 src/slic3r/GUI/Tab.cpp:3937 -msgid "Material" -msgstr "Матеріал" - -#: src/slic3r/GUI/Tab.cpp:4059 -msgid "Support head" -msgstr "Головка підтримки" - -#: src/slic3r/GUI/Tab.cpp:4064 -msgid "Support pillar" -msgstr "Стовп підтримки" -#: src/slic3r/GUI/Tab.cpp:4087 -msgid "Connection of the support sticks and junctions" -msgstr "З'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð¾Ð¿Ð¾Ñ€Ð½Ð¸Ñ… Ñтовпів Ñ– Ñтиків" - -#: src/slic3r/GUI/Tab.cpp:4092 -msgid "Automatic generation" -msgstr "Ðвтоматичне згенеруваннÑ" - -#: src/slic3r/GUI/Tab.cpp:4166 -msgid "" -"\"%1%\" is disabled because \"%2%\" is on in \"%3%\" category.\n" -"To enable \"%1%\", please switch off \"%2%\"" -======= #: src/slic3r/GUI/KBShortcutsDialog.cpp:201 msgid "Objects List" msgstr "" @@ -13020,223 +5431,8 @@ msgstr "Показати / Сховати легенду та приблизни #: src/slic3r/GUI/KBShortcutsDialog.cpp:227 msgid "Show/Hide G-code window" ->>>>>>> master msgstr "" -"\"%1%\" вимкнено, оÑкільки в категорії \"%3%\" увімкнено \"%2%\".\n" -"Щоб увімкнути \"%1%\", вимкніть \"%2%\"" - -<<<<<<< HEAD -#: src/slic3r/GUI/Tab.cpp:4168 src/libslic3r/PrintConfig.cpp:3004 -msgid "Object elevation" -msgstr "ПіднÑÑ‚Ñ‚Ñ Ð¾Ð±â€™Ñ”ÐºÑ‚Ð°" - -#: src/slic3r/GUI/Tab.cpp:4168 src/libslic3r/PrintConfig.cpp:3106 -msgid "Pad around object" -msgstr "Подушка навколо об’єкта" - -#: src/slic3r/GUI/Tab.hpp:370 src/slic3r/GUI/Tab.hpp:492 -msgid "Print Settings" -msgstr "Параметри друку" - -#: src/slic3r/GUI/Tab.hpp:401 -msgid "Filament Settings" -msgstr "Параметри філаменту" - -#: src/slic3r/GUI/Tab.hpp:442 -msgid "Printer Settings" -msgstr "Параметри принтеру" -#: src/slic3r/GUI/Tab.hpp:476 -msgid "Material Settings" -msgstr "Параметри матеріалу" - -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:149 -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:158 -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:857 -msgid "Undef" -msgstr "Ðевизначений" - -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:537 -msgid "PrusaSlicer is closing: Unsaved Changes" -msgstr "PrusaSlicer закриваєтьÑÑ: Ðезбережені зміни" - -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:554 -msgid "Switching Presets: Unsaved Changes" -msgstr "ÐŸÐµÑ€ÐµÐ¼Ð¸ÐºÐ°Ð½Ð½Ñ Ð¿Ñ€ÐµÑетів: незбережені зміни" - -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:620 -msgid "Old Value" -msgstr "Старе значеннÑ" - -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:621 -msgid "New Value" -msgstr "Ðове значеннÑ" - -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:652 -msgid "Transfer" -msgstr "ПеренеÑти" - -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:653 -msgid "Discard" -msgstr "Відхилити" - -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:654 -msgid "Save" -msgstr "Зберегти" - -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:674 -msgid "PrusaSlicer will remember your action." -msgstr "PrusaSlicer запам'Ñтає ваші дії." - -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:676 -msgid "" -"You will not be asked about the unsaved changes the next time you close " -"PrusaSlicer." -msgstr "" -"ÐаÑтупного разу, коли ви закриватимете PrusaSlicer, Ð²Ð°Ñ Ð½Ðµ питатимуть про " -"незбережені зміни." - -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:677 -msgid "" -"You will not be asked about the unsaved changes the next time you switch a " -"preset." -msgstr "" -"ÐаÑтупного разу, коли ви переключите преÑет, Ð²Ð°Ñ Ð½Ðµ питатимуть про " -"незбережені зміни." - -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:678 -msgid "" -"Visit \"Preferences\" and check \"%1%\"\n" -"to be asked about unsaved changes again." -msgstr "" -"Відвідайте \"Преференції\" та вÑтановіть прапорець \"%1%\"\n" -"щоб знову запитати про незбережені зміни." - -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:680 -msgid "PrusaSlicer: Don't ask me again" -msgstr "PrusaSlicer: Ðе питай мене більше" - -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:747 -msgid "" -"Some fields are too long to fit. Right mouse click reveals the full text." -msgstr "" -"ДеÑкі Ð¿Ð¾Ð»Ñ Ð·Ð°Ð½Ð°Ð´Ñ‚Ð¾ довгі, щоб вміÑтитиÑÑ Ñƒ чарунку. Клацніть правою кнопкою " -"миші, щоб відкрити повний текÑÑ‚." - -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:749 -msgid "All settings changes will be discarded." -msgstr "УÑÑ– зміни параметрів буде відхилено." - -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:752 -msgid "Save the selected options." -msgstr "Зберегти вибрані параметри." - -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:752 -msgid "Transfer the selected settings to the newly selected preset." -msgstr "ПеренеÑти вибрані параметри до нещодавно вибраного преÑету." - -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:756 -msgid "Save the selected options to preset \"%1%\"." -msgstr "Зберегти вибрані параметри до преÑету \"%1%\"." - -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:757 -msgid "Transfer the selected options to the newly selected preset \"%1%\"." -msgstr "ПеренеÑти вибрані параметри до нещодавно вибраного преÑету \"%1%\"." - -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:1019 -msgid "The following presets were modified:" -msgstr "ÐаÑтупні преÑети були змінені :" - -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:1024 -msgid "Preset \"%1%\" has the following unsaved changes:" -msgstr "ПреÑет \"%1%\" має такі незбережені зміни:" - -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:1028 -msgid "" -"Preset \"%1%\" is not compatible with the new printer profile and it has the " -"following unsaved changes:" -msgstr "" -"ПреÑет \"%1%\" неÑуміÑний з новим профілем принтера, Ñ– він має такі " -"незбережені зміни:" - -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:1029 -msgid "" -"Preset \"%1%\" is not compatible with the new print profile and it has the " -"following unsaved changes:" -msgstr "" -"ПреÑет \"%1%\" неÑуміÑний з новим профілем друку, Ñ– він має такі незбережені " -"зміни:" - -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:1075 -msgid "Extruders count" -msgstr "КількіÑÑ‚ÑŒ екÑтрудерів" - -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:1197 -msgid "Old value" -msgstr "Ðове значеннÑ" - -#: src/slic3r/GUI/UnsavedChangesDialog.cpp:1198 -msgid "New value" -msgstr "Ðове значеннÑ" - -#: src/slic3r/GUI/UpdateDialogs.cpp:38 -msgid "Update available" -msgstr "ДоÑтупне оновленнÑ" - -#: src/slic3r/GUI/UpdateDialogs.cpp:38 -#, c-format -msgid "New version of %s is available" -msgstr "ДоÑтупна нова верÑÑ–Ñ %s" - -#: src/slic3r/GUI/UpdateDialogs.cpp:43 -msgid "Current version:" -msgstr "Поточна верÑÑ–Ñ:" - -#: src/slic3r/GUI/UpdateDialogs.cpp:45 -msgid "New version:" -msgstr "Ðова верÑÑ–Ñ:" - -#: src/slic3r/GUI/UpdateDialogs.cpp:53 -msgid "Changelog && Download" -msgstr "Журнал змін Ñ– завантаженнÑ" - -#: src/slic3r/GUI/UpdateDialogs.cpp:60 src/slic3r/GUI/UpdateDialogs.cpp:128 -#: src/slic3r/GUI/UpdateDialogs.cpp:192 -msgid "Open changelog page" -msgstr "Відкрийте Ñторінку журналу змін" - -#: src/slic3r/GUI/UpdateDialogs.cpp:65 -msgid "Open download page" -msgstr "Відкрити Ñторінку завантаженнÑ" - -#: src/slic3r/GUI/UpdateDialogs.cpp:71 -msgid "Don't notify about new releases any more" -msgstr "Більше не Ñповіщати про нові випуÑки" - -#: src/slic3r/GUI/UpdateDialogs.cpp:89 -msgid "Opening Configuration Wizard" -msgstr "Ð’Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ð¼Ð°Ð¹Ñтра конфігурації" - -#: src/slic3r/GUI/UpdateDialogs.cpp:89 src/slic3r/GUI/UpdateDialogs.cpp:275 -msgid "Configuration update" -msgstr "ÐžÐ½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ ÐºÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ—" - -#: src/slic3r/GUI/UpdateDialogs.cpp:90 -msgid "" -"PrusaSlicer is not using the newest configuration available.\n" -"Configuration Wizard may not offer the latest printers, filaments and SLA " -"materials to be installed. " -msgstr "" -"PrusaSlicer не викориÑтовує оÑтанню з доÑтупних конфігурацію.\n" -"МайÑтер конфігурації може не пропонувати найновіші принтери, філаменти та " -"матеріали SLA, Ñкі потрібно інÑталювати. " - -#: src/slic3r/GUI/UpdateDialogs.cpp:92 -msgid "Configuration update is available" -msgstr "ДоÑтупне Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ ÐºÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ—" - -#: src/slic3r/GUI/UpdateDialogs.cpp:95 -======= #: src/slic3r/GUI/KBShortcutsDialog.cpp:230 src/slic3r/GUI/Plater.cpp:4446 #: src/slic3r/GUI/Tab.cpp:2822 msgid "Preview" @@ -13310,116 +5506,10 @@ msgid "Horizontal Slider" msgstr "Горизонтальний повзунок" #: src/slic3r/GUI/KBShortcutsDialog.cpp:254 ->>>>>>> master msgid "" "The following shortcuts are applicable in G-code preview when the horizontal " "slider is active" msgstr "" -<<<<<<< HEAD -"Ви хотіли б його вÑтановити?\n" -"\n" -"Зверніть увагу, що Ñпочатку буде Ñтворено повний знімок конфігурації. Потім " -"його можна відновити в будь-Ñкий чаÑ, у випадку проблем з новою верÑією.\n" -"\n" -"Оновлені пакети конфігурації:" - -#: src/slic3r/GUI/UpdateDialogs.cpp:116 src/slic3r/GUI/UpdateDialogs.cpp:182 -msgid "Comment:" -msgstr "Коментар:" - -#: src/slic3r/GUI/UpdateDialogs.cpp:136 -msgid "Install" -msgstr "ІнÑталювати" - -#: src/slic3r/GUI/UpdateDialogs.cpp:140 -msgid "Don't install" -msgstr "Ðе інÑталювати" - -#: src/slic3r/GUI/UpdateDialogs.cpp:157 src/slic3r/GUI/UpdateDialogs.cpp:219 -#, c-format -msgid "%s incompatibility" -msgstr "ÐеÑуміÑніÑÑ‚ÑŒ з %s" - -#: src/slic3r/GUI/UpdateDialogs.cpp:157 -msgid "You must install a configuration update." -msgstr "Потрібно вÑтановити Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ ÐºÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ—." - -#: src/slic3r/GUI/UpdateDialogs.cpp:160 -#, c-format -msgid "" -"%s will now start updates. Otherwise it won't be able to start.\n" -"\n" -"Note that a full configuration snapshot will be created first. It can then " -"be restored at any time should there be a problem with the new version.\n" -"\n" -"Updated configuration bundles:" -msgstr "" -"Зараз %s розпочне оновленнÑ. Інакше він не зможе запуÑтитиÑÑ.\n" -"\n" -"Зверніть увагу, що Ñпочатку буде Ñтворено повний знімок конфігурації. Потім " -"його можна буде відновити в будь-Ñкий чаÑ, Ñкщо виникне проблема з новою " -"верÑією.\n" -"\n" -"Оновлені пакети конфігурації:" - -#: src/slic3r/GUI/UpdateDialogs.cpp:200 src/slic3r/GUI/UpdateDialogs.cpp:255 -#, c-format -msgid "Exit %s" -msgstr "Вихід %s" - -#: src/slic3r/GUI/UpdateDialogs.cpp:220 -#, c-format -msgid "%s configuration is incompatible" -msgstr "ÐºÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ %s Ñ” неÑуміÑна" - -#: src/slic3r/GUI/UpdateDialogs.cpp:225 -#, c-format -msgid "" -"This version of %s is not compatible with currently installed configuration " -"bundles.\n" -"This probably happened as a result of running an older %s after using a " -"newer one.\n" -"\n" -"You may either exit %s and try again with a newer version, or you may re-run " -"the initial configuration. Doing so will create a backup snapshot of the " -"existing configuration before installing files compatible with this %s." -msgstr "" -"Ð¦Ñ Ð²ÐµÑ€ÑÑ–Ñ %s не ÑуміÑна з вÑтановленими на Ñьогодні пакетами конфігурації.\n" -"Можливо, це ÑталоÑÑ Ð² результаті запуÑку Ñтарішого %s піÑÐ»Ñ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ð½Ð½Ñ " -"нового.\n" -"\n" -"Ви можете вийти зі %s Ñ– Ñпробувати ще раз із новою верÑією, або повторно " -"запуÑтити початкову конфігурацію. Це Ñтворить резервний знімок Ñ–Ñнуючої " -"конфігурації перед вÑтановленнÑм файлів, ÑуміÑних із цим %s." - -#: src/slic3r/GUI/UpdateDialogs.cpp:234 -#, c-format -msgid "This %s version: %s" -msgstr "%s верÑÑ–Ñ— %s" - -#: src/slic3r/GUI/UpdateDialogs.cpp:239 -msgid "Incompatible bundles:" -msgstr "ÐеÑуміÑні комплекти:" - -#: src/slic3r/GUI/UpdateDialogs.cpp:258 -msgid "Re-configure" -msgstr "Пере-налаштувати" - -#: src/slic3r/GUI/UpdateDialogs.cpp:279 -#, c-format -msgid "" -"%s now uses an updated configuration structure.\n" -"\n" -"So called 'System presets' have been introduced, which hold the built-in " -"default settings for various printers. These System presets cannot be " -"modified, instead, users now may create their own presets inheriting " -"settings from one of the System presets.\n" -"An inheriting preset may either inherit a particular value from its parent " -"or override it with a customized value.\n" -"\n" -"Please proceed with the %s that follows to set up the new presets and to " -"choose whether to enable automatic preset updates." -======= "Ðаведені нижче гарÑчі клавіші заÑтоÑовуютьÑÑ Ñƒ переглÑді G-коду, коли " "горизонтальний повзунок активний" @@ -13454,358 +5544,8 @@ msgstr "" #: src/slic3r/GUI/MainFrame.cpp:232 msgid "PrusaSlicer is closing" ->>>>>>> master -msgstr "" -"%s тепер викориÑтовує оновлену Ñтруктуру конфігурації.\n" -"\n" -"Були введені так звані \"ÑиÑтемні преÑети\", Ñкі міÑÑ‚ÑÑ‚ÑŒ вбудовані " -"Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð·Ð° замовчуваннÑм Ð´Ð»Ñ Ñ€Ñ–Ð·Ð½Ð¸Ñ… принтерів. Ці ÑиÑтемні преÑети не " -"можуть бути змінені, натоміÑÑ‚ÑŒ кориÑтувачі тепер можуть Ñтворювати влаÑні " -"преÑети, уÑпадковуючи Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð· одного із ÑиÑтемних преÑетів.\n" -"Спадковий преÑет може уÑпадкувати певне Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð²Ñ–Ð´ Ñвого батька або " -"замінити його Ñвоїм влаÑним значеннÑм.\n" -"\n" -"Будь лаÑка, перейдіть до %s, щоб налаштувати нові преÑети та вибрати, чи " -"вмикати Ñ—Ñ… автоматичне оновленнÑ." - -<<<<<<< HEAD -#: src/slic3r/GUI/UpdateDialogs.cpp:296 -msgid "For more information please visit our wiki page:" -msgstr "Ð”Ð»Ñ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ð´Ð¾Ð´Ð°Ñ‚ÐºÐ¾Ð²Ð¾Ñ— інформації відвідайте нашу wiki-Ñторінку:" - -#: src/slic3r/GUI/UpdateDialogs.cpp:313 -msgid "Configuration updates" -msgstr "ÐžÐ½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ ÐºÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ð¹" - -#: src/slic3r/GUI/UpdateDialogs.cpp:313 -msgid "No updates available" -msgstr "Ðемає оновлень" - -#: src/slic3r/GUI/UpdateDialogs.cpp:318 -#, c-format -msgid "%s has no configuration updates available." -msgstr "%s не має оновлень конфігурації." - -#: src/slic3r/GUI/WipeTowerDialog.cpp:15 -msgid "Ramming customization" -msgstr "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ñ€Ð°Ð¼Ð¼Ñ–Ð½Ð³Ñƒ" - -#: src/slic3r/GUI/WipeTowerDialog.cpp:41 -msgid "" -"Ramming denotes the rapid extrusion just before a tool change in a single-" -"extruder MM printer. Its purpose is to properly shape the end of the " -"unloaded filament so it does not prevent insertion of the new filament and " -"can itself be reinserted later. This phase is important and different " -"materials can require different extrusion speeds to get the good shape. For " -"this reason, the extrusion rates during ramming are adjustable.\n" -"\n" -"This is an expert-level setting, incorrect adjustment will likely lead to " -"jams, extruder wheel grinding into filament etc." msgstr "" -"Раммінг означає швидке екÑÑ‚Ñ€ÑƒÐ´ÑƒÐ²Ð°Ð½Ð½Ñ Ð±ÐµÐ·Ð¿Ð¾Ñередньо перед заміною інÑтрументу " -"в одно-екÑтрудерному принтері ММ. Його мета полÑгає у правильній формі ÐºÑ–Ð½Ñ†Ñ " -"виведеного філаменту, щоб вона не заважала вÑтавці нового філаменту Ñ– може " -"бути знову вÑтановлений пізніше. Ð¦Ñ Ñ„Ð°Ð·Ð° Ñ” важливою, Ñ– різні матеріали " -"можуть вимагати різної швидкоÑÑ‚Ñ– екÑтрузії Ð´Ð»Ñ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ð³Ð°Ñ€Ð½Ð¾Ñ— форми. З " -"цієї причини швидкіÑÑ‚ÑŒ екÑÑ‚Ñ€ÑƒÐ´ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ñ–Ð´ Ñ‡Ð°Ñ Ñ€Ð°Ð¼Ð¼Ñ–Ð½Ð³Ñƒ регулюєтьÑÑ.\n" -"\n" -"Це Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð½Ð° рівні екÑперта, неправильне регулюваннÑ, ймовірно, " -"призведе до заклинюваннÑ, Ð¿Ð¾Ð´Ñ€Ñ–Ð±Ð½ÐµÐ½Ð½Ñ ÐµÐºÑтрудерного колеÑа до філаменту тощо." - -#: src/slic3r/GUI/WipeTowerDialog.cpp:83 -msgid "Total ramming time" -msgstr "Загальний Ñ‡Ð°Ñ ÑˆÐ²Ð¸Ð´ÐºÐ¾Ñ— екÑтрузії" - -#: src/slic3r/GUI/WipeTowerDialog.cpp:85 -msgid "Total rammed volume" -msgstr "Загальний обÑÑг швидкої екÑтрузії" - -#: src/slic3r/GUI/WipeTowerDialog.cpp:89 -msgid "Ramming line width" -msgstr "Ширина ліній раммінгу" - -#: src/slic3r/GUI/WipeTowerDialog.cpp:91 -msgid "Ramming line spacing" -msgstr "Проміжки між лініÑми раммінгу" - -#: src/slic3r/GUI/WipeTowerDialog.cpp:142 -msgid "Wipe tower - Purging volume adjustment" -msgstr "Вежа Ð²Ð¸Ñ‚Ð¸Ñ€Ð°Ð½Ð½Ñ - Ð ÐµÐ³ÑƒÐ»ÑŽÐ²Ð°Ð½Ð½Ñ Ð¾Ð±'єму продувки" -#: src/slic3r/GUI/WipeTowerDialog.cpp:254 -msgid "" -"Here you can adjust required purging volume (mm³) for any given pair of " -"tools." -msgstr "" -"Тут ви можете відрегулювати необхідний об'єм Ð²Ð¸Ñ‚Ð¸Ñ€Ð°Ð½Ð½Ñ (мм³) Ð´Ð»Ñ Ð±ÑƒÐ´ÑŒ-Ñкої " -"пари інÑтрументів." - -#: src/slic3r/GUI/WipeTowerDialog.cpp:255 -msgid "Extruder changed to" -msgstr "ЕкÑтрудер змінено на" - -#: src/slic3r/GUI/WipeTowerDialog.cpp:263 -msgid "unloaded" -msgstr "виведено" - -#: src/slic3r/GUI/WipeTowerDialog.cpp:264 -msgid "loaded" -msgstr "заведено" - -#: src/slic3r/GUI/WipeTowerDialog.cpp:276 -msgid "Tool #" -msgstr "ІнÑтрумент â„–" - -#: src/slic3r/GUI/WipeTowerDialog.cpp:285 -msgid "" -"Total purging volume is calculated by summing two values below, depending on " -"which tools are loaded/unloaded." -msgstr "" -"Загальний об'єм Ð²Ð¸Ñ‚Ð¸Ñ€Ð°Ð½Ð½Ñ Ð¾Ð±Ñ‡Ð¸ÑлюєтьÑÑ ÑˆÐ»Ñхом підÑÑƒÐ¼Ð¾Ð²ÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ð²Ð¾Ñ… значень " -"нижче, залежно від того, Ñкий інÑтрумент заведено/виведено." - -#: src/slic3r/GUI/WipeTowerDialog.cpp:286 -msgid "Volume to purge (mm³) when the filament is being" -msgstr "Об'єм Ð´Ð»Ñ Ð²Ð¸Ñ‚Ð¸Ñ€Ð°Ð½Ð½Ñ (мм³) при наÑвноÑÑ‚Ñ– філаменту" - -#: src/slic3r/GUI/WipeTowerDialog.cpp:300 -msgid "From" -msgstr "Від" - -#: src/slic3r/GUI/WipeTowerDialog.cpp:365 -msgid "" -"Switching to simple settings will discard changes done in the advanced " -"mode!\n" -"\n" -"Do you want to proceed?" -msgstr "" -"Перехід в проÑтий режим налаштувань призведе до ÑкаÑÑƒÐ²Ð°Ð½Ð½Ñ Ð·Ð¼Ñ–Ð½, здійÑнених " -"у розширеному режимі!\n" -"\n" -"Хочете продовжити?" - -#: src/slic3r/GUI/WipeTowerDialog.cpp:377 -msgid "Show simplified settings" -msgstr "Показати Ñпрощені налаштуваннÑ" - -#: src/slic3r/GUI/WipeTowerDialog.cpp:377 -msgid "Show advanced settings" -msgstr "Показати розширені налаштуваннÑ" - -#: src/slic3r/GUI/wxExtensions.cpp:627 -#, c-format -msgid "Switch to the %s mode" -msgstr "Перейти до режиму %s" - -#: src/slic3r/GUI/wxExtensions.cpp:628 -#, c-format -msgid "Current mode is %s" -msgstr "Поточний режим - %s" - -#: src/slic3r/Utils/AstroBox.cpp:69 src/slic3r/Utils/OctoPrint.cpp:68 -#, c-format -msgid "Mismatched type of print host: %s" -msgstr "ÐеÑуміÑний тип хоÑту друку: %s" - -#: src/slic3r/Utils/AstroBox.cpp:84 -msgid "Connection to AstroBox works correctly." -msgstr "ÐŸÑ–Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ Ð´Ð¾ OctoPrint працює правильно." - -#: src/slic3r/Utils/AstroBox.cpp:90 -msgid "Could not connect to AstroBox" -msgstr "Ðе можливо підключитиÑÑ Ð´Ð¾ AstroBox" - -#: src/slic3r/Utils/AstroBox.cpp:92 -msgid "Note: AstroBox version at least 1.1.0 is required." -msgstr "Примітка: Потрібна верÑÑ–Ñ AstroBox принаймні 1.1.0." - -#: src/slic3r/Utils/Duet.cpp:47 -msgid "Connection to Duet works correctly." -msgstr "ÐŸÑ–Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ Ð´Ð¾ Duet працює правильно." - -#: src/slic3r/Utils/Duet.cpp:53 -msgid "Could not connect to Duet" -msgstr "Ðе можливо підключитиÑÑ Ð´Ð¾ Duet" - -#: src/slic3r/Utils/Duet.cpp:88 src/slic3r/Utils/Duet.cpp:151 -#: src/slic3r/Utils/FlashAir.cpp:122 src/slic3r/Utils/FlashAir.cpp:143 -#: src/slic3r/Utils/FlashAir.cpp:159 -msgid "Unknown error occured" -msgstr "СталаÑÑ Ð½ÐµÐ²Ñ–Ð´Ð¾Ð¼Ð° помилка" - -#: src/slic3r/Utils/Duet.cpp:145 -msgid "Wrong password" -msgstr "Ðеправильний пароль" - -#: src/slic3r/Utils/Duet.cpp:148 -msgid "Could not get resources to create a new connection" -msgstr "Ðе вдалоÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ реÑурÑи Ð´Ð»Ñ ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ з’єднаннÑ" - -#: src/slic3r/Utils/FixModelByWin10.cpp:219 -#: src/slic3r/Utils/FixModelByWin10.cpp:359 -msgid "Exporting source model" -msgstr "ЕкÑÐ¿Ð¾Ñ€Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð²Ð¸Ñ…Ñ–Ð´Ð½Ð¾Ñ— моделі" - -#: src/slic3r/Utils/FixModelByWin10.cpp:235 -msgid "Failed loading the input model." -msgstr "Помилка Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð²Ñ…Ñ–Ð´Ð½Ð¾Ñ— моделі." - -#: src/slic3r/Utils/FixModelByWin10.cpp:242 -msgid "Repairing model by the Netfabb service" -msgstr "Ð’Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð¼Ð¾Ð´ÐµÐ»Ñ– Ñлужбою Netfabb" - -#: src/slic3r/Utils/FixModelByWin10.cpp:248 -msgid "Mesh repair failed." -msgstr "Ðе вдалоÑÑ Ð²Ñ–Ð´Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ Ñітку." - -#: src/slic3r/Utils/FixModelByWin10.cpp:251 -#: src/slic3r/Utils/FixModelByWin10.cpp:378 -msgid "Loading repaired model" -msgstr "Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð²Ñ–Ð´Ñ€ÐµÐ¼Ð¾Ð½Ñ‚Ð¾Ð²Ð°Ð½Ð¾Ñ— моделі" - -#: src/slic3r/Utils/FixModelByWin10.cpp:263 -#: src/slic3r/Utils/FixModelByWin10.cpp:270 -#: src/slic3r/Utils/FixModelByWin10.cpp:302 -msgid "Saving mesh into the 3MF container failed." -msgstr "Ðе вдалоÑÑ Ð·Ð±ÐµÑ€ÐµÐ³Ñ‚Ð¸ Ñітку в контейнері 3MF." - -#: src/slic3r/Utils/FixModelByWin10.cpp:340 -msgid "Model fixing" -msgstr "Ремонт моделі" - -#: src/slic3r/Utils/FixModelByWin10.cpp:341 -msgid "Exporting model" -msgstr "ЕкÑÐ¿Ð¾Ñ€Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð¼Ð¾Ð´ÐµÐ»Ñ–" - -#: src/slic3r/Utils/FixModelByWin10.cpp:368 -msgid "Export of a temporary 3mf file failed" -msgstr "Ðе вдалоÑÑ ÐµÐºÑпортувати тимчаÑовий 3MF-файл" - -#: src/slic3r/Utils/FixModelByWin10.cpp:384 -msgid "Import of the repaired 3mf file failed" -msgstr "Ðе вдалоÑÑ Ñ–Ð¼Ð¿Ð¾Ñ€Ñ‚ÑƒÐ²Ð°Ñ‚Ð¸ відновлений 3MF-файл" - -#: src/slic3r/Utils/FixModelByWin10.cpp:386 -msgid "Repaired 3MF file does not contain any object" -msgstr "Відновлений 3MF-файл не міÑтить жодного об'єкта" - -#: src/slic3r/Utils/FixModelByWin10.cpp:388 -msgid "Repaired 3MF file contains more than one object" -msgstr "Відновлений 3MF-файл міÑтить більше одного об'єкта" - -#: src/slic3r/Utils/FixModelByWin10.cpp:390 -msgid "Repaired 3MF file does not contain any volume" -msgstr "Відновлений 3MF-файл не міÑтить жодної чаÑÑ‚Ñ–" - -#: src/slic3r/Utils/FixModelByWin10.cpp:392 -msgid "Repaired 3MF file contains more than one volume" -msgstr "Відновлений 3MF-файл міÑтить більше однієї чаÑÑ‚Ñ–" - -#: src/slic3r/Utils/FixModelByWin10.cpp:401 -msgid "Model repair finished" -msgstr "Ремонт моделі завершено" - -#: src/slic3r/Utils/FixModelByWin10.cpp:407 -msgid "Model repair canceled" -msgstr "Ремонт моделі ÑкаÑовано" - -#: src/slic3r/Utils/FixModelByWin10.cpp:424 -msgid "Model repaired successfully" -msgstr "Модель уÑпішно відремонтована" - -#: src/slic3r/Utils/FixModelByWin10.cpp:424 -#: src/slic3r/Utils/FixModelByWin10.cpp:427 -msgid "Model Repair by the Netfabb service" -msgstr "Ремонт моделі ÑервіÑом Netfabb" - -#: src/slic3r/Utils/FixModelByWin10.cpp:427 -msgid "Model repair failed:" -msgstr "Ðе вдалоÑÑ Ð²Ñ–Ð´Ñ€ÐµÐ¼Ð¾Ð½Ñ‚ÑƒÐ²Ð°Ñ‚Ð¸ модель:" - -#: src/slic3r/Utils/FlashAir.cpp:58 -msgid "Upload not enabled on FlashAir card." -msgstr "Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð½Ðµ ввімкнено на картці FlashAir." - -#: src/slic3r/Utils/FlashAir.cpp:68 -msgid "Connection to FlashAir works correctly and upload is enabled." -msgstr "ÐŸÑ–Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ Ð´Ð¾ FlashAir працює правильно, Ñ– Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð²Ð²Ñ–Ð¼ÐºÐ½ÐµÐ½Ð¾." - -#: src/slic3r/Utils/FlashAir.cpp:74 -msgid "Could not connect to FlashAir" -msgstr "Ðе можливо підключитиÑÑ Ð´Ð¾ FlashAir" - -#: src/slic3r/Utils/FlashAir.cpp:76 -msgid "" -"Note: FlashAir with firmware 2.00.02 or newer and activated upload function " -"is required." -msgstr "" -"Примітка: Потрібна FlashAir із прошивкою 2.00.02 або новішою та активованою " -"функцією завантаженнÑ." - -#: src/slic3r/Utils/OctoPrint.cpp:83 -msgid "Connection to OctoPrint works correctly." -msgstr "ÐŸÑ–Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ Ð´Ð¾ OctoPrint працює правильно." - -#: src/slic3r/Utils/OctoPrint.cpp:89 -msgid "Could not connect to OctoPrint" -msgstr "Ðе можливо підключитиÑÑ Ð´Ð¾ OctoPrint" - -#: src/slic3r/Utils/OctoPrint.cpp:91 -msgid "Note: OctoPrint version at least 1.1.0 is required." -msgstr "Зауважте: Ðеобхідна верÑÑ–Ñ OctoPrint - принаймні 1.1.0." - -#: src/slic3r/Utils/OctoPrint.cpp:185 -msgid "Connection to Prusa SL1 / SL1S works correctly." -msgstr "ÐŸÑ–Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ Ð´Ð¾ Prusa SL1 / SL1S працює правильно." - -#: src/slic3r/Utils/OctoPrint.cpp:191 -msgid "Could not connect to Prusa SLA" -msgstr "Ðе можливо підключитиÑÑ Ð´Ð¾ Prusa SLA" - -#: src/slic3r/Utils/OctoPrint.cpp:229 -msgid "Connection to PrusaLink works correctly." -msgstr "ÐŸÑ–Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ Ð´Ð¾ PrusaLink працює правильно." - -#: src/slic3r/Utils/OctoPrint.cpp:235 -msgid "Could not connect to PrusaLink" -msgstr "Ðе вдалоÑÑ Ð¿Ñ–Ð´ÐºÐ»ÑŽÑ‡Ð¸Ñ‚Ð¸ÑÑ Ð´Ð¾ PrusaLink" - -#: src/slic3r/Utils/PresetUpdater.cpp:65 -msgid "Copying of file %1% to %2% failed: %3%" -msgstr "Ðе вдалоÑÑ Ñкопіювати файл %1% до %2%: %3%" - -#: src/slic3r/Utils/PresetUpdater.cpp:744 -#, c-format -msgid "requires min. %s and max. %s" -msgstr "вимагаєтьÑÑ Ð¼Ñ–Ð½. %s та макÑ. %s" - -#: src/slic3r/Utils/PresetUpdater.cpp:748 -#, c-format -msgid "requires min. %s" -msgstr "вимагаєтьÑÑ Ð¼Ñ–Ð½. %s" - -#: src/slic3r/Utils/PresetUpdater.cpp:751 -#, c-format -msgid "requires max. %s" -msgstr "вимагаєтьÑÑ Ð¼Ð°ÐºÑ. %s" - -#: src/slic3r/Utils/Http.cpp:73 -msgid "" -"Could not detect system SSL certificate store. PrusaSlicer will be unable to " -"establish secure network connections." -msgstr "" -"Ðе вдалоÑÑ Ð²Ð¸Ñвити ÑиÑтеме Ñховище SSL Ñертифікатів. PrusaSlicer не зможе " -"вÑтановити безпечні мережеві з'єднаннÑ." - -#: src/slic3r/Utils/Http.cpp:78 -msgid "PrusaSlicer detected system SSL certificate store in: %1%" -msgstr "PrusaSlicer виÑвив ÑиÑтемне Ñховище Ñертифікатів SSL у: %1%" - -#: src/slic3r/Utils/Http.cpp:82 -msgid "" -"To specify the system certificate store manually, please set the %1% " -"environment variable to the correct CA bundle and restart the application." -======= #: src/slic3r/GUI/MainFrame.cpp:232 msgid "Closing PrusaSlicer while some presets are modified." msgstr "" @@ -14040,508 +5780,12 @@ msgstr "Завантажити модель, збережену в імперÑÑ #: src/slic3r/GUI/MainFrame.cpp:1209 msgid "Import SL1 / SL1S Archive" ->>>>>>> master msgstr "" -"Щоб вказати ÑиÑтемне Ñховище Ñертифікатів вручну, вÑтановіть змінну " -"Ñередовища %1% на правильний пакет CA Ñ– перезапуÑÑ‚Ñ–Ñ‚ÑŒ програму." -<<<<<<< HEAD -#: src/slic3r/Utils/Http.cpp:91 -msgid "" -"CURL init has failed. PrusaSlicer will be unable to establish network " -"connections. See logs for additional details." -======= #: src/slic3r/GUI/MainFrame.cpp:1209 msgid "Load an SL1 / Sl1S archive" ->>>>>>> master -msgstr "" -"Curl init зазнав невдачі. PrusaSlicer не зможе вÑтановити мережні " -"підключеннÑ. Додаткові відомоÑÑ‚Ñ– див." - -<<<<<<< HEAD -#: src/slic3r/Utils/Process.cpp:157 -msgid "Open G-code file:" -msgstr "Відкрити файл G-кода:" - -#: src/libslic3r/GCode.cpp:518 -msgid "There is an object with no extrusions on the first layer." -msgstr "ВиÑвлено об'єкт без екÑтрузії на першому шарі." - -#: src/libslic3r/GCode.cpp:536 -msgid "Empty layers detected, the output would not be printable." -msgstr "ВиÑвлено порожні шари, вихідні дані не можна надрукувати." - -#: src/libslic3r/GCode.cpp:537 -msgid "Print z" -msgstr "Друк на виÑоті" - -#: src/libslic3r/GCode.cpp:538 -msgid "" -"This is usually caused by negligibly small extrusions or by a faulty model. " -"Try to repair the model or change its orientation on the bed." -msgstr "" -"Зазвичай це Ñпричинено мізерно малою екÑтрузією або неÑправніÑÑ‚ÑŽ моделі. " -"Спробуйте відремонтувати модель або змінити Ñ—Ñ— орієнтацію на Ñтолі." - -#: src/libslic3r/GCode.cpp:1274 -msgid "" -"Your print is very close to the priming regions. Make sure there is no " -"collision." -msgstr "" -"Ваша модель Ð´Ð»Ñ Ð´Ñ€ÑƒÐºÑƒ розташована дуже близький до оÑновних облаÑтей. " -"ПереконайтеÑÑŒ, що немає зіткненнÑ." - -#: src/libslic3r/ExtrusionEntity.cpp:324 src/libslic3r/ExtrusionEntity.cpp:360 -msgid "Mixed" -msgstr "Змішаний" - -#: src/libslic3r/Flow.cpp:61 -msgid "" -"Cannot calculate extrusion width for %1%: Variable \"%2%\" not accessible." -msgstr "" -"Ðе вдаєтьÑÑ Ñ€Ð¾Ð·Ñ€Ð°Ñ…ÑƒÐ²Ð°Ñ‚Ð¸ ширину екÑтрузії Ð´Ð»Ñ %1%: Змінна \"%2%\" недоÑтупна." - -#: src/libslic3r/Format/3mf.cpp:1693 -msgid "" -"The selected 3mf file has been saved with a newer version of %1% and is not " -"compatible." -msgstr "Вибраний 3MF-файл було збережено з новою верÑією %1% Ñ– не ÑуміÑний." - -#: src/libslic3r/Format/AMF.cpp:979 -msgid "" -"The selected amf file has been saved with a newer version of %1% and is not " -"compatible." -msgstr "Вибраний ÐMF-файл було збережено з новою верÑією %1% Ñ– не ÑуміÑний." - -#: src/libslic3r/miniz_extension.cpp:91 -msgid "undefined error" -msgstr "невизначена помилка" - -#: src/libslic3r/miniz_extension.cpp:93 -msgid "too many files" -msgstr "забагато файлів" - -#: src/libslic3r/miniz_extension.cpp:95 -msgid "file too large" -msgstr "файл занадто великий" - -#: src/libslic3r/miniz_extension.cpp:97 -msgid "unsupported method" -msgstr "непідтримуваний метод" - -#: src/libslic3r/miniz_extension.cpp:99 -msgid "unsupported encryption" -msgstr "непідтримуване шифруваннÑ" - -#: src/libslic3r/miniz_extension.cpp:101 -msgid "unsupported feature" -msgstr "непідтримувана функціÑ" - -#: src/libslic3r/miniz_extension.cpp:103 -msgid "failed finding central directory" -msgstr "не вдалоÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ центральний каталог" - -#: src/libslic3r/miniz_extension.cpp:105 -msgid "not a ZIP archive" -msgstr "не ZIP-архів" - -#: src/libslic3r/miniz_extension.cpp:107 -msgid "invalid header or archive is corrupted" -msgstr "недійÑний заголовок або архів пошкоджено" - -#: src/libslic3r/miniz_extension.cpp:109 -msgid "unsupported multidisk archive" -msgstr "непідтримуваний багатодиÑковий архів" - -#: src/libslic3r/miniz_extension.cpp:111 -msgid "decompression failed or archive is corrupted" -msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ð¿Ð°ÐºÑƒÐ²Ð°Ñ‚Ð¸ або архів пошкоджено" - -#: src/libslic3r/miniz_extension.cpp:113 -msgid "compression failed" -msgstr "помилка компреÑÑ–Ñ—" - -#: src/libslic3r/miniz_extension.cpp:115 -msgid "unexpected decompressed size" -msgstr "неÑподіваний розпакований розмір" - -#: src/libslic3r/miniz_extension.cpp:117 -msgid "CRC-32 check failed" -msgstr "Помилка перевірки CRC-32" - -#: src/libslic3r/miniz_extension.cpp:119 -msgid "unsupported central directory size" -msgstr "непідтримуваний розмір центрального каталогу" - -#: src/libslic3r/miniz_extension.cpp:121 -msgid "allocation failed" -msgstr "Ñ€Ð¾Ð·Ð¼Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð½Ðµ вдавÑÑ" - -#: src/libslic3r/miniz_extension.cpp:123 -msgid "file open failed" -msgstr "не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ файл" - -#: src/libslic3r/miniz_extension.cpp:125 -msgid "file create failed" -msgstr "не вдалоÑÑ Ñтворити файл" - -#: src/libslic3r/miniz_extension.cpp:127 -msgid "file write failed" -msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати файл" - -#: src/libslic3r/miniz_extension.cpp:129 -msgid "file read failed" -msgstr "не вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ файл" - -#: src/libslic3r/miniz_extension.cpp:131 -msgid "file close failed" -msgstr "не вдалоÑÑ Ð·Ð°ÐºÑ€Ð¸Ñ‚Ð¸ файл" - -#: src/libslic3r/miniz_extension.cpp:133 -msgid "file seek failed" -msgstr "пошук файлу не вдавÑÑ" - -#: src/libslic3r/miniz_extension.cpp:135 -msgid "file stat failed" -msgstr "не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ STAT-файл" - -#: src/libslic3r/miniz_extension.cpp:137 -msgid "invalid parameter" -msgstr "некоректний параметр" - -#: src/libslic3r/miniz_extension.cpp:139 -msgid "invalid filename" -msgstr "некоректне ім'Ñ Ñ„Ð°Ð¹Ð»Ñƒ" - -#: src/libslic3r/miniz_extension.cpp:141 -msgid "buffer too small" -msgstr "занадто малий буфер" - -#: src/libslic3r/miniz_extension.cpp:143 -msgid "internal error" -msgstr "Ð²Ð½ÑƒÑ‚Ñ€Ñ–ÑˆÐ½Ñ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ°" - -#: src/libslic3r/miniz_extension.cpp:145 -msgid "file not found" -msgstr "файл не знайдено" - -#: src/libslic3r/miniz_extension.cpp:147 -msgid "archive is too large" -msgstr "архів завеликий" - -#: src/libslic3r/miniz_extension.cpp:149 -msgid "validation failed" -msgstr "не вдалоÑÑ Ð¿ÐµÑ€ÐµÐ²Ñ–Ñ€Ð¸Ñ‚Ð¸" - -#: src/libslic3r/miniz_extension.cpp:151 -msgid "write calledback failed" -msgstr "помилка запиÑу зворотного виклику" - -#: src/libslic3r/Preset.cpp:1307 -msgid "filament" -msgstr "філамент" - -#: src/libslic3r/Print.cpp:1251 -msgid "All objects are outside of the print volume." -msgstr "УÑÑ– об'єкти знаходÑÑ‚ÑŒÑÑ Ð¿Ð¾Ð·Ð° проÑторем друку." - -#: src/libslic3r/Print.cpp:1254 -msgid "The supplied settings will cause an empty print." -msgstr "Ðадані параметри ÑпричинÑÑ‚ÑŒ порожній друк." - -#: src/libslic3r/Print.cpp:1258 -msgid "Some objects are too close; your extruder will collide with them." -msgstr "" -"ДеÑкі предмети розташовано занадто близько; ваш екÑтрудер зіткнетьÑÑ Ð· ними." - -#: src/libslic3r/Print.cpp:1260 -msgid "" -"Some objects are too tall and cannot be printed without extruder collisions." -msgstr "" -"ДеÑкі предмети занадто виÑокі, Ñ– Ñ—Ñ… неможливо надрукувати без Ð·Ñ–Ñ‚ÐºÐ½ÐµÐ½Ð½Ñ " -"екÑтрудера." - -#: src/libslic3r/Print.cpp:1269 -msgid "" -"Only a single object may be printed at a time in Spiral Vase mode. Either " -"remove all but the last object, or enable sequential mode by " -"\"complete_objects\"." -msgstr "" -"ОдночаÑно в режимі Ñпіральної вази можна друкувати лише один об’єкт. Ðбо " -"видаліть уÑÑ–, крім оÑтаннього об'єкта, або ввімкніть поÑлідовний режим за " -"допомогою \"повних об'єктів\" (\"complete_objects\")." - -#: src/libslic3r/Print.cpp:1277 -msgid "" -"The Spiral Vase option can only be used when printing single material " -"objects." -msgstr "" -"Варіант Ñпіральної вази можна викориÑтовувати лише під Ñ‡Ð°Ñ Ð´Ñ€ÑƒÐºÑƒ одно-" -"матеріальних об’єктів." - -#: src/libslic3r/Print.cpp:1290 -msgid "" -"The wipe tower is only supported if all extruders have the same nozzle " -"diameter and use filaments of the same diameter." -msgstr "" -"Вежа Ð²Ð¸Ñ‚Ð¸Ñ€Ð°Ð½Ð½Ñ Ð¿Ñ–Ð´Ñ‚Ñ€Ð¸Ð¼ÑƒÑ”Ñ‚ÑŒÑÑ Ð»Ð¸ÑˆÐµ в тому випадку, Ñкщо вÑÑ– екÑтрудери мають " -"однаковий діаметр Ñопла Ñ– викориÑтовують філаменти одинакового діаметру." - -#: src/libslic3r/Print.cpp:1296 -msgid "" -"The Wipe Tower is currently only supported for the Marlin, RepRap/Sprinter, " -"RepRapFirmware and Repetier G-code flavors." -msgstr "" -"Ðаразі вежа Ð²Ð¸Ñ‚Ð¸Ñ€Ð°Ð½Ð½Ñ Ð¿Ñ–Ð´Ñ‚Ñ€Ð¸Ð¼ÑƒÑ”Ñ‚ÑŒÑÑ Ð»Ð¸ÑˆÐµ Ð´Ð»Ñ G-кодів, ÑуміÑних з Marlin, " -"RepRap/Sprinter, RepRapFirmware та Repetier ." - -#: src/libslic3r/Print.cpp:1298 -msgid "" -"The Wipe Tower is currently only supported with the relative extruder " -"addressing (use_relative_e_distances=1)." -msgstr "" -"Ðаразі вежа Ð²Ð¸Ñ‚Ð¸Ñ€Ð°Ð½Ð½Ñ Ð¿Ñ–Ð´Ñ‚Ñ€Ð¸Ð¼ÑƒÑ” лише відноÑну адреÑацію екÑтрудерів " -"(use_relative_e_distances = 1)." - -#: src/libslic3r/Print.cpp:1300 -msgid "Ooze prevention is currently not supported with the wipe tower enabled." -msgstr "" -"Ðаразі Ð·Ð°Ð¿Ð¾Ð±Ñ–Ð³Ð°Ð½Ð½Ñ Ð¿Ñ€Ð¾ÑÐ¾Ñ‡ÑƒÐ²Ð°Ð½Ð½Ñ Ð½Ðµ підтримуєтьÑÑ Ð· увімкненою вежею " -"витираннÑ." - -#: src/libslic3r/Print.cpp:1302 -msgid "" -"The Wipe Tower currently does not support volumetric E (use_volumetric_e=0)." -msgstr "Ðаразі вежа Ð²Ð¸Ñ‚Ð¸Ñ€Ð°Ð½Ð½Ñ Ð½Ðµ підтримує об'ємне E (use_volumetric_e = 0)." - -#: src/libslic3r/Print.cpp:1304 -msgid "" -"The Wipe Tower is currently not supported for multimaterial sequential " -"prints." -msgstr "" -"Ðаразі вежа Ð²Ð¸Ñ‚Ð¸Ñ€Ð°Ð½Ð½Ñ Ð½Ðµ підтримуєтьÑÑ Ð´Ð»Ñ Ð±Ð°Ð³Ð°Ñ‚Ð¾-матеріального поÑлідовного " -"друку." - -#: src/libslic3r/Print.cpp:1325 -msgid "" -"The Wipe Tower is only supported for multiple objects if they have equal " -"layer heights" -msgstr "" -"Вежа Ð²Ð¸Ñ‚Ð¸Ñ€Ð°Ð½Ð½Ñ Ð´Ð»Ñ ÐºÑ–Ð»ÑŒÐºÐ¾Ñ… об’єктів підтримуєтьÑÑ Ð»Ð¸ÑˆÐµ у випадку, коли вони " -"мають однакову виÑоту шару" - -#: src/libslic3r/Print.cpp:1327 -msgid "" -"The Wipe Tower is only supported for multiple objects if they are printed " -"over an equal number of raft layers" -msgstr "" -"Вежа Ð²Ð¸Ñ‚Ð¸Ñ€Ð°Ð½Ð½Ñ Ð´Ð»Ñ ÐºÑ–Ð»ÑŒÐºÐ¾Ñ… об’єктів підтримуєтьÑÑ Ð»Ð¸ÑˆÐµ у випадку, коли вони " -"надруковані на рівній кількоÑÑ‚Ñ– шарів плоту" - -#: src/libslic3r/Print.cpp:1329 -msgid "" -"The Wipe Tower is only supported for multiple objects if they are printed " -"with the same support_material_contact_distance" -msgstr "" -"Вежа Ð²Ð¸Ñ‚Ð¸Ñ€Ð°Ð½Ð½Ñ Ð´Ð»Ñ ÐºÑ–Ð»ÑŒÐºÐ¾Ñ… об’єктів підтримуєтьÑÑ Ð»Ð¸ÑˆÐµ у випадку, коли вони " -"надруковані з однаковою відÑтанню support_material_contact_distance" - -#: src/libslic3r/Print.cpp:1331 -msgid "" -"The Wipe Tower is only supported for multiple objects if they are sliced " -"equally." -msgstr "" -"Вежа Ð²Ð¸Ñ‚Ð¸Ñ€Ð°Ð½Ð½Ñ Ð´Ð»Ñ ÐºÑ–Ð»ÑŒÐºÐ¾Ñ… об’єктів підтримуєтьÑÑ Ð»Ð¸ÑˆÐµ у випадку, коли вони " -"нарізані однаково." - -#: src/libslic3r/Print.cpp:1373 -msgid "" -"The Wipe tower is only supported if all objects have the same variable layer " -"height" -msgstr "" -"Вежа Ð²Ð¸Ñ‚Ð¸Ñ€Ð°Ð½Ð½Ñ Ð¿Ñ–Ð´Ñ‚Ñ€Ð¸Ð¼ÑƒÑ”Ñ‚ÑŒÑÑ Ð»Ð¸ÑˆÐµ в тому випадку, Ñкщо вÑÑ– об’єкти мають " -"однакову виÑоту змінного шару" - -#: src/libslic3r/Print.cpp:1399 -msgid "" -"One or more object were assigned an extruder that the printer does not have." -msgstr "" -"Одному або декільком об’єктам було призначено екÑтрудер, Ñкого принтер не " -"має." - -#: src/libslic3r/Print.cpp:1408 -msgid "%1%=%2% mm is too low to be printable at a layer height %3% mm" -msgstr "%1%=%2% мм Ñ” занадто низьким Ð´Ð»Ñ Ð´Ñ€ÑƒÐºÑƒ на виÑоті шару %3% мм" - -#: src/libslic3r/Print.cpp:1411 -msgid "Excessive %1%=%2% mm to be printable with a nozzle diameter %3% mm" -msgstr "%1% = %2% мм Ñ” надмірно Ð´Ð»Ñ Ð´Ñ€ÑƒÐºÑƒ з діаметром Ñопла %3% мм" - -#: src/libslic3r/Print.cpp:1422 -msgid "" -"Printing with multiple extruders of differing nozzle diameters. If support " -"is to be printed with the current extruder (support_material_extruder == 0 " -"or support_material_interface_extruder == 0), all nozzles have to be of the " -"same diameter." -msgstr "" -"Друк за допомогою декількох екÑтрудерів різного діаметру Ñопла. Якщо " -"підтримки Ñлід друкувати поточним екÑтрудерем (support_material_extruder == " -"0 або support_material_interface_extruder == 0), уÑÑ– Ñопла повинні мати " -"однаковий діаметр." - -#: src/libslic3r/Print.cpp:1430 -msgid "" -"For the Wipe Tower to work with the soluble supports, the support layers " -"need to be synchronized with the object layers." -msgstr "" -"Ð”Ð»Ñ Ñ‚Ð¾Ð³Ð¾, щоб вежа Ð²Ð¸Ñ‚Ð¸Ñ€Ð°Ð½Ð½Ñ Ð¿Ñ€Ð°Ñ†ÑŽÐ²Ð°Ð»Ð° з розчинними підтримками, шари " -"підтримки повинні бути Ñинхронізовані з шарами об'єкта." - -#: src/libslic3r/Print.cpp:1434 -msgid "" -"The Wipe Tower currently supports the non-soluble supports only if they are " -"printed with the current extruder without triggering a tool change. (both " -"support_material_extruder and support_material_interface_extruder need to be " -"set to 0)." -msgstr "" -"Вежа Ð²Ð¸Ñ‚Ð¸Ñ€Ð°Ð½Ð½Ñ Ð² даний момент підтримує лише нерозчинні підтримки, Ñкщо вони " -"друкуютьÑÑ Ð· поточним екÑтрудером, не запуÑкаючи зміну інÑтрументу. (Обидва " -"Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ support_material_extruder Ñ– support_material_interface_extruder " -"повинні бути вÑтановлені на 0)." - -#: src/libslic3r/Print.cpp:1456 -msgid "First layer height can't be greater than nozzle diameter" -msgstr "ВиÑота першого шару не може перевищувати діаметр Ñопла" - -#: src/libslic3r/Print.cpp:1461 -msgid "Layer height can't be greater than nozzle diameter" -msgstr "ВиÑота шару не може перевищувати діаметр Ñопла" - -#: src/libslic3r/Print.cpp:1620 -msgid "Infilling layers" -msgstr "Шари наповненнÑ" - -#: src/libslic3r/Print.cpp:1646 -msgid "Generating skirt" -msgstr "Ð“ÐµÐ½ÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ñпідниці" - -#: src/libslic3r/Print.cpp:1655 -msgid "Generating brim" -msgstr "Ð“ÐµÐ½ÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ ÐºÑ€Ð°ÑŽ" - -#: src/libslic3r/Print.cpp:1678 -msgid "Exporting G-code" -msgstr "ЕкÑÐ¿Ð¾Ñ€Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ G-коду" - -#: src/libslic3r/Print.cpp:1682 -msgid "Generating G-code" -msgstr "Ð“ÐµÐ½ÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ G-коду" - -#: src/libslic3r/SLA/Pad.cpp:532 -msgid "Pad brim size is too small for the current configuration." -msgstr "Розмір краю подушки замалий Ð´Ð»Ñ Ð¿Ð¾Ñ‚Ð¾Ñ‡Ð½Ð¾Ñ— конфігурації." - -#: src/libslic3r/SLAPrint.cpp:630 -msgid "" -"Cannot proceed without support points! Add support points or disable support " -"generation." -msgstr "" -"Ðе можливо продовжувати без точок підтримки! Додайте точки підтримки або " -"вимкніть генерацію підтримки." - -#: src/libslic3r/SLAPrint.cpp:642 -msgid "" -"Elevation is too low for object. Use the \"Pad around object\" feature to " -"print the object without elevation." -msgstr "" -"ПіднÑÑ‚Ñ‚Ñ Ð·Ð°Ð½Ð°Ð´Ñ‚Ð¾ мале Ð´Ð»Ñ Ð¾Ð±'єкта. ВикориÑтовуйте функцію \"Подушка навколо " -"об'єкта\" Ð´Ð»Ñ Ð´Ñ€ÑƒÐºÑƒ об'єкта без піднÑÑ‚Ñ‚Ñ." - -#: src/libslic3r/SLAPrint.cpp:648 -msgid "" -"The endings of the support pillars will be deployed on the gap between the " -"object and the pad. 'Support base safety distance' has to be greater than " -"the 'Pad object gap' parameter to avoid this." -msgstr "" -"Кінці Ñтовпів підтримок будуть розміщені на зазорі між об'єктом Ñ– подушкою. " -"\"Безпечна відÑтань між оÑновами підтримки\" повинна бути більшою за " -"параметр \"Розрив Подушка-Об'єкт\", щоб уникнути цього." - -#: src/libslic3r/SLAPrint.cpp:663 -msgid "Exposition time is out of printer profile bounds." -msgstr "Ð§Ð°Ñ ÐµÐºÑпозиції виходить за межі профілю принтера." - -#: src/libslic3r/SLAPrint.cpp:670 -msgid "Initial exposition time is out of printer profile bounds." -msgstr "Початковий Ñ‡Ð°Ñ ÐµÐºÑпозиції виходить за межі профілю принтера." - -#: src/libslic3r/SLAPrint.cpp:786 -msgid "Slicing done" -msgstr "ÐÐ°Ñ€Ñ–Ð·Ð°Ð½Ð½Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¾" - -#: src/libslic3r/SLAPrintSteps.cpp:44 -msgid "Hollowing model" -msgstr "Ð’Ð¸Ð¿Ð¾Ñ€Ð¾Ð¶Ð½ÐµÐ½Ð½Ñ Ð¼Ð¾Ð´ÐµÐ»Ñ–" - -#: src/libslic3r/SLAPrintSteps.cpp:45 -msgid "Drilling holes into model." -msgstr "Ð¡Ð²ÐµÑ€Ð´Ð»Ñ–Ð½Ð½Ñ Ð¾Ñ‚Ð²Ð¾Ñ€Ñ–Ð² в моделі." - -#: src/libslic3r/SLAPrintSteps.cpp:46 -msgid "Slicing model" -msgstr "ÐÐ°Ñ€Ñ–Ð·Ð°Ð½Ð½Ñ Ð¼Ð¾Ð´ÐµÐ»Ñ–" - -#: src/libslic3r/SLAPrintSteps.cpp:47 src/libslic3r/SLAPrintSteps.cpp:359 -msgid "Generating support points" -msgstr "Ð“ÐµÐ½ÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ñ‚Ð¾Ñ‡Ð¾Ðº підтримки" - -#: src/libslic3r/SLAPrintSteps.cpp:48 -msgid "Generating support tree" -msgstr "Ð“ÐµÐ½ÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð´ÐµÑ€ÐµÐ²Ð° підтримки" - -#: src/libslic3r/SLAPrintSteps.cpp:49 -msgid "Generating pad" -msgstr "Ð“ÐµÐ½ÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ð¾Ð´ÑƒÑˆÐºÐ¸" - -#: src/libslic3r/SLAPrintSteps.cpp:50 -msgid "Slicing supports" -msgstr "ÐÐ°Ñ€Ñ–Ð·Ð°Ð½Ð½Ñ Ð¿Ñ–Ð´Ñ‚Ñ€Ð¸Ð¼Ð¾Ðº" - -#: src/libslic3r/SLAPrintSteps.cpp:65 -msgid "Merging slices and calculating statistics" -msgstr "Об'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ ÑˆÐ°Ñ€Ñ–Ð² друку та обчиÑÐ»ÐµÐ½Ð½Ñ ÑтатиÑтики" - -#: src/libslic3r/SLAPrintSteps.cpp:66 -msgid "Rasterizing layers" -msgstr "РаÑтеризуючі шари" - -#: src/libslic3r/SLAPrintSteps.cpp:192 -msgid "Too many overlapping holes." -msgstr "Забагато отворів, що перекриваютьÑÑ." - -#: src/libslic3r/SLAPrintSteps.cpp:201 -msgid "" -"Drilling holes into the mesh failed. This is usually caused by broken model. " -"Try to fix it first." -msgstr "" -"Ðе вдалоÑÑ Ð²Ð¸Ñвердлити отвори. Зазвичай це викликано зламаною моделлю. " -"Спершу Ñпробуйте Ñ—Ñ— виправити." - -#: src/libslic3r/SLAPrintSteps.cpp:247 -msgid "" -"Slicing had to be stopped due to an internal error: Inconsistent slice index." msgstr "" -"ÐÐ°Ñ€Ñ–Ð·Ð°Ð½Ð½Ñ Ð´Ð¾Ð²ÐµÐ»Ð¾ÑÑ Ð·ÑƒÐ¿Ð¸Ð½Ð¸Ñ‚Ð¸ через внутрішню помилку: Ðевідповідний Ñ–Ð½Ð´ÐµÐºÑ " -"зрізу." -#: src/libslic3r/SLAPrintSteps.cpp:411 src/libslic3r/SLAPrintSteps.cpp:420 -#: src/libslic3r/SLAPrintSteps.cpp:459 -msgid "Visualizing supports" -msgstr "Ð’Ñ–Ð·ÑƒÐ°Ð»Ñ–Ð·Ð°Ñ†Ñ–Ñ Ð¿Ñ–Ð´Ñ‚Ñ€Ð¸Ð¼ÐºÐ¸" - -#: src/libslic3r/SLAPrintSteps.cpp:451 -msgid "No pad can be generated for this model with the current configuration" -======= #: src/slic3r/GUI/MainFrame.cpp:1214 msgid "Import &Config" msgstr "Імпорт конфігурації" @@ -14839,74 +6083,13 @@ msgstr "Показати вікна черги Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ñ…Ð¾ÑÑ‚ #: src/slic3r/GUI/MainFrame.cpp:1413 msgid "Open New Instance" ->>>>>>> master msgstr "" -"Ð”Ð»Ñ Ñ†Ñ–Ñ”Ñ— моделі з поточною конфігурацією неможливо Ñтворити жодну подушку" -<<<<<<< HEAD -#: src/libslic3r/SLAPrintSteps.cpp:619 -msgid "" -"There are unprintable objects. Try to adjust support settings to make the " -"objects printable." -======= #: src/slic3r/GUI/MainFrame.cpp:1417 #: src/slic3r/GUI/UnsavedChangesDialog.cpp:1562 msgid "Compare Presets" ->>>>>>> master -msgstr "" -"Є об’єкти, що не друкуютьÑÑ. Спробуйте налаштувати параметри підтримки, щоб " -"зробити об’єкти Ð´Ð»Ñ Ð´Ñ€ÑƒÐºÑƒ." - -<<<<<<< HEAD -#: src/libslic3r/PrintBase.cpp:72 -msgid "Failed processing of the output_filename_format template." -msgstr "Помилка обробки шаблону output_filename_format." - -#: src/libslic3r/PrintConfig.cpp:43 src/libslic3r/PrintConfig.cpp:44 -msgid "Printer technology" -msgstr "Ð¢ÐµÑ…Ð½Ð¾Ð»Ð¾Ð³Ñ–Ñ Ð´Ñ€ÑƒÐºÑƒ" - -#: src/libslic3r/PrintConfig.cpp:51 -msgid "Bed shape" -msgstr "Форма Ñтолу" - -#: src/libslic3r/PrintConfig.cpp:56 -msgid "Bed custom texture" -msgstr "ВлаÑна текÑтура Ñтолу" - -#: src/libslic3r/PrintConfig.cpp:61 -msgid "Bed custom model" -msgstr "ВлаÑна модель Ñтолу" - -#: src/libslic3r/PrintConfig.cpp:66 -msgid "G-code thumbnails" -msgstr "ЕÑкізи G-коду" - -#: src/libslic3r/PrintConfig.cpp:67 -msgid "" -"Picture sizes to be stored into a .gcode and .sl1 / .sl1s files, in the " -"following format: \"XxY, XxY, ...\"" msgstr "" -"Розміри зображень, Ñкі зберігатимутьÑÑ Ñƒ файлах .gcode та .sl1 / .sl1s, у " -"такому форматі: \"XxY, XxY, ...\"" -#: src/libslic3r/PrintConfig.cpp:75 -msgid "" -"This setting controls the height (and thus the total number) of the slices/" -"layers. Thinner layers give better accuracy but take more time to print." -msgstr "" -"Цей параметр визначає виÑоту (Ñ–, таким чином, загальну кількіÑÑ‚ÑŒ) шарів. " -"Тонкі шари забезпечують більшу точніÑÑ‚ÑŒ, але Ð´Ð»Ñ Ð´Ñ€ÑƒÐºÑƒ потрібно більше чаÑу." - -#: src/libslic3r/PrintConfig.cpp:82 -msgid "Max print height" -msgstr "МакÑимальна виÑота друку" - -#: src/libslic3r/PrintConfig.cpp:83 -msgid "" -"Set this to the maximum height that can be reached by your extruder while " -"printing." -======= #: src/slic3r/GUI/MainFrame.cpp:1417 msgid "Compare presets" msgstr "" @@ -14929,312 +6112,8 @@ msgstr "Згорнути бічну панель" #: src/slic3r/GUI/MainFrame.cpp:1435 msgid "&Fullscreen" ->>>>>>> master -msgstr "" -"Ð’Ñтановіть це Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð½Ð° макÑимальну виÑоту, Ñкої може доÑÑгти ваш " -"екÑтрудер під Ñ‡Ð°Ñ Ð´Ñ€ÑƒÐºÑƒ." - -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:91 -msgid "Slice gap closing radius" -msgstr "Ð Ð°Ð´Ñ–ÑƒÑ Ð·Ð°ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ð·Ð°Ð·Ð¾Ñ€Ñƒ зрізу" - -#: src/libslic3r/PrintConfig.cpp:93 -msgid "" -"Cracks smaller than 2x gap closing radius are being filled during the " -"triangle mesh slicing. The gap closing operation may reduce the final print " -"resolution, therefore it is advisable to keep the value reasonably low." msgstr "" -"Тріщини з радіуÑом, меншим ніж 2 Ð·Ð°ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ð·Ð°Ð·Ð¾Ñ€Ñƒ, заповнюютьÑÑ Ð¿Ñ–Ð´ Ñ‡Ð°Ñ " -"Ð½Ð°Ñ€Ñ–Ð·ÑƒÐ²Ð°Ð½Ð½Ñ Ñ‚Ñ€Ð¸ÐºÑƒÑ‚Ð½Ð¾Ñ— Ñітки. ÐžÐ¿ÐµÑ€Ð°Ñ†Ñ–Ñ Ð·Ð°Ð¿Ð¾Ð²Ð½ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾Ð¼Ñ–Ð¶ÐºÑƒ може зменшити " -"оÑтаточну роздільну здатніÑÑ‚ÑŒ друку, тому доцільно підтримувати Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð½Ð° " -"доÑить низькому рівні." -#: src/libslic3r/PrintConfig.cpp:101 -msgid "Hostname, IP or URL" -msgstr "Ім'Ñ Ñ…Ð¾Ñта, IP або URL" - -#: src/libslic3r/PrintConfig.cpp:102 -msgid "" -"Slic3r can upload G-code files to a printer host. This field should contain " -"the hostname, IP address or URL of the printer host instance. Print host " -"behind HAProxy with basic auth enabled can be accessed by putting the user " -"name and password into the URL in the following format: https://username:" -"password@your-octopi-address/" -msgstr "" -"Slic3r може завантажувати файли G-коду на хоÑÑ‚ принтера. Це поле повинно " -"міÑтити Ñ–Ð¼â€™Ñ Ñ…Ð¾Ñту, IP-адреÑу або URL-адреÑу екземплÑра хоÑту принтера. ХоÑÑ‚ " -"друку, що Ñтоїть за HAProxy з увімкненою базовою автентифікацією, можна " -"отримати, ввівши Ñ–Ð¼â€™Ñ ÐºÐ¾Ñ€Ð¸Ñтувача та пароль у URL-адреÑу у такому форматі: " -"https://username:password@your-octopi-address/" - -#: src/libslic3r/PrintConfig.cpp:110 -msgid "API Key / Password" -msgstr "Ключ API / Пароль" - -#: src/libslic3r/PrintConfig.cpp:111 -msgid "" -"Slic3r can upload G-code files to a printer host. This field should contain " -"the API Key or the password required for authentication." -msgstr "" -"Slic3r може завантажувати файли G-коду на хоÑÑ‚ принтера. Це поле повинно " -"міÑтити ключ API або пароль, необхідний Ð´Ð»Ñ Ð°Ð²Ñ‚ÐµÐ½Ñ‚Ð¸Ñ„Ñ–ÐºÐ°Ñ†Ñ–Ñ—." - -#: src/libslic3r/PrintConfig.cpp:118 -msgid "Name of the printer" -msgstr "Ðазва принтера" - -#: src/libslic3r/PrintConfig.cpp:125 -msgid "" -"Custom CA certificate file can be specified for HTTPS OctoPrint connections, " -"in crt/pem format. If left blank, the default OS CA certificate repository " -"is used." -msgstr "" -"ÐаÑтроюваний файл Ñертифіката CA можна вказати Ð´Ð»Ñ Ð·'єднань HTTPS OctoPrint " -"у форматі crt/pem. Якщо залишити це поле порожнім, буде викориÑтано типове " -"Ñховище Ñертифікатів OS CA." - -#: src/libslic3r/PrintConfig.cpp:131 -msgid "Elephant foot compensation" -msgstr "Ð—Ñ€Ñ–Ð²Ð½Ð¾Ð²Ð°Ð¶ÐµÐ½Ð½Ñ Ð¡Ñ‚Ð¾Ð¿Ð¸ Ñлона" - -#: src/libslic3r/PrintConfig.cpp:133 -msgid "" -"The first layer will be shrunk in the XY plane by the configured value to " -"compensate for the 1st layer squish aka an Elephant Foot effect." -msgstr "" -"Перший шар буде зменшено в площині XY завдÑки налаштованому значенню, щоб " -"компенÑувати ефект Ðоги Слона Ð´Ð»Ñ 1-го шару." - -#: src/libslic3r/PrintConfig.cpp:149 -msgid "Password" -msgstr "Пароль" - -#: src/libslic3r/PrintConfig.cpp:155 -msgid "Printer preset name" -msgstr "Ðазва преÑету принтера" - -#: src/libslic3r/PrintConfig.cpp:156 -msgid "Related printer preset name" -msgstr "Ðазва пов’Ñзаного преÑету принтера" - -#: src/libslic3r/PrintConfig.cpp:161 -msgid "Authorization Type" -msgstr "Тип авторизації" - -#: src/libslic3r/PrintConfig.cpp:166 -msgid "API key" -msgstr "Ключ API" - -#: src/libslic3r/PrintConfig.cpp:167 -msgid "HTTP digest" -msgstr "ДайджеÑÑ‚ HTTP" - -#: src/libslic3r/PrintConfig.cpp:180 -msgid "Avoid crossing perimeters" -msgstr "Уникати Ð¿ÐµÑ€ÐµÑ‚Ð¸Ð½Ð°Ð½Ð½Ñ Ð¿ÐµÑ€Ð¸Ð¼ÐµÑ‚Ñ€Ñ–Ð²" - -#: src/libslic3r/PrintConfig.cpp:181 -msgid "" -"Optimize travel moves in order to minimize the crossing of perimeters. This " -"is mostly useful with Bowden extruders which suffer from oozing. This " -"feature slows down both the print and the G-code generation." -msgstr "" -"Оптимізуйте рухи переÑувань, щоб мінімізувати перетин периметрів. Ð’ " -"оÑновному це кориÑно Ð´Ð»Ñ ÐµÐºÑтрудерів Bowden, Ñкі Ñтраждають від протіканнÑ. " -"Ð¦Ñ Ñ„ÑƒÐ½ÐºÑ†Ñ–Ñ ÑƒÐ¿Ð¾Ð²Ñ–Ð»ÑŒÐ½ÑŽÑ” Ñк друк, так Ñ– генерацію G-коду." - -#: src/libslic3r/PrintConfig.cpp:188 -msgid "Avoid crossing perimeters - Max detour length" -msgstr "Уникати Ð¿ÐµÑ€ÐµÑ‚Ð¸Ð½Ð°Ð½Ð½Ñ Ð¿ÐµÑ€Ð¸Ð¼ÐµÑ‚Ñ€Ñ–Ð² - МакÑ. довжина обходу" - -#: src/libslic3r/PrintConfig.cpp:190 -msgid "" -"The maximum detour length for avoid crossing perimeters. If the detour is " -"longer than this value, avoid crossing perimeters is not applied for this " -"travel path. Detour length could be specified either as an absolute value or " -"as percentage (for example 50%) of a direct travel path." -msgstr "" -"МакÑимальна довжина обходу, щоб уникнути перетину периметрів. Якщо обхід " -"довший за це значеннÑ, ÑƒÐ½Ð¸ÐºÐ½ÐµÐ½Ð½Ñ Ð¿ÐµÑ€ÐµÑ‚Ð¸Ð½Ñƒ периметрів Ð´Ð»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ шлÑху не " -"заÑтоÑовуєтьÑÑ. Довжина обходу може бути вказана або Ñк абÑолютне значеннÑ, " -"або Ñк відÑоток (наприклад, 50%) від прÑмого шлÑху проходу." - -#: src/libslic3r/PrintConfig.cpp:193 -msgid "mm or % (zero to disable)" -msgstr "мм або % (0, щоб вимкнути)" - -#: src/libslic3r/PrintConfig.cpp:199 src/libslic3r/PrintConfig.cpp:2293 -msgid "Other layers" -msgstr "Інші шари" - -#: src/libslic3r/PrintConfig.cpp:200 -msgid "" -"Bed temperature for layers after the first one. Set this to zero to disable " -"bed temperature control commands in the output." -msgstr "" -"Температура Ñтолу Ð´Ð»Ñ Ð¾Ñтанніх шарів піÑÐ»Ñ Ð¿ÐµÑ€ÑˆÐ¾Ð³Ð¾. УÑтановіть 0, щоб " -"відключити команди ÐºÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ñ‚ÐµÐ¼Ð¿ÐµÑ€Ð°Ñ‚ÑƒÑ€Ð¾ÑŽ Ñтолу на виході." - -#: src/libslic3r/PrintConfig.cpp:203 -msgid "Bed temperature" -msgstr "Температура Ñтолу" - -#: src/libslic3r/PrintConfig.cpp:210 -msgid "" -"This custom code is inserted at every layer change, right before the Z move. " -"Note that you can use placeholder variables for all Slic3r settings as well " -"as [layer_num] and [layer_z]." -msgstr "" -"Цей кориÑтувацький код вÑтавлÑєтьÑÑ Ð¿Ñ€Ð¸ кожній зміні шару перед початком " -"Ð¿ÐµÑ€ÐµÐ¼Ñ–Ñ‰ÐµÐ½Ð½Ñ Z. Зауважте, що ви можете викориÑтовувати шаблонні змінні Ð´Ð»Ñ " -"вÑÑ–Ñ… параметрів Slic3r, а також [layer_num] Ñ– [layer_z]." - -#: src/libslic3r/PrintConfig.cpp:220 -msgid "Between objects G-code" -msgstr "G-код між об'єктами" - -#: src/libslic3r/PrintConfig.cpp:221 -msgid "" -"This code is inserted between objects when using sequential printing. By " -"default extruder and bed temperature are reset using non-wait command; " -"however if M104, M109, M140 or M190 are detected in this custom code, Slic3r " -"will not add temperature commands. Note that you can use placeholder " -"variables for all Slic3r settings, so you can put a \"M109 " -"S[first_layer_temperature]\" command wherever you want." -msgstr "" -"Цей код вÑтавлÑєтьÑÑ Ð¼Ñ–Ð¶ об'єктами при викориÑтанні поÑлідовного друку. За " -"замовчуваннÑм екÑтрудер Ñ– температура полотна ÑкидаютьÑÑ Ð·Ð° допомогою " -"команди non-wait; однак, Ñкщо в цьому кориÑтувальному коді виÑвлÑÑŽÑ‚ÑŒÑÑ M104, " -"M109, M140 або M190, Slic3r не додаватиме команди температури. Зверніть " -"увагу, що ви можете викориÑтовувати шаблонні змінні Ð´Ð»Ñ Ð²ÑÑ–Ñ… параметрів " -"Slic3r, то ж ви можете вÑтавити команду \"M109 S [first_layer_temperature]\" " -"де завгодно." - -#: src/libslic3r/PrintConfig.cpp:232 -msgid "Number of solid layers to generate on bottom surfaces." -msgstr "КількіÑÑ‚ÑŒ Ñуцільних шарів, генерованих на нижніх поверхнÑÑ…." - -#: src/libslic3r/PrintConfig.cpp:233 -msgid "Bottom solid layers" -msgstr "Ðижні Ñуцільні шари" - -#: src/libslic3r/PrintConfig.cpp:241 -msgid "" -"The number of bottom solid layers is increased above bottom_solid_layers if " -"necessary to satisfy minimum thickness of bottom shell." -msgstr "" -"КількіÑÑ‚ÑŒ твердих шарів знизу збільшуєтьÑÑ Ð½Ð°Ð´ нижчими твердими шарами, Ñкщо " -"це необхідно Ð´Ð»Ñ Ð·Ð°Ð´Ð¾Ð²Ð¾Ð»ÐµÐ½Ð½Ñ Ð¼Ñ–Ð½Ñ–Ð¼Ð°Ð»ÑŒÐ½Ð¾Ñ— товщини донної оболонки." - -#: src/libslic3r/PrintConfig.cpp:243 -msgid "Minimum bottom shell thickness" -msgstr "Мінімальна товщина нижньої оболонки" - -#: src/libslic3r/PrintConfig.cpp:249 -msgid "Bridge" -msgstr "МіÑÑ‚" - -#: src/libslic3r/PrintConfig.cpp:250 -msgid "" -"This is the acceleration your printer will use for bridges. Set zero to " -"disable acceleration control for bridges." -msgstr "" -"Це приÑкореннÑ, Ñке ваш принтер викориÑтовуватиме Ð´Ð»Ñ Ð¼Ð¾Ñтів. Ð’Ñтановити 0, " -"щоб відключити ÑƒÐ¿Ñ€Ð°Ð²Ð»Ñ–Ð½Ð½Ñ Ð¿Ñ€Ð¸ÑкореннÑм Ð´Ð»Ñ Ð¼Ð¾Ñтів." - -#: src/libslic3r/PrintConfig.cpp:252 src/libslic3r/PrintConfig.cpp:395 -#: src/libslic3r/PrintConfig.cpp:940 src/libslic3r/PrintConfig.cpp:1079 -#: src/libslic3r/PrintConfig.cpp:1360 src/libslic3r/PrintConfig.cpp:1409 -#: src/libslic3r/PrintConfig.cpp:1419 src/libslic3r/PrintConfig.cpp:1614 -msgid "mm/s²" -msgstr "мм/Ѳ" - -#: src/libslic3r/PrintConfig.cpp:258 -msgid "Bridging angle" -msgstr "Кут моÑта" - -#: src/libslic3r/PrintConfig.cpp:260 -msgid "" -"Bridging angle override. If left to zero, the bridging angle will be " -"calculated automatically. Otherwise the provided angle will be used for all " -"bridges. Use 180° for zero angle." -msgstr "" -"Зміна кута моÑту. Якщо вÑтановити на 0, кут моÑтів буде розрахований " -"автоматично. Інакше передбачений кут буде викориÑтаний Ð´Ð»Ñ Ð²ÑÑ–Ñ… моÑтів. " -"ВикориÑтовуйте 180° Ð´Ð»Ñ Ð½ÑƒÐ»ÑŒÐ¾Ð²Ð¾Ð³Ð¾ кута." - -#: src/libslic3r/PrintConfig.cpp:263 src/libslic3r/PrintConfig.cpp:852 -#: src/libslic3r/PrintConfig.cpp:1855 src/libslic3r/PrintConfig.cpp:1865 -#: src/libslic3r/PrintConfig.cpp:2123 src/libslic3r/PrintConfig.cpp:2278 -#: src/libslic3r/PrintConfig.cpp:2477 src/libslic3r/PrintConfig.cpp:2978 -#: src/libslic3r/PrintConfig.cpp:3099 -msgid "°" -msgstr "°" - -#: src/libslic3r/PrintConfig.cpp:269 -msgid "Bridges fan speed" -msgstr "ШвидкіÑÑ‚ÑŒ вентилÑтора Ð´Ð»Ñ Ð¼Ð¾Ñтів" - -#: src/libslic3r/PrintConfig.cpp:270 -msgid "This fan speed is enforced during all bridges and overhangs." -msgstr "Ð¦Ñ ÑˆÐ²Ð¸Ð´ÐºÑ–ÑÑ‚ÑŒ вентилÑтора виконуєтьÑÑ Ð´Ð»Ñ Ð²ÑÑ–Ñ… моÑтів Ñ– виÑтупів." - -#: src/libslic3r/PrintConfig.cpp:271 src/libslic3r/PrintConfig.cpp:864 -#: src/libslic3r/PrintConfig.cpp:1248 src/libslic3r/PrintConfig.cpp:1427 -#: src/libslic3r/PrintConfig.cpp:1490 src/libslic3r/PrintConfig.cpp:1747 -#: src/libslic3r/PrintConfig.cpp:2655 src/libslic3r/PrintConfig.cpp:2892 -#: src/libslic3r/PrintConfig.cpp:3018 -msgid "%" -msgstr "%" - -#: src/libslic3r/PrintConfig.cpp:278 -msgid "Bridge flow ratio" -msgstr "Ð¡Ð¿Ñ–Ð²Ð²Ñ–Ð´Ð½Ð¾ÑˆÐµÐ½Ð½Ñ Ð¼Ð¾Ñтового потоку" - -#: src/libslic3r/PrintConfig.cpp:280 -msgid "" -"This factor affects the amount of plastic for bridging. You can decrease it " -"slightly to pull the extrudates and prevent sagging, although default " -"settings are usually good and you should experiment with cooling (use a fan) " -"before tweaking this." -msgstr "" -"Цей фактор впливає на кількіÑÑ‚ÑŒ плаÑтику Ð´Ð»Ñ Ð¼Ð¾Ñтів. Ви можете трохи " -"зменшити його, щоб витÑгнути екÑтрудати та не допуÑтити провиÑаннÑ, хоча " -"Ñтандартні Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð·Ð°Ð·Ð²Ð¸Ñ‡Ð°Ð¹ добрі, тому ви маете по-екÑпериментувати з " -"охолодженнÑм (викориÑтовуйте вентилÑтор), перш ніж Ñ—Ñ… налаштувати." - -#: src/libslic3r/PrintConfig.cpp:290 -msgid "Bridges" -msgstr "МоÑти" - -#: src/libslic3r/PrintConfig.cpp:292 -msgid "Speed for printing bridges." -msgstr "ШвидкіÑÑ‚ÑŒ друку моÑтів." - -#: src/libslic3r/PrintConfig.cpp:293 src/libslic3r/PrintConfig.cpp:671 -#: src/libslic3r/PrintConfig.cpp:679 src/libslic3r/PrintConfig.cpp:688 -#: src/libslic3r/PrintConfig.cpp:696 src/libslic3r/PrintConfig.cpp:723 -#: src/libslic3r/PrintConfig.cpp:742 src/libslic3r/PrintConfig.cpp:1015 -#: src/libslic3r/PrintConfig.cpp:1194 src/libslic3r/PrintConfig.cpp:1267 -#: src/libslic3r/PrintConfig.cpp:1343 src/libslic3r/PrintConfig.cpp:1377 -#: src/libslic3r/PrintConfig.cpp:1389 src/libslic3r/PrintConfig.cpp:1399 -#: src/libslic3r/PrintConfig.cpp:1449 src/libslic3r/PrintConfig.cpp:1508 -#: src/libslic3r/PrintConfig.cpp:1644 src/libslic3r/PrintConfig.cpp:1822 -#: src/libslic3r/PrintConfig.cpp:1831 src/libslic3r/PrintConfig.cpp:2257 -#: src/libslic3r/PrintConfig.cpp:2384 -msgid "mm/s" -msgstr "мм/Ñ" - -#: src/libslic3r/PrintConfig.cpp:300 -msgid "Brim width" -msgstr "Ширина краю" - -#: src/libslic3r/PrintConfig.cpp:301 -msgid "" -"Horizontal width of the brim that will be printed around each object on the " -"first layer." -======= #: src/slic3r/GUI/MainFrame.cpp:1435 msgid "Fullscreen" msgstr "" @@ -15367,42 +6246,8 @@ msgstr "Вибрати конфігурацію Ð´Ð»Ñ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ: #: src/slic3r/GUI/MainFrame.cpp:1809 msgid "Exporting configuration bundle" ->>>>>>> master msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:308 -msgid "Clip multi-part objects" -msgstr "Обрізати об'єкти, що ÑкладаютьÑÑ Ð· кількох чаÑтин" - -#: src/libslic3r/PrintConfig.cpp:309 -msgid "" -"When printing multi-material objects, this settings will make Slic3r to clip " -"the overlapping object parts one by the other (2nd part will be clipped by " -"the 1st, 3rd part will be clipped by the 1st and 2nd etc)." -msgstr "" -"Під Ñ‡Ð°Ñ Ð´Ñ€ÑƒÐºÑƒ багато-матеріальних об'єктів ці Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ð¾Ð·Ð²Ð¾Ð»ÑÑ‚ÑŒ Slic3r " -"відÑікати накладені чаÑтини об'єкта одна за одною (друга чаÑтина буде " -"відÑічена першою, Ñ‚Ñ€ÐµÑ‚Ñ Ñ‡Ð°Ñтина буде відÑічена першою та другою тощо)." - -#: src/libslic3r/PrintConfig.cpp:316 -msgid "Colorprint height" -msgstr "ВиÑота кольорового друку" - -#: src/libslic3r/PrintConfig.cpp:317 -msgid "Heights at which a filament change is to occur." -msgstr "ВиÑоти, на Ñких має відбуватиÑÑ Ð·Ð¼Ñ–Ð½Ð° філаменту." - -#: src/libslic3r/PrintConfig.cpp:327 -msgid "Compatible printers condition" -msgstr "Умови ÑуміÑноÑÑ‚Ñ– принтерів" - -#: src/libslic3r/PrintConfig.cpp:328 -msgid "" -"A boolean expression using the configuration values of an active printer " -"profile. If this expression evaluates to true, this profile is considered " -"compatible with the active printer profile." -======= #: src/slic3r/GUI/MainFrame.cpp:1810 msgid "" "Some presets are modified and the unsaved changes will not be exported into " @@ -15469,20 +6314,8 @@ msgstr "%s виÑвив помилку" #: src/slic3r/GUI/MsgDialog.cpp:232 #, c-format, boost-format msgid "%s warning" ->>>>>>> master msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:342 -msgid "Compatible print profiles condition" -msgstr "Умови ÑуміÑноÑÑ‚Ñ– преÑетів друку" - -#: src/libslic3r/PrintConfig.cpp:343 -msgid "" -"A boolean expression using the configuration values of an active print " -"profile. If this expression evaluates to true, this profile is considered " -"compatible with the active print profile." -======= #: src/slic3r/GUI/MsgDialog.cpp:233 #, c-format, boost-format msgid "%s has a warning" @@ -15491,19 +6324,8 @@ msgstr "" #: src/slic3r/GUI/MsgDialog.cpp:246 src/slic3r/GUI/MsgDialog.cpp:259 #, c-format, boost-format msgid "%s info" ->>>>>>> master msgstr "" -"Логічний вираз, що викориÑтовує Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ ÐºÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ— активного профілю " -"друку. Якщо цей вираз оцінюєтьÑÑ Ñк Правда, цей профіль вважаєтьÑÑ ÑуміÑним " -"з активним профілем друку." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:360 -msgid "Complete individual objects" -msgstr "Закінчити окремі об'єкти" - -#: src/libslic3r/PrintConfig.cpp:361 -======= #: src/slic3r/GUI/MsgDialog.cpp:287 #, c-format, boost-format msgid "%s information" @@ -15522,7 +6344,6 @@ msgid "See more." msgstr "Див. докладніше." #: src/slic3r/GUI/NotificationManager.hpp:761 ->>>>>>> master msgid "" "You have just added a G-code for color change, but its value is empty.\n" "To export the G-code correctly, check the \"Color Change G-code\" in " @@ -15532,80 +6353,32 @@ msgstr "" "Щоб правильно екÑпортувати G-код, перевірте Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñƒ «G-коду зміни " "кольору» в «Параметри принтера > КориÑтувацький G-код»" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:369 -msgid "Enable auto cooling" -msgstr "Увімкнути автоматичне охолодженнÑ" - -#: src/libslic3r/PrintConfig.cpp:370 -======= #: src/slic3r/GUI/NotificationManager.hpp:764 ->>>>>>> master msgid "" "No color change event was added to the print. The print does not look like a " "sign." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:375 -msgid "Cooling tube position" -msgstr "ÐŸÐ¾Ð·Ð¸Ñ†Ñ–Ñ Ð¾Ñ…Ð¾Ð»Ð¾Ð´Ð¶ÑƒÐ²Ð°Ð»ÑŒÐ½Ð¾Ñ— трубки" - -#: src/libslic3r/PrintConfig.cpp:376 -msgid "Distance of the center-point of the cooling tube from the extruder tip." -======= #: src/slic3r/GUI/NotificationManager.hpp:766 msgid "Desktop integration was successful." msgstr "" #: src/slic3r/GUI/NotificationManager.hpp:768 msgid "Desktop integration failed." ->>>>>>> master msgstr "" -"ВідÑтань центральної точки охолоджувальної трубки від наконечника екÑтрудера." - -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:383 -msgid "Cooling tube length" -msgstr "Довжина охолоджувальної трубки" -#: src/libslic3r/PrintConfig.cpp:384 -msgid "Length of the cooling tube to limit space for cooling moves inside it." -======= #: src/slic3r/GUI/NotificationManager.hpp:770 msgid "Undo desktop integration was successful." msgstr "" #: src/slic3r/GUI/NotificationManager.hpp:772 msgid "Undo desktop integration failed." ->>>>>>> master msgstr "" -"Довжина охолоджувальної трубки Ð´Ð»Ñ Ð¾Ð±Ð¼ÐµÐ¶ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾Ñтору Ð´Ð»Ñ Ð¾Ñ…Ð¾Ð»Ð¾Ð´Ð¶ÑƒÑŽÑ‡Ð¸Ñ… рухів " -"вÑередині неї." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:392 -msgid "" -"This is the acceleration your printer will be reset to after the role-" -"specific acceleration values are used (perimeter/infill). Set zero to " -"prevent resetting acceleration at all." -======= #: src/slic3r/GUI/NotificationManager.hpp:773 msgid "Exporting." ->>>>>>> master msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:401 -msgid "Default filament profile" -msgstr "Профіль філаметну за замовчаннÑм" - -#: src/libslic3r/PrintConfig.cpp:402 -msgid "" -"Default filament profile associated with the current printer profile. On " -"selection of the current printer profile, this filament profile will be " -"activated." -======= #: src/slic3r/GUI/NotificationManager.cpp:664 msgid "Open Folder." msgstr "Відкрити папку." @@ -15620,57 +6393,16 @@ msgstr "" #: src/slic3r/GUI/NotificationManager.cpp:890 msgid "CANCELED" ->>>>>>> master msgstr "" -"Профіль філаметну за замовчаннÑм, пов'Ñзаний з поточним профілем принтера. " -"При виборі поточного профілю принтера цей профіль філаметну буде активовано." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:408 -msgid "Default print profile" -msgstr "Профіль друку за замовчаннÑм" - -#: src/libslic3r/PrintConfig.cpp:409 src/libslic3r/PrintConfig.cpp:2822 -#: src/libslic3r/PrintConfig.cpp:2833 -msgid "" -"Default print profile associated with the current printer profile. On " -"selection of the current printer profile, this print profile will be " -"activated." -======= #: src/slic3r/GUI/NotificationManager.cpp:895 msgid "COMPLETED" msgstr "" #: src/slic3r/GUI/NotificationManager.cpp:937 msgid "Cancel upload" ->>>>>>> master msgstr "" -"Профіль друку за промовчаннÑм, пов'Ñзаний із поточним профілем принтера. При " -"виборі поточного профілю принтера цей профіль друку буде активовано." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:415 -msgid "Disable fan for the first" -msgstr "Вимкнути вентилÑтор Ð´Ð»Ñ Ð¿ÐµÑ€ÑˆÐ¾Ð³Ð¾(их)" - -#: src/libslic3r/PrintConfig.cpp:416 -msgid "" -"You can set this to a positive value to disable fan at all during the first " -"layers, so that it does not make adhesion worse." -msgstr "" -"Ви можете вÑтановити це позитивне значеннÑ, щоб взагалі вимкнути вентилÑтор " -"протÑгом друку декількох перших шарів, щоб це не призвело до гіршого " -"зчепленнÑ." - -#: src/libslic3r/PrintConfig.cpp:425 -msgid "Don't support bridges" -msgstr "Ðе підтримувати моÑти" - -#: src/libslic3r/PrintConfig.cpp:427 -msgid "" -"Experimental option for preventing support material from being generated " -"under bridged areas." -======= #: src/slic3r/GUI/NotificationManager.cpp:996 #, c-format, boost-format msgid "%1$d object was loaded with custom supports." @@ -15721,47 +6453,8 @@ msgstr "ЕкÑпортувати G-код." #: src/slic3r/GUI/NotificationManager.cpp:1113 msgid "Export." ->>>>>>> master -msgstr "" - -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:433 -msgid "Distance between copies" -msgstr "ВідÑтань між копіÑми" - -#: src/libslic3r/PrintConfig.cpp:434 -msgid "Distance used for the auto-arrange feature of the plater." -msgstr "ВідÑтань викориÑтовуєтьÑÑ Ð´Ð»Ñ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡Ð½Ð¾Ð³Ð¾ Ñ€Ð¾Ð·Ñ‚Ð°ÑˆÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ð»Ð°Ñ‚ÐµÑ€Ñƒ." - -#: src/libslic3r/PrintConfig.cpp:442 -msgid "" -"This end procedure is inserted at the end of the output file. Note that you " -"can use placeholder variables for all PrusaSlicer settings." -msgstr "" -"Ð¦Ñ Ð¿Ñ€Ð¾Ñ†ÐµÐ´ÑƒÑ€Ð° Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð½Ñ Ð²ÑтавлÑєтьÑÑ Ð² кінець вихідного файлу. Зверніть " -"увагу, що ви можете викориÑтовувати шаблонні змінні Ð´Ð»Ñ Ð²ÑÑ–Ñ… налаштувань " -"PrusaSlicer." - -#: src/libslic3r/PrintConfig.cpp:452 -msgid "" -"This end procedure is inserted at the end of the output file, before the " -"printer end gcode (and before any toolchange from this filament in case of " -"multimaterial printers). Note that you can use placeholder variables for all " -"PrusaSlicer settings. If you have multiple extruders, the gcode is processed " -"in extruder order." msgstr "" -"Ð¦Ñ Ð¿Ñ€Ð¾Ñ†ÐµÐ´ÑƒÑ€Ð° Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð½Ñ Ð²ÑтавлÑєтьÑÑ Ð² кінець вихідного файлу, перед " -"кінцевим кодом принтера (Ñ– перед будь-Ñкою заміною інÑтрументу з цього " -"філаменту у разі багатоматеріальних принтерів). Зверніть увагу, що ви можете " -"викориÑтовувати шаблонні змінні Ð´Ð»Ñ Ð²ÑÑ–Ñ… налаштувань PrusaSlicer. Якщо у Ð²Ð°Ñ " -"кілька екÑтрудерів, G-код оброблÑєтьÑÑ Ð² порÑдку екÑтрудера." -#: src/libslic3r/PrintConfig.cpp:463 -msgid "Ensure vertical shell thickness" -msgstr "Ð—Ð°Ð±ÐµÐ·Ð¿ÐµÑ‡ÐµÐ½Ð½Ñ Ñ‚Ð¾Ð²Ñ‰Ð¸Ð½Ð¸ вертикальної оболонки" - -#: src/libslic3r/PrintConfig.cpp:465 -======= #: src/slic3r/GUI/NotificationManager.cpp:1447 #: src/slic3r/GUI/NotificationManager.cpp:1454 #: src/slic3r/GUI/NotificationManager.cpp:1470 @@ -15823,124 +6516,21 @@ msgid "You may need to update your graphics card driver." msgstr "Можливо, вам доведетьÑÑ Ð¾Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ драйвер відеокарти." #: src/slic3r/GUI/OpenGLManager.cpp:263 ->>>>>>> master msgid "" "As a workaround, you may run PrusaSlicer with a software rendered 3D " "graphics by running prusa-slicer.exe with the --sw-renderer parameter." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:471 -msgid "Top fill pattern" -msgstr "Верхній шаблон наповненнÑ" - -#: src/libslic3r/PrintConfig.cpp:473 -======= #: src/slic3r/GUI/OpenGLManager.cpp:265 msgid "Unsupported OpenGL version" msgstr "Ðепідтримувана верÑÑ–Ñ OpenGL" #: src/slic3r/GUI/OpenGLManager.cpp:273 #, c-format, boost-format ->>>>>>> master msgid "" "Unable to load the following shaders:\n" "%s" msgstr "" -<<<<<<< HEAD -"Шаблон Ð´Ð»Ñ Ð²ÐµÑ€Ñ…Ð½ÑŒÐ¾Ð³Ð¾ наповненнÑ. Це впливає лише на зовнішній видимий шар, а " -"не на ÑуÑідні Ñуцільні оболонки." - -#: src/libslic3r/PrintConfig.cpp:483 src/libslic3r/PrintConfig.cpp:918 -#: src/libslic3r/PrintConfig.cpp:2238 -msgid "Rectilinear" -msgstr "ПрÑмолінійний" - -#: src/libslic3r/PrintConfig.cpp:484 -msgid "Monotonic" -msgstr "Монотонне" - -#: src/libslic3r/PrintConfig.cpp:485 src/libslic3r/PrintConfig.cpp:919 -msgid "Aligned Rectilinear" -msgstr "ВирівнÑний прÑмолінійний" - -#: src/libslic3r/PrintConfig.cpp:486 src/libslic3r/PrintConfig.cpp:925 -msgid "Concentric" -msgstr "Концентричний" - -#: src/libslic3r/PrintConfig.cpp:487 src/libslic3r/PrintConfig.cpp:929 -msgid "Hilbert Curve" -msgstr "Крива Гільберта" - -#: src/libslic3r/PrintConfig.cpp:488 src/libslic3r/PrintConfig.cpp:930 -msgid "Archimedean Chords" -msgstr "Ðрхімедові акорди" - -#: src/libslic3r/PrintConfig.cpp:489 src/libslic3r/PrintConfig.cpp:931 -msgid "Octagram Spiral" -msgstr "Спіраль октаграм" - -#: src/libslic3r/PrintConfig.cpp:495 -msgid "Bottom fill pattern" -msgstr "Ðижній шаблон наповненнÑ" - -#: src/libslic3r/PrintConfig.cpp:497 -msgid "" -"Fill pattern for bottom infill. This only affects the bottom external " -"visible layer, and not its adjacent solid shells." -msgstr "" -"Шаблон Ð´Ð»Ñ Ð½Ð¸Ð¶Ð½ÑŒÐ¾Ð³Ð¾ наповненнÑ. Це впливає лише на зовнішній видимий шар, а " -"не на ÑуÑідні Ñуцільні оболонки." - -#: src/libslic3r/PrintConfig.cpp:506 src/libslic3r/PrintConfig.cpp:517 -msgid "External perimeters" -msgstr "Зовнішні периметри" - -#: src/libslic3r/PrintConfig.cpp:508 -msgid "" -"Set this to a non-zero value to set a manual extrusion width for external " -"perimeters. If left zero, default extrusion width will be used if set, " -"otherwise 1.125 x nozzle diameter will be used. If expressed as percentage " -"(for example 200%), it will be computed over layer height." -msgstr "" -"Ð’Ñтановіть Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð½ÐµÐ½ÑƒÐ»ÑŒÐ¾Ð²Ð¸Ð¼, щоб вÑтановити ручну ширину екÑтрузії Ð´Ð»Ñ " -"зовнішніх периметрів. Якщо залишити 0, ширина екÑтрузії за замовчуваннÑм " -"буде викориÑтана, Ñкщо вÑтановлено, інакше буде викориÑтано 1,125 x діаметр " -"Ñопла. Якщо він виражений у відÑотках (наприклад, 200%), він буде " -"обчиÑлюватиÑÑ Ð·Ð° виÑотою шару." - -#: src/libslic3r/PrintConfig.cpp:511 src/libslic3r/PrintConfig.cpp:621 -#: src/libslic3r/PrintConfig.cpp:962 src/libslic3r/PrintConfig.cpp:975 -#: src/libslic3r/PrintConfig.cpp:1104 src/libslic3r/PrintConfig.cpp:1159 -#: src/libslic3r/PrintConfig.cpp:1185 src/libslic3r/PrintConfig.cpp:1634 -#: src/libslic3r/PrintConfig.cpp:1963 src/libslic3r/PrintConfig.cpp:2112 -#: src/libslic3r/PrintConfig.cpp:2180 src/libslic3r/PrintConfig.cpp:2341 -msgid "mm or %" -msgstr "мм або %" - -#: src/libslic3r/PrintConfig.cpp:519 -msgid "" -"This separate setting will affect the speed of external perimeters (the " -"visible ones). If expressed as percentage (for example: 80%) it will be " -"calculated on the perimeters speed setting above. Set to zero for auto." -msgstr "" -"Цей окремий параметр впливає на швидкіÑÑ‚ÑŒ зовнішніх периметрів (видимих). " -"Якщо вона виражена у відÑотках (наприклад: 80%), вона буде розрахована на " -"Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ ÑˆÐ²Ð¸Ð´ÐºÐ¾ÑÑ‚Ñ– периметра вище. Ð’Ñтановити 0 Ð´Ð»Ñ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡Ð½Ð¾Ð³Ð¾ " -"викориÑтаннÑ." - -#: src/libslic3r/PrintConfig.cpp:522 src/libslic3r/PrintConfig.cpp:984 -#: src/libslic3r/PrintConfig.cpp:1922 src/libslic3r/PrintConfig.cpp:1974 -#: src/libslic3r/PrintConfig.cpp:2224 src/libslic3r/PrintConfig.cpp:2354 -msgid "mm/s or %" -msgstr "мм/Ñ Ð°Ð±Ð¾ %" - -#: src/libslic3r/PrintConfig.cpp:529 -msgid "External perimeters first" -msgstr "Спочатку зовнішні периметри" - -#: src/libslic3r/PrintConfig.cpp:531 -======= "Ðе вдаєтьÑÑ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸ такі шейдери:\n" "%s" @@ -16003,7 +6593,6 @@ msgid "Refresh Printers" msgstr "Оновити принтери" #: src/slic3r/GUI/PhysicalPrinterDialog.cpp:364 ->>>>>>> master msgid "" "HTTPS CA file is optional. It is only needed if you use HTTPS with a self-" "signed certificate." @@ -16011,33 +6600,6 @@ msgstr "" "Файл HTTPS CA не Ñ” обов'Ñзковим. Це потрібно, лише Ñкщо ви викориÑтовуєте " "HTTPS із ÑамопідпиÑаним Ñертифікатом." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:537 -msgid "Extra perimeters if needed" -msgstr "Додаткові периметри, Ñкщо необхідно" - -#: src/libslic3r/PrintConfig.cpp:539 -msgid "" -"Add more perimeters when needed for avoiding gaps in sloping walls. Slic3r " -"keeps adding perimeters, until more than 70% of the loop immediately above " -"is supported." -msgstr "" -"За необхідноÑÑ‚Ñ– додайте периметри, щоб уникнути прогалин у похилих Ñтінах. " -"Slic3r продовжує додавати периметри, поки підтримуєтьÑÑ Ð±Ñ–Ð»ÑŒÑˆÐµ 70% петель " -"безпоÑередньо вище." - -#: src/libslic3r/PrintConfig.cpp:549 -msgid "" -"The extruder to use (unless more specific extruder settings are specified). " -"This value overrides perimeter and infill extruders, but not the support " -"extruders." -msgstr "" -"ВикориÑтовуваний екÑтрудер (Ñкщо не вказано більш конкретні параметри " -"екÑтрудера). Це Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð¿ÐµÑ€ÐµÐ²Ð¸Ð·Ð½Ð°Ñ‡Ð°Ñ” екÑтрудери периметра та наповнювача, " -"але не екÑтрудери підтримки." - -#: src/libslic3r/PrintConfig.cpp:561 -======= #: src/slic3r/GUI/PhysicalPrinterDialog.cpp:374 msgid "Certificate files (*.crt, *.pem)|*.crt;*.pem|All files|*.*" msgstr "Файли Ñертифікатів (*.crt, *.pem)|*.crt;*.pem|УÑÑ– файли|*.*" @@ -16053,24 +6615,14 @@ msgstr "Файл CA Ñертифікату" #: src/slic3r/GUI/PhysicalPrinterDialog.cpp:405 #, c-format, boost-format ->>>>>>> master msgid "" "On this system, %s uses HTTPS certificates from the system Certificate Store " "or Keychain." msgstr "" -<<<<<<< HEAD -"УÑтановіть Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ñк вертикальну відÑтань між наконечником Ñопла та " -"(звичайно) шатунами X каретки. Іншими Ñловами, це виÑота циліндра Ð¾Ñ‡Ð¸Ñ‰ÐµÐ½Ð½Ñ " -"навколо вашого екÑтрудера, Ñ– це ÑвлÑÑ” Ñобою макÑимальну глибину, Ñку " -"екÑтрудер може розглÑдати до Ð·Ñ–Ñ‚ÐºÐ½ÐµÐ½Ð½Ñ Ð· іншими друкованими предметами." - -#: src/libslic3r/PrintConfig.cpp:572 -======= "Ðа цій ÑиÑтемі, %s викориÑтовує HTTPS-Ñертифікати з ÑиÑтемного Ñховища " "Ñертифікатів або Keychain." #: src/slic3r/GUI/PhysicalPrinterDialog.cpp:406 ->>>>>>> master msgid "" "To use a custom CA file, please import your CA file into Certificate Store / " "Keychain." @@ -16078,30 +6630,14 @@ msgstr "" "Щоб викориÑтовувати влаÑний CA файл, будь-лаÑка, імпортуйте його у Ñховища " "Ñертифікатів / Keychain." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:582 -msgid "Extruder Color" -msgstr "Колір екÑтрудера" - -#: src/libslic3r/PrintConfig.cpp:583 src/libslic3r/PrintConfig.cpp:645 -msgid "This is only used in the Slic3r interface as a visual help." -======= #: src/slic3r/GUI/PhysicalPrinterDialog.cpp:630 msgid "The supplied name is empty. It can't be saved." msgstr "Ðадане ім'Ñ Ð¿Ð¾Ñ€Ð¾Ð¶Ð½Ñ”. Ðе вдаєтьÑÑ Ð·Ð±ÐµÑ€ÐµÐ³Ñ‚Ð¸." #: src/slic3r/GUI/PhysicalPrinterDialog.cpp:634 msgid "You should change the name of your printer device." ->>>>>>> master msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:589 -msgid "Extruder offset" -msgstr "Ð—Ð¼Ñ–Ñ‰ÐµÐ½Ð½Ñ ÐµÐºÑтрудеру" - -#: src/libslic3r/PrintConfig.cpp:590 -======= #: src/slic3r/GUI/PhysicalPrinterDialog.cpp:642 #, boost-format msgid "Printer with name \"%1%\" already exists." @@ -16113,7 +6649,6 @@ msgstr "Замінити?" #: src/slic3r/GUI/PhysicalPrinterDialog.cpp:670 #, boost-format ->>>>>>> master msgid "" "Following printer preset is duplicated:%1%The above preset for printer \"%2%" "\" will be used just once." @@ -16124,174 +6659,23 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:599 -msgid "Extrusion axis" -msgstr "ОÑÑŒ екÑтрузії" - -#: src/libslic3r/PrintConfig.cpp:600 -msgid "" -"Use this option to set the axis letter associated to your printer's extruder " -"(usually E but some printers use A)." -======= #: src/slic3r/GUI/PhysicalPrinterDialog.cpp:720 msgid "It's not possible to delete the last related preset for the printer." msgstr "Ðеможливо видалити оÑтанній преÑет Ð´Ð»Ñ Ð¿Ñ€Ð¸Ð½Ñ‚ÐµÑ€Ð°." #: src/slic3r/GUI/Plater.cpp:141 msgid "The provided name is not valid;" ->>>>>>> master msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:605 -msgid "Extrusion multiplier" -msgstr "Коефіцієнт екÑтрузії" - -#: src/libslic3r/PrintConfig.cpp:606 -======= #: src/slic3r/GUI/Plater.cpp:142 src/slic3r/GUI/SavePresetDialog.cpp:102 msgid "the following characters are not allowed:" msgstr "такі Ñимволи не допуÑкаютьÑÑ:" #: src/slic3r/GUI/Plater.cpp:207 ->>>>>>> master msgid "" "For a multipart object, this value isn't accurate.\n" "It doesn't take account of intersections and negative volumes." msgstr "" -<<<<<<< HEAD -"Цей фактор пропорційно змінює величину потоку. Вам може знадобитиÑÑ " -"налаштувати цей параметр, щоб отримати хорошу обробку поверхні та правильно " -"визначити ширину однієї Ñтіни. Звичайні Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ - від 0,9 до 1,1. Якщо ви " -"вважаєте, що його потрібно більше змінити, перевірте діаметр філаменту та E " -"кроки прошивки ." - -#: src/libslic3r/PrintConfig.cpp:615 -msgid "Default extrusion width" -msgstr "Ширина екÑтрузії за замовчаннÑм" - -#: src/libslic3r/PrintConfig.cpp:617 -msgid "" -"Set this to a non-zero value to allow a manual extrusion width. If left to " -"zero, Slic3r derives extrusion widths from the nozzle diameter (see the " -"tooltips for perimeter extrusion width, infill extrusion width etc). If " -"expressed as percentage (for example: 230%), it will be computed over layer " -"height." -msgstr "" -"УÑтановіть ненульове значеннÑ, щоб дозволити ручне Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ ÑˆÐ¸Ñ€Ð¸Ð½Ð¸ " -"екÑтрузії. Якщо залишити Ñк 0, Slic3r отримує ширину екÑтрузії від діаметра " -"Ñопла (див. Підказки Ð´Ð»Ñ ÑˆÐ¸Ñ€Ð¸Ð½Ð¸ екÑтрузії периметру, ширини екÑтрузії " -"наповнювача тощо). Якщо Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð²Ð¸Ñ€Ð°Ð¶ÐµÐ½Ðµ у відÑотках (наприклад: 230%), " -"воно буде обчиÑлюватиÑÑ Ð·Ð° виÑотою шару." - -#: src/libslic3r/PrintConfig.cpp:628 -msgid "Keep fan always on" -msgstr "Тримайте вентилÑтор завжди" - -#: src/libslic3r/PrintConfig.cpp:629 -msgid "" -"If this is enabled, fan will never be disabled and will be kept running at " -"least at its minimum speed. Useful for PLA, harmful for ABS." -msgstr "" -"Якщо Ñ†Ñ Ð¾Ð¿Ñ†Ñ–Ñ Ð²Ð²Ñ–Ð¼ÐºÐ½ÐµÐ½Ð°, вентилÑтор ніколи не буде відключений Ñ– буде " -"триматиÑÑ, Ñк мінімум, на мінімальній швидкоÑÑ‚Ñ–. КориÑно Ð´Ð»Ñ PLA, шкідливо " -"Ð´Ð»Ñ ABS." - -#: src/libslic3r/PrintConfig.cpp:634 -msgid "Enable fan if layer print time is below" -msgstr "Увімкнути вентилÑтор, Ñкщо Ñ‡Ð°Ñ Ð´Ñ€ÑƒÐºÑƒ шару нижче" - -#: src/libslic3r/PrintConfig.cpp:635 -msgid "" -"If layer print time is estimated below this number of seconds, fan will be " -"enabled and its speed will be calculated by interpolating the minimum and " -"maximum speeds." -msgstr "" -"Якщо Ñ‡Ð°Ñ Ð´Ñ€ÑƒÐºÑƒ шару оцінюєтьÑÑ Ð½Ð¸Ð¶Ñ‡Ðµ цієї кількоÑÑ‚Ñ– Ñекунд, вентилÑтор буде " -"активований, а його швидкіÑÑ‚ÑŒ буде розрахована шлÑхом інтерполÑції " -"мінімальної та макÑимальної швидкоÑÑ‚Ñ–." - -#: src/libslic3r/PrintConfig.cpp:637 src/libslic3r/PrintConfig.cpp:1910 -msgid "approximate seconds" -msgstr "приблизні Ñекунди" - -#: src/libslic3r/PrintConfig.cpp:644 -msgid "Color" -msgstr "Колір" - -#: src/libslic3r/PrintConfig.cpp:650 -msgid "Filament notes" -msgstr "Примітки до філаменту" - -#: src/libslic3r/PrintConfig.cpp:651 -msgid "You can put your notes regarding the filament here." -msgstr "Тут ви можете поміÑтити Ñвої нотатки щодо філаменту." - -#: src/libslic3r/PrintConfig.cpp:659 src/libslic3r/PrintConfig.cpp:1455 -msgid "Max volumetric speed" -msgstr "МакÑимальна об'ємна швидкіÑÑ‚ÑŒ" - -#: src/libslic3r/PrintConfig.cpp:660 -msgid "" -"Maximum volumetric speed allowed for this filament. Limits the maximum " -"volumetric speed of a print to the minimum of print and filament volumetric " -"speed. Set to zero for no limit." -msgstr "" -"МакÑимальна об'ємна швидкіÑÑ‚ÑŒ, припуÑтима Ð´Ð»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ філаметну. Обмежує " -"макÑимальну об'ємну швидкіÑÑ‚ÑŒ друку до мінімуму об'ємної швидкоÑÑ‚Ñ– друку та " -"філаметну. Ð’Ñтановити 0 Ð´Ð»Ñ Ð²Ñ–Ð´ÑутноÑÑ‚Ñ– обмежень." - -#: src/libslic3r/PrintConfig.cpp:669 -msgid "Loading speed" -msgstr "ШвидкіÑÑ‚ÑŒ заведеннÑ" - -#: src/libslic3r/PrintConfig.cpp:670 -msgid "Speed used for loading the filament on the wipe tower." -msgstr "" -"ШвидкіÑÑ‚ÑŒ, що викориÑтовуєтьÑÑ Ð´Ð»Ñ Ð·Ð°Ð²ÐµÐ´ÐµÐ½Ð½Ñ Ñ„Ñ–Ð»Ð°Ð¼ÐµÐ½Ñ‚Ñƒ на вежі витираннÑ." - -#: src/libslic3r/PrintConfig.cpp:677 -msgid "Loading speed at the start" -msgstr "ШвидкіÑÑ‚ÑŒ Ð·Ð°Ð²ÐµÐ´ÐµÐ½Ð½Ñ Ð½Ð° Ñтарті" - -#: src/libslic3r/PrintConfig.cpp:678 -msgid "Speed used at the very beginning of loading phase." -msgstr "ШвидкіÑÑ‚ÑŒ, що викориÑтовуєтьÑÑ Ð½Ð° Ñамому початку фази заведеннÑ." - -#: src/libslic3r/PrintConfig.cpp:685 -msgid "Unloading speed" -msgstr "ШвидкіÑÑ‚ÑŒ виведеннÑ" - -#: src/libslic3r/PrintConfig.cpp:686 -msgid "" -"Speed used for unloading the filament on the wipe tower (does not affect " -"initial part of unloading just after ramming)." -msgstr "" -"ШвидкіÑÑ‚ÑŒ, Ñка викориÑтовуєтьÑÑ Ð´Ð»Ñ Ð²Ð¸Ð²ÐµÐ´ÐµÐ½Ð½Ñ Ñ„Ñ–Ð»Ð°Ð¼ÐµÐ½Ñ‚Ñƒ на вежі Ð²Ð¸Ñ‚Ð¸Ñ€Ð°Ð½Ð½Ñ " -"(не впливає на початкову чаÑтину Ð²Ð¸Ð²ÐµÐ´ÐµÐ½Ð½Ñ Ð±ÐµÐ·Ð¿Ð¾Ñередньо піÑÐ»Ñ Ñ€Ð°Ð¼Ð¼Ñ–Ð½Ð³Ñƒ)." - -#: src/libslic3r/PrintConfig.cpp:694 -msgid "Unloading speed at the start" -msgstr "ШвидкіÑÑ‚ÑŒ Ð²Ð¸Ð²ÐµÐ´ÐµÐ½Ð½Ñ Ð½Ð° Ñтарті" - -#: src/libslic3r/PrintConfig.cpp:695 -msgid "" -"Speed used for unloading the tip of the filament immediately after ramming." -msgstr "" -"ШвидкіÑÑ‚ÑŒ, Ñка викориÑтовуєтьÑÑ Ð´Ð»Ñ Ð²Ð¸Ð²ÐµÐ´ÐµÐ½Ð½Ñ ÐºÑ–Ð½Ñ‡Ð¸ÐºÑƒ філаменту " -"безпоÑередньо піÑÐ»Ñ Ñ€Ð°Ð¼Ð¼Ñ–Ð½Ð³Ñƒ." - -#: src/libslic3r/PrintConfig.cpp:702 -msgid "Delay after unloading" -msgstr "Затримка піÑÐ»Ñ Ð²Ð¸Ð²ÐµÐ´ÐµÐ½Ð½Ñ" - -#: src/libslic3r/PrintConfig.cpp:703 -msgid "" -"Time to wait after the filament is unloaded. May help to get reliable " -"toolchanges with flexible materials that may need more time to shrink to " -"original dimensions." -======= #: src/slic3r/GUI/Plater.cpp:211 msgid "Volume" @@ -16468,22 +6852,8 @@ msgstr "Імпорт SLÐ-архіву" #: src/slic3r/GUI/Plater.cpp:1727 #, boost-format msgid "Do you want to save the changes to \"%1%\"?" ->>>>>>> master msgstr "" -"Ð§Ð°Ñ Ð¾Ñ‡Ñ–ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ñ–ÑÐ»Ñ Ð²Ð¸Ð²ÐµÐ´ÐµÐ½Ð½Ñ Ñ„Ñ–Ð»Ð°Ð¼ÐµÐ½Ñ‚Ñƒ. Може допомогти отримати надійну " -"заміну інÑтрументу Ð´Ð»Ñ Ð³Ð½ÑƒÑ‡ÐºÐ¸Ñ… матеріалів, Ñким може знадобитиÑÑ Ð±Ñ–Ð»ÑŒÑˆÐµ " -"чаÑу, щоб зменшитиÑÑŒ до початкових розмірів." - -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:712 -msgid "Number of cooling moves" -msgstr "КількіÑÑ‚ÑŒ охолоджуючих рухів" -#: src/libslic3r/PrintConfig.cpp:713 -msgid "" -"Filament is cooled by being moved back and forth in the cooling tubes. " -"Specify desired number of these moves." -======= #: src/slic3r/GUI/Plater.cpp:1732 src/slic3r/GUI/Preferences.cpp:222 msgid "Ask for unsaved changes in project" msgstr "" @@ -16493,83 +6863,8 @@ msgid "" "You will not be asked about it again, when: \n" "- Closing PrusaSlicer,\n" "- Loading or creating a new project" ->>>>>>> master -msgstr "" -"Філамент охолоджуєтьÑÑ ÑˆÐ»Ñхом Ð¿ÐµÑ€ÐµÐ¼Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð²Ð¿ÐµÑ€ÐµÐ´-назад у охолоджувальних " -"трубках. Вкажіть бажану кількіÑÑ‚ÑŒ цих рухів." - -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:721 -msgid "Speed of the first cooling move" -msgstr "ШвидкіÑÑ‚ÑŒ першого охолоджуючого руху" - -#: src/libslic3r/PrintConfig.cpp:722 -msgid "Cooling moves are gradually accelerating beginning at this speed." msgstr "" -"Охолоджувальні рухи поÑтупово приÑкорюютьÑÑ, починаючи з цієї швидкоÑÑ‚Ñ–." -#: src/libslic3r/PrintConfig.cpp:729 -msgid "Minimal purge on wipe tower" -msgstr "Мінімальний екÑтрудований об'єм на очиÑній вежі" - -#: src/libslic3r/PrintConfig.cpp:730 -msgid "" -"After a tool change, the exact position of the newly loaded filament inside " -"the nozzle may not be known, and the filament pressure is likely not yet " -"stable. Before purging the print head into an infill or a sacrificial " -"object, Slic3r will always prime this amount of material into the wipe tower " -"to produce successive infill or sacrificial object extrusions reliably." -msgstr "" -"ПіÑÐ»Ñ Ð·Ð¼Ñ–Ð½Ð¸ інÑтрументу точне Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð½Ñ Ð·Ð½Ð¾Ð²Ñƒ заведеного філаменту вÑередину " -"Ñопла може бути невідоме, а тиÑк філаменту, Ñкоріше за вÑе, ще не " -"Ñтабільний. Перш ніж прочищати друкувальну головку до Ð·Ð°Ð¿Ð¾Ð²Ð½ÐµÐ½Ð½Ñ Ð°Ð±Ð¾ " -"очищувальної вежі, Slic3r завжди продавлює цю кількіÑÑ‚ÑŒ матеріалу до " -"очищувальної вежі, щоб отримати поÑлідовне заповненнÑ." - -#: src/libslic3r/PrintConfig.cpp:734 -msgid "mm³" -msgstr "мм³" - -#: src/libslic3r/PrintConfig.cpp:740 -msgid "Speed of the last cooling move" -msgstr "ШвидкіÑÑ‚ÑŒ оÑтаннього охолоджуючого руху" - -#: src/libslic3r/PrintConfig.cpp:741 -msgid "Cooling moves are gradually accelerating towards this speed." -msgstr "Охолоджувальні рухи поÑтупово приÑкорюютьÑÑ Ð´Ð¾ цієї швидкоÑÑ‚Ñ–." - -#: src/libslic3r/PrintConfig.cpp:748 -msgid "Filament load time" -msgstr "Ð§Ð°Ñ Ð·Ð°Ð²ÐµÐ´ÐµÐ½Ð½Ñ Ñ„Ñ–Ð»Ð°Ð¼ÐµÐ½Ñ‚Ñƒ" - -#: src/libslic3r/PrintConfig.cpp:749 -msgid "" -"Time for the printer firmware (or the Multi Material Unit 2.0) to load a new " -"filament during a tool change (when executing the T code). This time is " -"added to the total print time by the G-code time estimator." -msgstr "" -"Ð§Ð°Ñ Ð´Ð»Ñ Ð¿Ñ€Ð¾ÑˆÐ¸Ð²ÐºÐ¸ принтера (або Multi Material Unit 2.0), щоб завеÑти новий " -"філамент під Ñ‡Ð°Ñ Ð·Ð°Ð¼Ñ–Ð½Ð¸ інÑтрументу (під Ñ‡Ð°Ñ Ð²Ð¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ ÐºÐ¾Ð´Ñƒ Т). Цей Ñ‡Ð°Ñ " -"додаєтьÑÑ Ð´Ð¾ загального чаÑу друку за допомогою оцінювача чаÑу G-коду." - -#: src/libslic3r/PrintConfig.cpp:756 -msgid "Ramming parameters" -msgstr "Параметри раммінгу" - -#: src/libslic3r/PrintConfig.cpp:757 -msgid "" -"This string is edited by RammingDialog and contains ramming specific " -"parameters." -msgstr "" -"Цей Ñ€Ñдок відредаговано у діалогу налаштувань раммінгу та міÑтить певні " -"параметри раммінгу." - -#: src/libslic3r/PrintConfig.cpp:763 -msgid "Filament unload time" -msgstr "Ð§Ð°Ñ Ð²Ð¸Ð²ÐµÐ´ÐµÐ½Ð½Ñ Ñ„Ñ–Ð»Ð°Ð¼ÐµÐ½Ñ‚Ñƒ" - -#: src/libslic3r/PrintConfig.cpp:764 -======= #: src/slic3r/GUI/Plater.cpp:2197 #, c-format, boost-format msgid "" @@ -16685,118 +6980,28 @@ msgstr "ВиÑвлено розширені дані" #: src/slic3r/GUI/Plater.cpp:2625 #, c-format, boost-format ->>>>>>> master msgid "" "You can't to add the object(s) from %s because of one or some of them " "is(are) multi-part" msgstr "" -<<<<<<< HEAD -"Ð§Ð°Ñ Ð´Ð»Ñ Ð¿Ñ€Ð¾ÑˆÐ¸Ð²ÐºÐ¸ принтера (або Multi Material Unit 2.0), щоб вивеÑти " -"філамент під Ñ‡Ð°Ñ Ð·Ð°Ð¼Ñ–Ð½Ð¸ інÑтрументу (під Ñ‡Ð°Ñ Ð²Ð¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ ÐºÐ¾Ð´Ñƒ Т). Цей Ñ‡Ð°Ñ " -"додаєтьÑÑ Ð´Ð¾ загального чаÑу друку за допомогою оцінювача чаÑу G-коду." - -#: src/libslic3r/PrintConfig.cpp:772 -======= "Ви не можете додати об’єкт(и) із %s через те, що один або деÑкі з них " "ÑкладаєтьÑÑ Ð· декількох чаÑтин" #: src/slic3r/GUI/Plater.cpp:2648 ->>>>>>> master msgid "" "Multiple objects were loaded for a multi-material printer.\n" "Instead of considering them as multiple objects, should I consider\n" "these files to represent a single object having multiple parts?" msgstr "" -<<<<<<< HEAD -"Введіть тут діаметр Ñвого філаменту. Ðеобхідна виÑока точніÑÑ‚ÑŒ, тому " -"викориÑтовуйте Ñуматор Ñ– виконайте декілька вимірювань вздовж філаменту, " -"потім обчиÑліть Ñереднє значеннÑ." - -#: src/libslic3r/PrintConfig.cpp:779 src/libslic3r/PrintConfig.cpp:2733 -#: src/libslic3r/PrintConfig.cpp:2734 -msgid "Density" -msgstr "ЩільніÑÑ‚ÑŒ" - -#: src/libslic3r/PrintConfig.cpp:780 -======= "До мульти-матеріального принтеру завантажено кілька об'єктів.\n" "ЗаміÑÑ‚ÑŒ того, щоб розглÑдати Ñ—Ñ… Ñк кілька об'єктів, чи потрібно розглÑнути\n" "ці файл Ñк єдиний об'єкт, що має декілька чаÑтин?" #: src/slic3r/GUI/Plater.cpp:2767 ->>>>>>> master msgid "" "Your object appears to be too large, so it was automatically scaled down to " "fit your print bed." msgstr "" -<<<<<<< HEAD -"Введіть тут щільніÑÑ‚ÑŒ Ñвого філаменту. Це тільки Ð´Ð»Ñ ÑтатиÑтичної " -"інформації. ПриÑтойним ÑпоÑобом Ñ” Ð·Ð²Ð°Ð¶ÑƒÐ²Ð°Ð½Ð½Ñ Ð²Ñ–Ð´Ð¾Ð¼Ð¾Ñ— довжини філаменту та " -"обчиÑÐ»ÐµÐ½Ð½Ñ ÑÐ¿Ñ–Ð²Ð²Ñ–Ð´Ð½Ð¾ÑˆÐµÐ½Ð½Ñ Ð´Ð¾Ð²Ð¶Ð¸Ð½Ð¸ до обÑÑгу. Краще обчиÑлити об'єм " -"безпоÑередньо через зміщеннÑ." - -#: src/libslic3r/PrintConfig.cpp:783 -msgid "g/cm³" -msgstr "г/Ñм³" - -#: src/libslic3r/PrintConfig.cpp:788 -msgid "Filament type" -msgstr "Тип філаменту" - -#: src/libslic3r/PrintConfig.cpp:789 -msgid "The filament material type for use in custom G-codes." -msgstr "Тип матеріалу філаменту Ð´Ð»Ñ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ð½Ð½Ñ Ð² кориÑтувацьких G-кодах." - -#: src/libslic3r/PrintConfig.cpp:816 -msgid "Soluble material" -msgstr "Розчинний матеріал" - -#: src/libslic3r/PrintConfig.cpp:817 -msgid "Soluble material is most likely used for a soluble support." -msgstr "Розчинний матеріал переважно викориÑтовуєтьÑÑ Ð´Ð»Ñ Ñ€Ð¾Ð·Ñ‡Ð¸Ð½Ð½Ð¾Ñ— підтримки." - -#: src/libslic3r/PrintConfig.cpp:823 -msgid "" -"Enter your filament cost per kg here. This is only for statistical " -"information." -msgstr "" -"Введіть тут Ñвою вартіÑÑ‚ÑŒ філаменту на кг. Це тільки Ð´Ð»Ñ ÑтатиÑтичної " -"інформації." - -#: src/libslic3r/PrintConfig.cpp:824 -msgid "money/kg" -msgstr "грошових одиниць/кг" - -#: src/libslic3r/PrintConfig.cpp:829 -msgid "Spool weight" -msgstr "Вага котушки" - -#: src/libslic3r/PrintConfig.cpp:830 -msgid "" -"Enter weight of the empty filament spool. One may weigh a partially consumed " -"filament spool before printing and one may compare the measured weight with " -"the calculated weight of the filament with the spool to find out whether the " -"amount of filament on the spool is sufficient to finish the print." -msgstr "" -"Введіть вагу порожньої котушки філаменту. Перед друком можна зважити " -"чаÑтково витрачену котушку філаменту, а можна порівнÑти вимірÑну вагу з " -"розрахунковою вагою філаменту з котушкою, щоб з’ÑÑувати, чи доÑтатньо " -"кількоÑÑ‚Ñ– філаменту на котушці Ð´Ð»Ñ Ð·Ð°ÐºÑ–Ð½Ñ‡ÐµÐ½Ð½Ñ Ð´Ñ€ÑƒÐºÑƒ." - -#: src/libslic3r/PrintConfig.cpp:834 -msgid "g" -msgstr "г" - -#: src/libslic3r/PrintConfig.cpp:843 src/libslic3r/PrintConfig.cpp:2817 -msgid "(Unknown)" -msgstr "(Ðевідомий)" - -#: src/libslic3r/PrintConfig.cpp:847 -msgid "Fill angle" -msgstr "Кут наповненнÑ" - -#: src/libslic3r/PrintConfig.cpp:849 -======= "Ваш об'єкт видавÑÑ Ð·Ð°Ð½Ð°Ð´Ñ‚Ð¾ великим, тому він автоматично зменшивÑÑ " "відповідно до вашої полотна друку." @@ -16833,94 +7038,10 @@ msgid "Reset Project" msgstr "Скинути проект" #: src/slic3r/GUI/Plater.cpp:3086 ->>>>>>> master msgid "" "The selected object couldn't be split because it contains only one solid " "part." msgstr "" -<<<<<<< HEAD -"ОÑновний кут орієнтації Ð½Ð°Ð¿Ð¾Ð²Ð½ÐµÐ½Ð½Ñ Ð·Ð° замовчуваннÑм. Ð”Ð»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ буде " -"заÑтоÑовуватиÑÑ ÐºÑ€Ð¾Ñ-штрих. МоÑти будуть заповнені, викориÑтовуючи найкращий " -"напрÑм, Ñкий може виÑвити Slic3r, тому цей параметр на них не впливає." - -#: src/libslic3r/PrintConfig.cpp:861 -msgid "Fill density" -msgstr "ЩільніÑÑ‚ÑŒ заповненнÑ" - -#: src/libslic3r/PrintConfig.cpp:863 -msgid "Density of internal infill, expressed in the range 0% - 100%." -msgstr "ЩільніÑÑ‚ÑŒ внутрішнього заповненнÑ, виражена в діапазоні 0% - 100%." - -#: src/libslic3r/PrintConfig.cpp:898 -msgid "Fill pattern" -msgstr "Шаблон заповненнÑ" - -#: src/libslic3r/PrintConfig.cpp:900 -msgid "Fill pattern for general low-density infill." -msgstr "Шаблон Ð·Ð°Ð¿Ð¾Ð²Ð½ÐµÐ½Ð½Ñ Ð´Ð»Ñ Ð·Ð°Ð³Ð°Ð»ÑŒÐ½Ð¾Ð³Ð¾ низько-швидкіÑного наповненнÑ." - -#: src/libslic3r/PrintConfig.cpp:920 -msgid "Grid" -msgstr "Сітка" - -#: src/libslic3r/PrintConfig.cpp:921 -msgid "Triangles" -msgstr "Трикутники" - -#: src/libslic3r/PrintConfig.cpp:922 -msgid "Stars" -msgstr "Зірки" - -#: src/libslic3r/PrintConfig.cpp:923 -msgid "Cubic" -msgstr "Кубічний" - -#: src/libslic3r/PrintConfig.cpp:924 -msgid "Line" -msgstr "Лінії" - -#: src/libslic3r/PrintConfig.cpp:926 src/libslic3r/PrintConfig.cpp:2240 -msgid "Honeycomb" -msgstr "Стільниковий" - -#: src/libslic3r/PrintConfig.cpp:927 -msgid "3D Honeycomb" -msgstr "3D Ñтільник" - -#: src/libslic3r/PrintConfig.cpp:928 -msgid "Gyroid" -msgstr "Гіроїд" - -#: src/libslic3r/PrintConfig.cpp:932 -msgid "Adaptive Cubic" -msgstr "Ðдаптивний кубічний" - -#: src/libslic3r/PrintConfig.cpp:933 -msgid "Support Cubic" -msgstr "Кубічна підтримка" - -#: src/libslic3r/PrintConfig.cpp:937 src/libslic3r/PrintConfig.cpp:946 -#: src/libslic3r/PrintConfig.cpp:956 src/libslic3r/PrintConfig.cpp:990 -msgid "First layer" -msgstr "Перший шар" - -#: src/libslic3r/PrintConfig.cpp:938 -msgid "" -"This is the acceleration your printer will use for first layer. Set zero to " -"disable acceleration control for first layer." -msgstr "" -"Це приÑкореннÑ, Ñке ваш принтер викориÑтовуватиме Ð´Ð»Ñ Ð¿ÐµÑ€ÑˆÐ¾Ð³Ð¾ шару. " -"Ð’Ñтановити 0, щоб вимкнути ÐºÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ñ€Ð¸ÑкореннÑм Ð´Ð»Ñ Ð¿ÐµÑ€ÑˆÐ¾Ð³Ð¾ шару." - -#: src/libslic3r/PrintConfig.cpp:947 -msgid "First layer bed temperature" -msgstr "Температура Ñтолу на першому шарі" - -#: src/libslic3r/PrintConfig.cpp:948 -msgid "" -"Heated build plate temperature for the first layer. Set this to zero to " -"disable bed temperature control commands in the output." -======= #: src/slic3r/GUI/Plater.cpp:3093 msgid "All non-solid parts (modifiers) were deleted" @@ -16978,99 +7099,12 @@ msgstr "Вибраний файл" #: src/slic3r/GUI/Plater.cpp:3652 msgid "differs from the original file" ->>>>>>> master msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:958 -msgid "" -"Set this to a non-zero value to set a manual extrusion width for first " -"layer. You can use this to force fatter extrudates for better adhesion. If " -"expressed as percentage (for example 120%) it will be computed over first " -"layer height. If set to zero, it will use the default extrusion width." -======= #: src/slic3r/GUI/Plater.cpp:3652 msgid "Do you want to replace it" ->>>>>>> master -msgstr "" - -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:971 -msgid "" -"When printing with very low layer heights, you might still want to print a " -"thicker bottom layer to improve adhesion and tolerance for non perfect build " -"plates. This can be expressed as an absolute value or as a percentage (for " -"example: 150%) over the default layer height." -msgstr "" -"Під Ñ‡Ð°Ñ Ð´Ñ€ÑƒÐºÑƒ з дуже низькими виÑотами шару ви, можливо, вÑе-таки захочете " -"надрукувати більш товÑтий нижній шар, щоб поліпшити адгезію та толерантніÑÑ‚ÑŒ " -"до невідповідних збірних плаÑтин. Можна виразити Ñк абÑолютне Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð°Ð±Ð¾ " -"Ñк відÑоток (наприклад: 150%) по виÑоті шару за замовчуваннÑм." - -#: src/libslic3r/PrintConfig.cpp:980 -msgid "First layer speed" -msgstr "ШвидкіÑÑ‚ÑŒ першого шару" - -#: src/libslic3r/PrintConfig.cpp:981 -msgid "" -"If expressed as absolute value in mm/s, this speed will be applied to all " -"the print moves of the first layer, regardless of their type. If expressed " -"as a percentage (for example: 40%) it will scale the default speeds." -msgstr "" -"Якщо вона виражена в абÑолютному значенні в мм/Ñ, Ñ†Ñ ÑˆÐ²Ð¸Ð´ÐºÑ–ÑÑ‚ÑŒ буде " -"заÑтоÑована до вÑÑ–Ñ… рухів друку першого шару незалежно від Ñ—Ñ… типу. Якщо " -"вона виражена у відÑотках (наприклад: 40%), вона буде маÑштабувати швидкіÑÑ‚ÑŒ " -"за замовчуваннÑм." - -#: src/libslic3r/PrintConfig.cpp:991 -msgid "First layer nozzle temperature" -msgstr "Температура Ñопла на першому шарі" - -#: src/libslic3r/PrintConfig.cpp:992 -msgid "" -"Nozzle temperature for the first layer. If you want to control temperature " -"manually during print, set this to zero to disable temperature control " -"commands in the output G-code." msgstr "" -"Температура Ñопла Ð´Ð»Ñ Ð¿ÐµÑ€ÑˆÐ¾Ð³Ð¾ шару. Якщо ви хочете контролювати температуру " -"вручну під Ñ‡Ð°Ñ Ð´Ñ€ÑƒÐºÑƒ, вÑтановіть Ñ—Ñ— на нуль, щоб вимкнути команди контролю " -"температури у вихідному G-коді." -#: src/libslic3r/PrintConfig.cpp:1000 -msgid "Full fan speed at layer" -msgstr "Повна швидкіÑÑ‚ÑŒ вентилÑтора на шарі" - -#: src/libslic3r/PrintConfig.cpp:1001 -msgid "" -"Fan speed will be ramped up linearly from zero at layer " -"\"disable_fan_first_layers\" to maximum at layer \"full_fan_speed_layer\". " -"\"full_fan_speed_layer\" will be ignored if lower than " -"\"disable_fan_first_layers\", in which case the fan will be running at " -"maximum allowed speed at layer \"disable_fan_first_layers\" + 1." -msgstr "" -"ШвидкіÑÑ‚ÑŒ вентилÑтора буде збільшена лінійно з Ð½ÑƒÐ»Ñ Ð½Ð° шарі " -"\"disable_fan_first_layers\" до макÑимальної на шарі \"full_fan_speed_layer" -"\". \"full_fan_speed_layer\" буде проігноровано, Ñкщо нижче " -"\"disable_fan_first_layers\", Ñ– в цьому випадку вентилÑтор буде працювати з " -"макÑимально дозволеною швидкіÑÑ‚ÑŽ на рівні \"disable_fan_first_layers\" + 1." - -#: src/libslic3r/PrintConfig.cpp:1013 -msgid "" -"Speed for filling small gaps using short zigzag moves. Keep this reasonably " -"low to avoid too much shaking and resonance issues. Set zero to disable gaps " -"filling." -msgstr "" -"ШвидкіÑÑ‚ÑŒ Ð´Ð»Ñ Ð·Ð°Ð¿Ð¾Ð²Ð½ÐµÐ½Ð½Ñ Ð½ÐµÐ²ÐµÐ»Ð¸ÐºÐ¸Ñ… розривів за допомогою коротких " -"зигзагоподібних рухів. ДотримуйтеÑÑŒ доÑтатньо низьких значень, щоб уникнути " -"надмірних потрÑÑінь та резонанÑних проблем. Ð’Ñтановити 0, щоб вимкнути " -"Ð·Ð°Ð¿Ð¾Ð²Ð½ÐµÐ½Ð½Ñ Ñ€Ð¾Ð·Ñ€Ð¸Ð²Ñ–Ð²." - -#: src/libslic3r/PrintConfig.cpp:1021 -msgid "Verbose G-code" -msgstr "Докладний G-код" - -#: src/libslic3r/PrintConfig.cpp:1022 -======= #: src/slic3r/GUI/Plater.cpp:3669 src/slic3r/GUI/Plater.cpp:3675 msgid "Reload from:" msgstr "Перезавантажити з:" @@ -17105,182 +7139,35 @@ msgstr "" #: src/slic3r/GUI/Plater.cpp:4861 #, boost-format ->>>>>>> master msgid "" "Switching the printer technology from %1% to %2%.\n" "Some %1% presets were modified, which will be lost after switching the " "printer technology." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1029 -msgid "G-code flavor" -msgstr "ОÑобливіÑÑ‚ÑŒ G-коду" - -#: src/libslic3r/PrintConfig.cpp:1030 -msgid "" -"Some G/M-code commands, including temperature control and others, are not " -"universal. Set this option to your printer's firmware to get a compatible " -"output. The \"No extrusion\" flavor prevents PrusaSlicer from exporting any " -"extrusion value at all." -msgstr "" -"ДеÑкі команди G/M-коду, включаючи контроль температури та інші, не Ñ” " -"універÑальними. Ð’Ñтановіть Ð´Ð»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ параметра мікропрограму принтера, щоб " -"отримати ÑуміÑний вихід. ÐаÑвніÑÑ‚ÑŒ вибору \"Без екÑтрузії\" захищаюÑÑŒ " -"PrusaSlicer від екÑпорту взагалі будь-Ñких екÑтрузійних значень." - -#: src/libslic3r/PrintConfig.cpp:1055 -msgid "No extrusion" -msgstr "Без екÑтрузії" - -#: src/libslic3r/PrintConfig.cpp:1060 -msgid "Label objects" -msgstr "Маркувати об'єкти" - -#: src/libslic3r/PrintConfig.cpp:1061 -msgid "" -"Enable this to add comments into the G-Code labeling print moves with what " -"object they belong to, which is useful for the Octoprint CancelObject " -"plugin. This settings is NOT compatible with Single Extruder Multi Material " -"setup and Wipe into Object / Wipe into Infill." -======= #: src/slic3r/GUI/Plater.cpp:5058 msgid "Creating a new project while the current project is modified." msgstr "" #: src/slic3r/GUI/Plater.cpp:5061 msgid "Creating a new project while some presets are modified." ->>>>>>> master msgstr "" -"Увімкніть це, щоб додати коментарі до ходів друку міток G-Code із об’єктом, " -"до Ñкого вони належать, що кориÑно Ð´Ð»Ñ Ð¿Ð»Ð°Ð³Ñ–Ð½Ð° Octoprint CancelObject. Ці " -"Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ ÐЕ ÑуміÑні з параметрами \"Мульти-матеріальний (ММ) друк з " -"одним екÑтрудером\" та \"Витирати в об'єкт\" / \"Витирати в заповненнÑ\"." - -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1068 -msgid "High extruder current on filament swap" -msgstr "Ð—Ð²Ð¸Ñ‰ÐµÐ½Ð½Ñ Ñтруму екÑтрудера на заміні філамента" -#: src/libslic3r/PrintConfig.cpp:1069 -======= #: src/slic3r/GUI/Plater.cpp:5062 msgid "You can keep presets modifications to the new project or discard them" msgstr "" #: src/slic3r/GUI/Plater.cpp:5063 ->>>>>>> master msgid "" "You can keep presets modifications to the new project, discard them or save " "changes as new presets.\n" "Note, if changes will be saved then new project wouldn't keep them" msgstr "" -"Може бути кориÑно збільшити Ñтрум двигуна екÑтрудера під Ñ‡Ð°Ñ Ð·Ð°Ð¼Ñ–Ð½Ð¸ " -"філаменту, щоб забезпечити швидкий раммінг та подолати опір при заведенні " -"філаменту з кінчиком потворної форми." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1077 -msgid "" -"This is the acceleration your printer will use for infill. Set zero to " -"disable acceleration control for infill." -======= #: src/slic3r/GUI/Plater.cpp:5069 msgid "Creating a new project" ->>>>>>> master msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1085 -msgid "Combine infill every" -msgstr "Об'єднати Ð½Ð°Ð¿Ð¾Ð²Ð½ÐµÐ½Ð½Ñ ÐºÐ¾Ð¶Ð½Ñ–" - -#: src/libslic3r/PrintConfig.cpp:1087 -msgid "" -"This feature allows to combine infill and speed up your print by extruding " -"thicker infill layers while preserving thin perimeters, thus accuracy." -msgstr "" -"Ð¦Ñ Ñ„ÑƒÐ½ÐºÑ†Ñ–Ñ Ð´Ð¾Ð·Ð²Ð¾Ð»ÑÑ” поєднувати Ð½Ð°Ð¿Ð¾Ð²Ð½ÐµÐ½Ð½Ñ Ñ‚Ð° приÑкорити друк, екÑтрудуючи " -"більш товÑÑ‚Ñ– шари наповненнÑ, зберігаючи тонкі периметри, а отже, Ñ– точніÑÑ‚ÑŽ." - -#: src/libslic3r/PrintConfig.cpp:1090 -msgid "Combine infill every n layers" -msgstr "Об'єднати Ð½Ð°Ð¿Ð¾Ð²Ð½ÐµÐ½Ð½Ñ ÐºÐ¾Ð¶Ð½Ñ– n шарів" - -#: src/libslic3r/PrintConfig.cpp:1096 -msgid "Length of the infill anchor" -msgstr "Довжина ÑÐºÐ¾Ñ€Ñ Ð·Ð°Ð¿Ð¾Ð²Ð½ÐµÐ½Ð½Ñ" - -#: src/libslic3r/PrintConfig.cpp:1098 -msgid "" -"Connect an infill line to an internal perimeter with a short segment of an " -"additional perimeter. If expressed as percentage (example: 15%) it is " -"calculated over infill extrusion width. PrusaSlicer tries to connect two " -"close infill lines to a short perimeter segment. If no such perimeter " -"segment shorter than infill_anchor_max is found, the infill line is " -"connected to a perimeter segment at just one side and the length of the " -"perimeter segment taken is limited to this parameter, but no longer than " -"anchor_length_max. Set this parameter to zero to disable anchoring " -"perimeters connected to a single infill line." -msgstr "" -"З'єднати лінію Ð·Ð°Ð¿Ð¾Ð²Ð½ÐµÐ½Ð½Ñ Ð· внутрішнім периметром за допомогою короткого " -"відрізку додаткового периметра. Якщо це Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð²Ð¸Ñ€Ð°Ð¶Ð°Ñ”Ñ‚ÑŒÑÑ Ñƒ відÑотках " -"(приклад: 15%), воно розраховуєтьÑÑ Ð·Ð° шириною екÑтрузії заповненнÑ. " -"PrusaSlicer намагаєтьÑÑ Ð·'єднати дві Ñ‚Ñ–Ñні лінії Ð·Ð°Ð¿Ð¾Ð²Ð½ÐµÐ½Ð½Ñ Ð· коротким " -"периметром. Якщо такого відрізка периметра, коротшого за infill_anchor_max, " -"не знайдено, Ð»Ñ–Ð½Ñ–Ñ Ð·Ð°Ð¿Ð¾Ð²Ð½ÐµÐ½Ð½Ñ Ð·'єднуєтьÑÑ Ð· відрізком периметра лише з " -"одного боку, Ñ– довжина прийнÑтого відрізка периметра обмежена цим " -"параметром, але не довше anchor_length_max. Ð’Ñтановіть Ð´Ð»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ параметра " -"нуль, щоб вимкнути периметри закріпленнÑ, підключені до однієї лінії " -"заповненнÑ." - -#: src/libslic3r/PrintConfig.cpp:1113 -msgid "0 (no open anchors)" -msgstr "0 (без відкритих Ñкорів)" - -#: src/libslic3r/PrintConfig.cpp:1118 src/libslic3r/PrintConfig.cpp:1140 -msgid "1000 (unlimited)" -msgstr "1000 (необмежено)" - -#: src/libslic3r/PrintConfig.cpp:1123 -msgid "Maximum length of the infill anchor" -msgstr "МакÑимальна довжина ÑÐºÐ¾Ñ€Ñ Ð·Ð°Ð¿Ð¾Ð²Ð½ÐµÐ½Ð½Ñ" - -#: src/libslic3r/PrintConfig.cpp:1125 -msgid "" -"Connect an infill line to an internal perimeter with a short segment of an " -"additional perimeter. If expressed as percentage (example: 15%) it is " -"calculated over infill extrusion width. PrusaSlicer tries to connect two " -"close infill lines to a short perimeter segment. If no such perimeter " -"segment shorter than this parameter is found, the infill line is connected " -"to a perimeter segment at just one side and the length of the perimeter " -"segment taken is limited to infill_anchor, but no longer than this " -"parameter. Set this parameter to zero to disable anchoring." -msgstr "" -"З'єднати лінію Ð·Ð°Ð¿Ð¾Ð²Ð½ÐµÐ½Ð½Ñ Ð· внутрішнім периметром за допомогою короткого " -"відрізку додаткового периметра. Якщо це Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð²Ð¸Ñ€Ð°Ð¶Ð°Ñ”Ñ‚ÑŒÑÑ Ñƒ відÑотках " -"(приклад: 15%), воно розраховуєтьÑÑ Ð·Ð° шириною екÑтрузії заповненнÑ. " -"PrusaSlicer намагаєтьÑÑ Ð·'єднати дві найближчі лінії Ð·Ð°Ð¿Ð¾Ð²Ð½ÐµÐ½Ð½Ñ Ð· коротким " -"периметром. Якщо такого відрізка периметра, коротшого за цей параметр, не " -"знайдено, Ð»Ñ–Ð½Ñ–Ñ Ð·Ð°Ð¿Ð¾Ð²Ð½ÐµÐ½Ð½Ñ Ð·'єднуєтьÑÑ Ð· відрізком периметра лише з одного " -"боку, Ñ– довжина прийнÑтого відрізка периметра обмежена параметром " -"infill_anchor, але не довше за цей параметр. Ð’Ñтановіть Ð´Ð»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ параметра " -"нуль, щоб вимкнути закріпленнÑ." - -#: src/libslic3r/PrintConfig.cpp:1135 -msgid "0 (not anchored)" -msgstr "0 (не закріплено)" - -#: src/libslic3r/PrintConfig.cpp:1145 -msgid "Infill extruder" -msgstr "Ðаповнювач екÑтрудера" - -#: src/libslic3r/PrintConfig.cpp:1147 -msgid "The extruder to use when printing infill." -msgstr "ЕкÑтрудер, викориÑтовуваний під Ñ‡Ð°Ñ Ð´Ñ€ÑƒÐºÑƒ наповненнÑ." - -#: src/libslic3r/PrintConfig.cpp:1155 -======= #: src/slic3r/GUI/Plater.cpp:5100 msgid "Load Project" msgstr "Завантажити проект" @@ -17396,19 +7283,11 @@ msgid "The following characters are not allowed by a FAT file system:" msgstr "" #: src/slic3r/GUI/Plater.cpp:5904 ->>>>>>> master msgid "" "The plater is empty.\n" "Do you want to save the project?" msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1165 -msgid "Infill before perimeters" -msgstr "Ð—Ð°Ð¿Ð¾Ð²Ð½ÐµÐ½Ð½Ñ Ð¿ÐµÑ€ÐµÐ´ периметрами" - -#: src/libslic3r/PrintConfig.cpp:1166 -======= #: src/slic3r/GUI/Plater.cpp:5904 msgid "Save project" msgstr "" @@ -17418,19 +7297,11 @@ msgid "Export" msgstr "ЕкÑпорт" #: src/slic3r/GUI/Plater.cpp:6526 ->>>>>>> master msgid "" "Custom supports, seams and multimaterial painting were removed after " "repairing the mesh." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1171 -msgid "Only infill where needed" -msgstr "Заповнити тільки там, де потрібно" - -#: src/libslic3r/PrintConfig.cpp:1173 -======= #: src/slic3r/GUI/Plater.cpp:6640 msgid "Paste From Clipboard" msgstr "Ð’Ñтавити з буферу обміну" @@ -17447,7 +7318,6 @@ msgid "Remember output directory" msgstr "Пам'Ñтати вихідний каталог" #: src/slic3r/GUI/Preferences.cpp:123 ->>>>>>> master msgid "" "If this is enabled, Slic3r will prompt the last output directory instead of " "the one containing the input files." @@ -17455,29 +7325,17 @@ msgstr "" "Якщо вибрано, Slic3r запропонує оÑтанню вихідну директорію заміÑÑ‚ÑŒ тої, що " "вказана у вхідному файлі." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1180 -msgid "Infill/perimeters overlap" -msgstr "ÐŸÐµÑ€ÐµÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ð½Ð°Ð¿Ð¾Ð²Ð½ÐµÐ½Ð½Ñ/периметрів" - -#: src/libslic3r/PrintConfig.cpp:1182 -======= #: src/slic3r/GUI/Preferences.cpp:129 msgid "Auto-center parts" msgstr "Ðвтоцентрувати чаÑтини" #: src/slic3r/GUI/Preferences.cpp:131 ->>>>>>> master msgid "" "If this is enabled, Slic3r will auto-center objects around the print bed " "center." msgstr "" "Якщо вибрано, Slic3r автоматично орієнтує об'єкти навколо центру друку." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1193 -msgid "Speed for printing the internal fill. Set to zero for auto." -======= #: src/slic3r/GUI/Preferences.cpp:137 msgid "Background processing" msgstr "Фонова обробка" @@ -17486,26 +7344,10 @@ msgstr "Фонова обробка" msgid "" "If this is enabled, Slic3r will pre-process objects as soon as they're " "loaded in order to save time when exporting G-code." ->>>>>>> master msgstr "" "Якщо вибрано, Slic3r буде попередньо оброблÑти об'єкти, Ñк тільки вони " "будуть завантажені, щоб заощадити Ñ‡Ð°Ñ Ð¿Ñ€Ð¸ екÑпорті G-коду." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1201 -msgid "Inherits profile" -msgstr "УÑпадковує профіль" - -#: src/libslic3r/PrintConfig.cpp:1202 -msgid "Name of the profile, from which this profile inherits." -msgstr "Ім'Ñ Ð¿Ñ€Ð¾Ñ„Ñ–Ð»ÑŽ, від Ñкого цей профіль уÑпадковуєтьÑÑ." - -#: src/libslic3r/PrintConfig.cpp:1215 -msgid "Interface shells" -msgstr "ІнтерфейÑні оболонки" - -#: src/libslic3r/PrintConfig.cpp:1216 -======= #: src/slic3r/GUI/Preferences.cpp:148 msgid "Export sources full pathnames to 3mf and amf" msgstr "ЕкÑпортувати повні назви шлÑхів до 3MF та amf" @@ -17530,7 +7372,6 @@ msgstr "" "Якщо ввімкнено, програма PrusaSlicer за промовчаннÑм відкриває STL-файли." #: src/slic3r/GUI/Preferences.cpp:177 ->>>>>>> master msgid "" "If enabled, Slic3r downloads updates of built-in system presets in the " "background. These updates are downloaded into a separate temporary location. " @@ -17546,70 +7387,11 @@ msgstr "" msgid "Suppress \" - default - \" presets" msgstr "Заборонити Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ \"- за замовчуваннÑм -\"" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1224 -msgid "Enable ironing" -msgstr "Увімкнути праÑуваннÑ" - -#: src/libslic3r/PrintConfig.cpp:1225 -msgid "" -"Enable ironing of the top layers with the hot print head for smooth surface" -msgstr "" -"Ð”Ð»Ñ Ð³Ð»Ð°Ð´ÐºÐ¾Ñ— поверхні увімкніть праÑÑƒÐ²Ð°Ð½Ð½Ñ Ð²ÐµÑ€Ñ…Ð½Ñ–Ñ… шарів гарÑчою друкуючою " -"головкою" - -#: src/libslic3r/PrintConfig.cpp:1231 src/libslic3r/PrintConfig.cpp:1233 -msgid "Ironing Type" -msgstr "Тип праÑуваннÑ" - -#: src/libslic3r/PrintConfig.cpp:1238 -msgid "All top surfaces" -msgstr "Ð’ÑÑ– верхні поверхні" - -#: src/libslic3r/PrintConfig.cpp:1239 -msgid "Topmost surface only" -msgstr "Тільки Ð²ÐµÑ€Ñ…Ð½Ñ Ð¿Ð¾Ð²ÐµÑ€Ñ…Ð½Ñ" - -#: src/libslic3r/PrintConfig.cpp:1240 -msgid "All solid surfaces" -msgstr "Ð’ÑÑ– тверді поверхні" - -#: src/libslic3r/PrintConfig.cpp:1245 -msgid "Flow rate" -msgstr "ШвидкіÑÑ‚ÑŒ потоку" - -#: src/libslic3r/PrintConfig.cpp:1247 -msgid "Percent of a flow rate relative to object's normal layer height." -msgstr "ВідÑоток швидкіÑÑ‚ÑŒ потоку відноÑно нормальної виÑоти шару об'єкта." - -#: src/libslic3r/PrintConfig.cpp:1255 -msgid "Spacing between ironing passes" -msgstr "ВідÑтань між лініÑми праÑуваннÑ" - -#: src/libslic3r/PrintConfig.cpp:1257 -msgid "Distance between ironing lines" -msgstr "ВідÑтань між праÑувальними лініÑми" - -#: src/libslic3r/PrintConfig.cpp:1274 -======= #: src/slic3r/GUI/Preferences.cpp:184 ->>>>>>> master msgid "" "Suppress \" - default - \" presets in the Print / Filament / Printer " "selections once there are any other valid presets available." msgstr "" -<<<<<<< HEAD -"Цей кориÑтувацький код вÑтавлÑєтьÑÑ Ð¿Ñ€Ð¸ кожній зміні шару відразу піÑÐ»Ñ " -"Ð¿ÐµÑ€ÐµÐ¼Ñ–Ñ‰ÐµÐ½Ð½Ñ Z Ñ– перед тим, Ñк екÑтрудер переміÑтитьÑÑ Ð´Ð¾ точки першого шару. " -"Зауважте, що ви можете викориÑтовувати шаблонні змінні Ð´Ð»Ñ Ð²ÑÑ–Ñ… параметрів " -"Slic3r, а також [layer_num] Ñ– [layer_z]." - -#: src/libslic3r/PrintConfig.cpp:1285 -msgid "Supports remaining times" -msgstr "Підтримує чаÑ, що залишивÑÑ" - -#: src/libslic3r/PrintConfig.cpp:1286 -======= "Заборонити Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ \"- за замовчуваннÑм -\" у параметрах Друк / " "Філамент / Принтер, Ñкщо доÑтупні інші діючі налаштуваннÑ." @@ -17618,187 +7400,10 @@ msgid "Show incompatible print and filament presets" msgstr "Показувати неÑуміÑні Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ñ€ÑƒÐºÑƒ та філаменту" #: src/slic3r/GUI/Preferences.cpp:192 ->>>>>>> master msgid "" "When checked, the print and filament presets are shown in the preset editor " "even if they are marked as incompatible with the active printer" msgstr "" -<<<<<<< HEAD -"Публікувати M73 P[відÑоток друку] R[чаÑ, що залишивÑÑ Ñƒ хвилинах] з " -"інтервалом у 1 хвилину в G-код, щоб прошивка показувала точний чаÑ, що " -"залишивÑÑ. Ðа Ñьогоднішній день лише прошивка Prusa i3 MK3 розпізнає M73. " -"Також прошивка i3 MK3 підтримує M73 Qxx Sxx Ð´Ð»Ñ Ñ‚Ð¸Ñ…Ð¾Ð³Ð¾ режиму." - -#: src/libslic3r/PrintConfig.cpp:1294 -msgid "Supports stealth mode" -msgstr "Підтримує тихий режим" - -#: src/libslic3r/PrintConfig.cpp:1295 -msgid "The firmware supports stealth mode" -msgstr "Прошивка підтримує тихий режим" - -#: src/libslic3r/PrintConfig.cpp:1300 -msgid "How to apply limits" -msgstr "Як заÑтоÑовувати обмеженнÑ" - -#: src/libslic3r/PrintConfig.cpp:1301 -msgid "Purpose of Machine Limits" -msgstr "ÐŸÑ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð¼ÐµÑ…Ð°Ð½Ñ–Ñ‡Ð½Ð¸Ñ… обмежень" - -#: src/libslic3r/PrintConfig.cpp:1303 -msgid "How to apply the Machine Limits" -msgstr "ÐŸÑ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð¼ÐµÑ…Ð°Ð½Ñ–Ñ‡Ð½Ð¸Ñ… обмежень" - -#: src/libslic3r/PrintConfig.cpp:1308 -msgid "Emit to G-code" -msgstr "Публікувати в G-код" - -#: src/libslic3r/PrintConfig.cpp:1309 -msgid "Use for time estimate" -msgstr "Ð”Ð»Ñ Ð¾Ñ†Ñ–Ð½ÐºÐ¸ чаÑу" - -#: src/libslic3r/PrintConfig.cpp:1310 -msgid "Ignore" -msgstr "Ігнорувати" - -#: src/libslic3r/PrintConfig.cpp:1333 -msgid "Maximum feedrate X" -msgstr "МакÑимальна швидкіÑÑ‚ÑŒ подачі за X" - -#: src/libslic3r/PrintConfig.cpp:1334 -msgid "Maximum feedrate Y" -msgstr "МакÑимальна швидкіÑÑ‚ÑŒ подачі за Y" - -#: src/libslic3r/PrintConfig.cpp:1335 -msgid "Maximum feedrate Z" -msgstr "МакÑимальна швидкіÑÑ‚ÑŒ подачі за Y" - -#: src/libslic3r/PrintConfig.cpp:1336 -msgid "Maximum feedrate E" -msgstr "МакÑимальна швидкіÑÑ‚ÑŒ подачі за Е" - -#: src/libslic3r/PrintConfig.cpp:1339 -msgid "Maximum feedrate of the X axis" -msgstr "МакÑимальна швидкіÑÑ‚ÑŒ подачі за віÑÑÑŽ X" - -#: src/libslic3r/PrintConfig.cpp:1340 -msgid "Maximum feedrate of the Y axis" -msgstr "МакÑимальна швидкіÑÑ‚ÑŒ подачі за віÑÑÑŽ Y" - -#: src/libslic3r/PrintConfig.cpp:1341 -msgid "Maximum feedrate of the Z axis" -msgstr "МакÑимальна швидкіÑÑ‚ÑŒ подачі за віÑÑÑŽ Z" - -#: src/libslic3r/PrintConfig.cpp:1342 -msgid "Maximum feedrate of the E axis" -msgstr "МакÑимальна швидкіÑÑ‚ÑŒ подачі за віÑÑÑŽ Е" - -#: src/libslic3r/PrintConfig.cpp:1350 -msgid "Maximum acceleration X" -msgstr "МакÑимальне приÑÐºÐ¾Ñ€ÐµÐ½Ð½Ñ X" - -#: src/libslic3r/PrintConfig.cpp:1351 -msgid "Maximum acceleration Y" -msgstr "МакÑимальне приÑÐºÐ¾Ñ€ÐµÐ½Ð½Ñ Y" - -#: src/libslic3r/PrintConfig.cpp:1352 -msgid "Maximum acceleration Z" -msgstr "МакÑимальне приÑÐºÐ¾Ñ€ÐµÐ½Ð½Ñ Z" - -#: src/libslic3r/PrintConfig.cpp:1353 -msgid "Maximum acceleration E" -msgstr "МакÑимальне приÑÐºÐ¾Ñ€ÐµÐ½Ð½Ñ E" - -#: src/libslic3r/PrintConfig.cpp:1356 -msgid "Maximum acceleration of the X axis" -msgstr "МакÑимальне приÑÐºÐ¾Ñ€ÐµÐ½Ð½Ñ Ð·Ð° віÑÑÑŽ X" - -#: src/libslic3r/PrintConfig.cpp:1357 -msgid "Maximum acceleration of the Y axis" -msgstr "МакÑимальне приÑÐºÐ¾Ñ€ÐµÐ½Ð½Ñ Ð·Ð° віÑÑÑŽ Y" - -#: src/libslic3r/PrintConfig.cpp:1358 -msgid "Maximum acceleration of the Z axis" -msgstr "МакÑимальне приÑÐºÐ¾Ñ€ÐµÐ½Ð½Ñ Ð·Ð° віÑÑÑŽ Z" - -#: src/libslic3r/PrintConfig.cpp:1359 -msgid "Maximum acceleration of the E axis" -msgstr "МакÑимальне приÑÐºÐ¾Ñ€ÐµÐ½Ð½Ñ Ð·Ð° віÑÑÑŽ E" - -#: src/libslic3r/PrintConfig.cpp:1367 -msgid "Maximum jerk X" -msgstr "МакÑимальний ривок за X" - -#: src/libslic3r/PrintConfig.cpp:1368 -msgid "Maximum jerk Y" -msgstr "МакÑимальний ривок за Y" - -#: src/libslic3r/PrintConfig.cpp:1369 -msgid "Maximum jerk Z" -msgstr "МакÑимальний ривок за Z" - -#: src/libslic3r/PrintConfig.cpp:1370 -msgid "Maximum jerk E" -msgstr "МакÑимальний ривок за E" - -#: src/libslic3r/PrintConfig.cpp:1373 -msgid "Maximum jerk of the X axis" -msgstr "МакÑимальний ривок за віÑÑÑŽ X" - -#: src/libslic3r/PrintConfig.cpp:1374 -msgid "Maximum jerk of the Y axis" -msgstr "МакÑимальний ривок за віÑÑÑŽ Y" - -#: src/libslic3r/PrintConfig.cpp:1375 -msgid "Maximum jerk of the Z axis" -msgstr "МакÑимальний ривок за віÑÑÑŽ Z" - -#: src/libslic3r/PrintConfig.cpp:1376 -msgid "Maximum jerk of the E axis" -msgstr "МакÑимальний ривок за віÑÑÑŽ E" - -#: src/libslic3r/PrintConfig.cpp:1386 -msgid "Minimum feedrate when extruding" -msgstr "Мінімальне приÑÐºÐ¾Ñ€ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¸ екÑтрузії" - -#: src/libslic3r/PrintConfig.cpp:1388 -msgid "Minimum feedrate when extruding (M205 S)" -msgstr "Мінімальне приÑÐºÐ¾Ñ€ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¸ екÑтрузії (M205 S)" - -#: src/libslic3r/PrintConfig.cpp:1396 -msgid "Minimum travel feedrate" -msgstr "Мінімальна швидкіÑÑ‚ÑŒ подачі" - -#: src/libslic3r/PrintConfig.cpp:1398 -msgid "Minimum travel feedrate (M205 T)" -msgstr "Мінімальна швидкіÑÑ‚ÑŒ подачі (M205 T)" - -#: src/libslic3r/PrintConfig.cpp:1406 -msgid "Maximum acceleration when extruding" -msgstr "МакÑимальне приÑÐºÐ¾Ñ€ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¸ екÑтрузії" - -#: src/libslic3r/PrintConfig.cpp:1408 -msgid "Maximum acceleration when extruding (M204 S)" -msgstr "МакÑимальне приÑÐºÐ¾Ñ€ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¸ екÑтрузії (M204 S)" - -#: src/libslic3r/PrintConfig.cpp:1416 -msgid "Maximum acceleration when retracting" -msgstr "МакÑимальне приÑÐºÐ¾Ñ€ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¸ втÑгуванні" - -#: src/libslic3r/PrintConfig.cpp:1418 -msgid "Maximum acceleration when retracting (M204 T)" -msgstr "МакÑимальне приÑÐºÐ¾Ñ€ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¸ втÑгуванні (M204 T)" - -#: src/libslic3r/PrintConfig.cpp:1425 src/libslic3r/PrintConfig.cpp:1434 -msgid "Max" -msgstr "МакÑимально" - -#: src/libslic3r/PrintConfig.cpp:1426 -msgid "This setting represents the maximum speed of your fan." -msgstr "Цей параметр відображає макÑимальну швидкіÑÑ‚ÑŒ вашого вентилÑтора." - -#: src/libslic3r/PrintConfig.cpp:1435 -======= "Якщо вибрано, преÑети Ð´Ð»Ñ Ð´Ñ€ÑƒÐºÑƒ та філаменту відображаютьÑÑ Ñƒ ÑпиÑку " "преÑетів, навіть Ñкщо вони позначені Ñк неÑуміÑні з активним принтером" @@ -17918,24 +7523,15 @@ msgid "Clear Undo / Redo stack on new project" msgstr "" #: src/slic3r/GUI/Preferences.cpp:297 ->>>>>>> master msgid "" "Clear Undo / Redo stack on new project or when an existing project is loaded." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1445 -msgid "Max print speed" -msgstr "МакÑимальна швидкіÑÑ‚ÑŒ друку" - -#: src/libslic3r/PrintConfig.cpp:1446 -======= #: src/slic3r/GUI/Preferences.cpp:303 msgid "Enable support for legacy 3DConnexion devices" msgstr "Увімкнути підтримку заÑтарілих приÑтроїв 3DConnexion" #: src/slic3r/GUI/Preferences.cpp:305 ->>>>>>> master msgid "" "If enabled, the legacy 3DConnexion devices settings dialog is available by " "pressing CTRL+M" @@ -17947,65 +7543,27 @@ msgstr "" msgid "Camera" msgstr "Камера" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1456 -======= #: src/slic3r/GUI/Preferences.cpp:319 msgid "Use perspective camera" msgstr "ВикориÑтовувати перÑпективну камеру" #: src/slic3r/GUI/Preferences.cpp:321 ->>>>>>> master msgid "" "If enabled, use perspective camera. If not enabled, use orthographic camera." msgstr "" "Якщо увімкнено, викориÑтовуватиметьÑÑ Ð¿ÐµÑ€Ñпективна камера. Якщо вимкнено, " "викориÑтовуватиметьÑÑ Ð¾Ñ€Ñ‚Ð¾Ð³Ñ€Ð°Ñ„Ñ–Ñ‡Ð½Ð° камера." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1465 -msgid "Max volumetric slope positive" -msgstr "МакÑимальний об'ємний нахил позитивний" - -#: src/libslic3r/PrintConfig.cpp:1466 src/libslic3r/PrintConfig.cpp:1477 -msgid "" -"This experimental setting is used to limit the speed of change in extrusion " -"rate. A value of 1.8 mm³/s² ensures, that a change from the extrusion rate " -"of 1.8 mm³/s (0.45mm extrusion width, 0.2mm extrusion height, feedrate 20 mm/" -"s) to 5.4 mm³/s (feedrate 60 mm/s) will take at least 2 seconds." -======= #: src/slic3r/GUI/Preferences.cpp:326 msgid "Use free camera" msgstr "ВикориÑтовувати вільну камеру" #: src/slic3r/GUI/Preferences.cpp:328 msgid "If enabled, use free camera. If not enabled, use constrained camera." ->>>>>>> master msgstr "" "Якщо увімкнено, викориÑтовуватиметьÑÑ Ð²Ñ–Ð»ÑŒÐ½Ð° камера. Якщо вимкнено, " "викориÑтовуватиметьÑÑ ÐºÐ°Ð¼ÐµÑ€Ð° з обмеженими можливоÑÑ‚Ñми." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1470 src/libslic3r/PrintConfig.cpp:1481 -msgid "mm³/s²" -msgstr "мм³/Ѳ" - -#: src/libslic3r/PrintConfig.cpp:1476 -msgid "Max volumetric slope negative" -msgstr "МакÑимальний об'ємний Ñхил негативний" - -#: src/libslic3r/PrintConfig.cpp:1488 src/libslic3r/PrintConfig.cpp:1497 -msgid "Min" -msgstr "Мінімально" - -#: src/libslic3r/PrintConfig.cpp:1489 -msgid "This setting represents the minimum PWM your fan needs to work." -msgstr "" -"Цей параметр відповідає мінімальній ШІМ, на Ñкій повинен працювати ваш " -"вентилÑтор." - -#: src/libslic3r/PrintConfig.cpp:1498 -======= #: src/slic3r/GUI/Preferences.cpp:333 msgid "Reverse direction of zoom with mouse wheel" msgstr "Зворотний напрÑмок маÑÑˆÑ‚Ð°Ð±ÑƒÐ²Ð°Ð½Ð½Ñ Ð·Ð° допомогою колеÑа миші" @@ -18023,35 +7581,11 @@ msgid "Sequential slider applied only to top layer" msgstr "ПоÑлідовний повзунок заÑтоÑовуєтьÑÑ Ð»Ð¸ÑˆÐµ до верхнього шару" #: src/slic3r/GUI/Preferences.cpp:368 ->>>>>>> master msgid "" "If enabled, changes made using the sequential slider, in preview, apply only " "to gcode top layer. If disabled, changes made using the sequential slider, " "in preview, apply to the whole gcode." msgstr "" -<<<<<<< HEAD -"Це найменша виÑота друкованого шару Ð´Ð»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ екÑтрудера та обмежує " -"роздільну здатніÑÑ‚ÑŒ Ð´Ð»Ñ Ð²Ð¸Ñоти змінного шару. Типові Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ - від 0,05 мм " -"до 0,1 мм." - -#: src/libslic3r/PrintConfig.cpp:1506 -msgid "Min print speed" -msgstr "Мінімальна швидкіÑÑ‚ÑŒ друку" - -#: src/libslic3r/PrintConfig.cpp:1507 -msgid "Slic3r will not scale speed down below this speed." -msgstr "Slic3r не буде маÑштабувати швидкіÑÑ‚ÑŒ нижче цієї швидкоÑÑ‚Ñ–." - -#: src/libslic3r/PrintConfig.cpp:1514 -msgid "Minimal filament extrusion length" -msgstr "Мінімальна довжина екÑтрузії філаменту" - -#: src/libslic3r/PrintConfig.cpp:1515 -msgid "" -"Generate no less than the number of skirt loops required to consume the " -"specified amount of filament on the bottom layer. For multi-extruder " -"machines, this minimum applies to each extruder." -======= "Якщо увімкнено, зміни, внеÑені за допомогою поÑлідовного повзунка, у " "попередньому переглÑді заÑтоÑовуютьÑÑ Ð»Ð¸ÑˆÐµ до верхнього шару G-коду. Якщо " "вимкнено, зміни, внеÑені за допомогою поÑлідовного повзунка, у попередньому " @@ -18071,36 +7605,23 @@ msgstr "" #: src/slic3r/GUI/Preferences.cpp:384 msgid "If enabled, PrusaSlicer will not open hyperlinks in your browser." ->>>>>>> master msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1524 -msgid "Configuration notes" -msgstr "Примітки до конфігурації" - -#: src/libslic3r/PrintConfig.cpp:1525 -======= #: src/slic3r/GUI/Preferences.cpp:391 msgid "Use colors for axes values in Manipulation panel" msgstr "" #: src/slic3r/GUI/Preferences.cpp:393 ->>>>>>> master msgid "" "If enabled, the axes names and axes values will be colorized according to " "the axes colors. If disabled, old UI will be used." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1535 -======= #: src/slic3r/GUI/Preferences.cpp:399 msgid "Order object volumes by types" msgstr "" #: src/slic3r/GUI/Preferences.cpp:401 ->>>>>>> master msgid "" "If enabled, volumes will be always ordered inside the object. Correct order " "is Model Part, Negative Volume, Modifier, Support Blocker and Support " @@ -18108,90 +7629,20 @@ msgid "" "Modifiers. But one of the model parts have to be on the first place." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1540 -msgid "Host Type" -msgstr "Тип хоÑту" - -#: src/libslic3r/PrintConfig.cpp:1541 -======= #: src/slic3r/GUI/Preferences.cpp:408 msgid "Set settings tabs as menu items (experimental)" msgstr "" #: src/slic3r/GUI/Preferences.cpp:410 ->>>>>>> master msgid "" "If enabled, Settings Tabs will be placed as menu items. If disabled, old UI " "will be used." msgstr "" -"Slic3r може завантажувати файли G-коду на хоÑÑ‚ принтера. Це поле повинно " -"міÑтити тип хоÑта." - -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1560 -msgid "Only retract when crossing perimeters" -msgstr "Перервати тільки у разі перетину периметрів" -#: src/libslic3r/PrintConfig.cpp:1561 -msgid "" -"Disables retraction when the travel path does not exceed the upper layer's " -"perimeters (and thus any ooze will be probably invisible)." -======= #: src/slic3r/GUI/Preferences.cpp:419 msgid "Show \"Tip of the day\" notification after start" ->>>>>>> master msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1568 -msgid "" -"This option will drop the temperature of the inactive extruders to prevent " -"oozing. It will enable a tall skirt automatically and move extruders outside " -"such skirt when changing temperatures." -msgstr "" -"Цей параметр знизить температуру неактивних екÑтрудерів, щоб запобігти " -"протіканню. Це дозволить автоматично ввімкнути виÑокий Ð¿Ð»Ñ–Ð½Ñ‚ÑƒÑ Ñ‚Ð° " -"переміÑтить екÑтрудери за межі такого плінтуÑа у разі зміни температури." - -#: src/libslic3r/PrintConfig.cpp:1575 -msgid "Output filename format" -msgstr "Формат вихідного файлу" - -#: src/libslic3r/PrintConfig.cpp:1576 -msgid "" -"You can use all configuration options as variables inside this template. For " -"example: [layer_height], [fill_density] etc. You can also use [timestamp], " -"[year], [month], [day], [hour], [minute], [second], [version], " -"[input_filename], [input_filename_base]." -msgstr "" -"Ви можете викориÑтовувати вÑÑ– параметри конфігурації Ñк змінні вÑередині " -"цього шаблону. Ðаприклад: [layer_height], [fill_density] тощо. Ви також " -"можете викориÑтовувати [timestamp], [year], [month], [day], [hour], " -"[minute], [second], [version], [input_filename] ], [input_filename_base]." - -#: src/libslic3r/PrintConfig.cpp:1585 -msgid "Detect bridging perimeters" -msgstr "ВиÑÐ²Ð»ÐµÐ½Ð½Ñ Ð²Ð¸ÑÑчих периметрів" - -#: src/libslic3r/PrintConfig.cpp:1587 -msgid "" -"Experimental option to adjust flow for overhangs (bridge flow will be used), " -"to apply bridge speed to them and enable fan." -msgstr "" -"ЕкÑпериментальний параметр Ð´Ð»Ñ Ñ€ÐµÐ³ÑƒÐ»ÑŽÐ²Ð°Ð½Ð½Ñ Ð¿Ð¾Ñ‚Ð¾ÐºÑƒ Ð´Ð»Ñ Ð²Ð¸Ñтупів (буде " -"викориÑтано моÑтовий потік), щоб заÑтоÑувати до них швидкіÑÑ‚ÑŒ моÑту та " -"увімкнути вентилÑтор." - -#: src/libslic3r/PrintConfig.cpp:1593 -msgid "Filament parking position" -msgstr "ÐŸÐ¾Ð·Ð¸Ñ†Ñ–Ñ Ð¿Ð°Ñ€ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ñ„Ñ–Ð»Ð°Ð¼ÐµÐ½Ñ‚Ñƒ" - -#: src/libslic3r/PrintConfig.cpp:1594 -msgid "" -"Distance of the extruder tip from the position where the filament is parked " -"when unloaded. This should match the value in printer firmware." -======= #: src/slic3r/GUI/Preferences.cpp:421 msgid "If enabled, useful hints are displayed at startup." msgstr "" @@ -18208,49 +7659,8 @@ msgstr "" #: src/slic3r/GUI/Preferences.cpp:435 msgid "Release only" ->>>>>>> master -msgstr "" -"ВідÑтань наконечника екÑтрудера від міÑÑ†Ñ Ð¿Ð°Ñ€ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ñ„Ñ–Ð»Ð°Ð¼ÐµÐ½Ñ‚Ñƒ при " -"виведенні. Це має відповідати значенню в мікропрограмі принтера." - -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1602 -msgid "Extra loading distance" -msgstr "Додаткова відÑтань заведеннÑ" - -#: src/libslic3r/PrintConfig.cpp:1603 -msgid "" -"When set to zero, the distance the filament is moved from parking position " -"during load is exactly the same as it was moved back during unload. When " -"positive, it is loaded further, if negative, the loading move is shorter " -"than unloading." -msgstr "" -"Якщо вÑтановлено на нуль, відÑтань, на Ñку філамент переміщуєтьÑÑ Ð· " -"Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð½Ñ ÑтоÑнки під Ñ‡Ð°Ñ Ð·Ð°Ð²ÐµÐ´ÐµÐ½Ð½Ñ, Ñ” точно такою ж, Ñк Ñ– при переміщенні " -"назад під Ñ‡Ð°Ñ Ð²Ð¸Ð²ÐµÐ´ÐµÐ½Ð½Ñ. Якщо позитивне, воно заводетьÑÑ Ð´Ð°Ð»Ñ–, Ñкщо " -"негативне, рух Ð·Ð°Ð²ÐµÐ´ÐµÐ½Ð½Ñ ÐºÐ¾Ñ€Ð¾Ñ‚ÑˆÐ¸Ð¹, ніж виведеннÑ." - -#: src/libslic3r/PrintConfig.cpp:1611 src/libslic3r/PrintConfig.cpp:1628 -#: src/libslic3r/PrintConfig.cpp:1641 src/libslic3r/PrintConfig.cpp:1651 -msgid "Perimeters" -msgstr "Периметри" - -#: src/libslic3r/PrintConfig.cpp:1612 -msgid "" -"This is the acceleration your printer will use for perimeters. Set zero to " -"disable acceleration control for perimeters." msgstr "" -"Це приÑкореннÑ, Ñке ваш принтер викориÑтовуватиме Ð´Ð»Ñ Ð¿ÐµÑ€Ð¸Ð¼ÐµÑ‚Ñ€Ñ–Ð². Ð’Ñтановити " -"0, щоб відключити ÑƒÐ¿Ñ€Ð°Ð²Ð»Ñ–Ð½Ð½Ñ Ð¿Ñ€Ð¸ÑкореннÑм Ð´Ð»Ñ Ð¿ÐµÑ€Ð¸Ð¼ÐµÑ‚Ñ€Ñ–Ð²." - -#: src/libslic3r/PrintConfig.cpp:1619 -msgid "Perimeter extruder" -msgstr "ЕкÑтрудер периметру" -#: src/libslic3r/PrintConfig.cpp:1621 -msgid "" -"The extruder to use when printing perimeters and brim. First extruder is 1." -======= #: src/slic3r/GUI/Preferences.cpp:444 msgid "Use custom size for toolbar icons" msgstr "" @@ -18276,109 +7686,28 @@ msgstr "Якщо увімкнено, візуалізує об’єкт за дР#: src/slic3r/GUI/Preferences.cpp:491 msgid "Dark mode (experimental)" ->>>>>>> master msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1630 -msgid "" -"Set this to a non-zero value to set a manual extrusion width for perimeters. " -"You may want to use thinner extrudates to get more accurate surfaces. If " -"left zero, default extrusion width will be used if set, otherwise 1.125 x " -"nozzle diameter will be used. If expressed as percentage (for example 200%) " -"it will be computed over layer height." -======= #: src/slic3r/GUI/Preferences.cpp:496 msgid "Enable dark mode" ->>>>>>> master msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1643 -======= #: src/slic3r/GUI/Preferences.cpp:498 ->>>>>>> master msgid "" "If enabled, UI will use Dark mode colors. If disabled, old UI will be used." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1653 -msgid "" -"This option sets the number of perimeters to generate for each layer. Note " -"that Slic3r may increase this number automatically when it detects sloping " -"surfaces which benefit from a higher number of perimeters if the Extra " -"Perimeters option is enabled." -msgstr "" -"Ð¦Ñ Ð¾Ð¿Ñ†Ñ–Ñ Ð²Ð¸Ð·Ð½Ð°Ñ‡Ð°Ñ” кількіÑÑ‚ÑŒ периметрів Ð´Ð»Ñ ÐºÐ¾Ð¶Ð½Ð¾Ð³Ð¾ шару. Зверніть увагу, що " -"Slic3r може автоматично збільшувати це чиÑло, коли виÑвлÑÑ” похилі поверхні, " -"Ñкі отримують вигоду від більшої кількоÑÑ‚Ñ– периметрів, Ñкщо Ð¾Ð¿Ñ†Ñ–Ñ Â«Ð”Ð¾Ð´Ð°Ñ‚ÐºÐ¾Ð²Ñ– " -"периметри» увімкнена." - -#: src/libslic3r/PrintConfig.cpp:1657 -msgid "(minimum)" -msgstr "(мінімум)" - -#: src/libslic3r/PrintConfig.cpp:1665 -======= #: src/slic3r/GUI/Preferences.cpp:507 msgid "Use system menu for application" msgstr "" #: src/slic3r/GUI/Preferences.cpp:509 ->>>>>>> master msgid "" "If enabled, application will use the standard Windows system menu,\n" "but on some combination of display scales it can looks ugly. If disabled, " "old UI will be used." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1677 -msgid "Printer type" -msgstr "Тип принтеру" - -#: src/libslic3r/PrintConfig.cpp:1678 -msgid "Type of the printer." -msgstr "Тип принтеру." - -#: src/libslic3r/PrintConfig.cpp:1683 -msgid "Printer notes" -msgstr "Примітки принтера" - -#: src/libslic3r/PrintConfig.cpp:1684 -msgid "You can put your notes regarding the printer here." -msgstr "Тут ви можете поміÑтити Ñвої нотатки щодо принтера." - -#: src/libslic3r/PrintConfig.cpp:1692 -msgid "Printer vendor" -msgstr "Виробник принтера" - -#: src/libslic3r/PrintConfig.cpp:1693 -msgid "Name of the printer vendor." -msgstr "Ðазва виробника принтера." - -#: src/libslic3r/PrintConfig.cpp:1698 -msgid "Printer variant" -msgstr "Варіант принтера" - -#: src/libslic3r/PrintConfig.cpp:1699 -msgid "" -"Name of the printer variant. For example, the printer variants may be " -"differentiated by a nozzle diameter." -msgstr "" -"Ðазва варіанту принтера. Ðаприклад, варіанти принтера можуть відрізнÑтиÑÑ Ð·Ð° " -"діаметром Ñопла." - -#: src/libslic3r/PrintConfig.cpp:1716 -msgid "Raft layers" -msgstr "ПлоÑкі шари" - -#: src/libslic3r/PrintConfig.cpp:1718 -msgid "" -"The object will be raised by this number of layers, and support material " -"will be generated under it." -======= #: src/slic3r/GUI/Preferences.cpp:578 msgid "Changes for the critical options" msgstr "" @@ -18416,119 +7745,8 @@ msgstr "Параметри розташуваннÑ" #: src/slic3r/GUI/Preferences.cpp:806 msgid "Text colors" ->>>>>>> master -msgstr "" - -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1726 -msgid "Resolution" -msgstr "Роздільна здатніÑÑ‚ÑŒ" - -#: src/libslic3r/PrintConfig.cpp:1727 -msgid "" -"Minimum detail resolution, used to simplify the input file for speeding up " -"the slicing job and reducing memory usage. High-resolution models often " -"carry more detail than printers can render. Set to zero to disable any " -"simplification and use full resolution from input." -msgstr "" -"Мінімальна роздільна здатніÑÑ‚ÑŒ деталі, що викориÑтовуєтьÑÑ Ð´Ð»Ñ ÑÐ¿Ñ€Ð¾Ñ‰ÐµÐ½Ð½Ñ " -"вхідного файлу Ð´Ð»Ñ Ð¿Ñ€Ð¸ÑÐºÐ¾Ñ€ÐµÐ½Ð½Ñ Ñ€Ð¾Ð±Ð¾Ñ‚Ð¸ над розрізаннÑм та Ð·Ð¼ÐµÐ½ÑˆÐµÐ½Ð½Ñ " -"викориÑÑ‚Ð°Ð½Ð½Ñ Ð¿Ð°Ð¼'ÑÑ‚Ñ–. Моделі з виÑокою роздільною здатніÑÑ‚ÑŽ чаÑто неÑуть " -"більш детальну інформацію, ніж можуть зробити принтери. Ð’Ñтановіть 0, щоб " -"вимкнути будь-Ñке ÑÐ¿Ñ€Ð¾Ñ‰ÐµÐ½Ð½Ñ Ñ‚Ð° викориÑтовувати повну роздільну здатніÑÑ‚ÑŒ від " -"введеннÑ." - -#: src/libslic3r/PrintConfig.cpp:1737 -msgid "Minimum travel after retraction" -msgstr "Мінімальне Ð¿ÐµÑ€ÐµÐ¼Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð¿Ñ–ÑÐ»Ñ Ð¿ÐµÑ€ÐµÑ€Ð¸Ð²Ð°Ð½Ð½Ñ" - -#: src/libslic3r/PrintConfig.cpp:1738 -msgid "" -"Retraction is not triggered when travel moves are shorter than this length." -msgstr "ÐŸÐµÑ€ÐµÑ€Ð¸Ð²Ð°Ð½Ð½Ñ Ð½Ðµ Ñпрацьовує, коли Ð¿ÐµÑ€ÐµÐ¼Ñ–Ñ‰ÐµÐ½Ð½Ñ ÐºÐ¾Ñ€Ð¾Ñ‚ÑˆÐµ за цю довжину." - -#: src/libslic3r/PrintConfig.cpp:1744 -msgid "Retract amount before wipe" -msgstr "КількіÑÑ‚ÑŒ переривань перед чищеннÑм" - -#: src/libslic3r/PrintConfig.cpp:1745 -msgid "" -"With bowden extruders, it may be wise to do some amount of quick retract " -"before doing the wipe movement." -msgstr "" -"ЗавдÑки екÑтрудерам з бандами, має зміÑÑ‚ зробити певну кількіÑÑ‚ÑŒ переривань " -"перед рухами очищеннÑ." - -#: src/libslic3r/PrintConfig.cpp:1752 -msgid "Retract on layer change" -msgstr "ÐŸÐµÑ€ÐµÑ€Ð¸Ð²Ð°Ð½Ð½Ñ Ð½Ð° зміну шарів" - -#: src/libslic3r/PrintConfig.cpp:1753 -msgid "This flag enforces a retraction whenever a Z move is done." -msgstr "" -"Цей прапор забезпечує Ð¿ÐµÑ€ÐµÑ€Ð¸Ð²Ð°Ð½Ð½Ñ ÐºÐ¾Ð¶Ð½Ð¾Ð³Ð¾ разу, коли виконуєтьÑÑ Ð¿ÐµÑ€ÐµÐ¼Ñ–Ñ‰ÐµÐ½Ð½Ñ " -"Z." - -#: src/libslic3r/PrintConfig.cpp:1758 src/libslic3r/PrintConfig.cpp:1766 -msgid "Length" -msgstr "Довжина" - -#: src/libslic3r/PrintConfig.cpp:1759 -msgid "Retraction Length" -msgstr "Довжина перериваннÑ" - -#: src/libslic3r/PrintConfig.cpp:1760 -msgid "" -"When retraction is triggered, filament is pulled back by the specified " -"amount (the length is measured on raw filament, before it enters the " -"extruder)." -msgstr "" -"Коли Ñпрацьовує перериваннÑ, філамент відтÑгуєтьÑÑ Ð½Ð°Ð·Ð°Ð´ до вказаної " -"кількоÑÑ‚Ñ– (довжина вимірюєтьÑÑ Ð½Ð° Ñирого філаменту перед тим, Ñк вона " -"надходить у екÑтрудер)." - -#: src/libslic3r/PrintConfig.cpp:1762 src/libslic3r/PrintConfig.cpp:1771 -msgid "mm (zero to disable)" -msgstr "мм (0, щоб вимкнути)" - -#: src/libslic3r/PrintConfig.cpp:1767 -msgid "Retraction Length (Toolchange)" -msgstr "Довжина Ð¿ÐµÑ€ÐµÑ€Ð¸Ð²Ð°Ð½Ð½Ñ (зміна інÑтрумента)" - -#: src/libslic3r/PrintConfig.cpp:1768 -msgid "" -"When retraction is triggered before changing tool, filament is pulled back " -"by the specified amount (the length is measured on raw filament, before it " -"enters the extruder)." msgstr "" -"Коли Ñпрацьовує Ð¿ÐµÑ€ÐµÑ€Ð¸Ð²Ð°Ð½Ð½Ñ Ð½Ð° зміну інÑтрумента, філамент відтÑгуєтьÑÑ " -"назад до вказаної кількоÑÑ‚Ñ– (довжина вимірюєтьÑÑ Ð½Ð° Ñирого філаменту перед " -"тим, Ñк вона надходить у екÑтрудер)." - -#: src/libslic3r/PrintConfig.cpp:1776 -msgid "Lift Z" -msgstr "ПіднÑти Z" - -#: src/libslic3r/PrintConfig.cpp:1777 -msgid "" -"If you set this to a positive value, Z is quickly raised every time a " -"retraction is triggered. When using multiple extruders, only the setting for " -"the first extruder will be considered." -msgstr "" -"Якщо ви вÑтановите це Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð¿Ð¾Ð·Ð¸Ñ‚Ð¸Ð²Ð½Ð¸Ð¼, Z швидко піднімаєтьÑÑ Ñ‰Ð¾Ñ€Ð°Ð·Ñƒ, " -"коли Ñпрацьовує перериваннÑ. При викориÑтанні декількох екÑтрудерів буде " -"розглÑнуто Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð»Ð¸ÑˆÐµ першого екÑтрудера." - -#: src/libslic3r/PrintConfig.cpp:1784 -msgid "Above Z" -msgstr "Вище Z" -#: src/libslic3r/PrintConfig.cpp:1785 -msgid "Only lift Z above" -msgstr "Тільки піднімати Z" - -#: src/libslic3r/PrintConfig.cpp:1786 -======= #: src/slic3r/GUI/PresetComboBoxes.cpp:249 #: src/slic3r/GUI/PresetComboBoxes.cpp:287 #: src/slic3r/GUI/PresetComboBoxes.cpp:794 @@ -18607,158 +7825,37 @@ msgstr "Додати/Видалити прінтери" #: src/slic3r/GUI/PresetHints.cpp:32 #, boost-format ->>>>>>> master msgid "" "If estimated layer time is below ~%1%s, fan will run at %2%%% and print " "speed will be reduced so that no less than %3%s are spent on that layer " "(however, speed will never be reduced below %4%mm/s)." msgstr "" -<<<<<<< HEAD -"Якщо ви вÑтановите це Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð¿Ð¾Ð·Ð¸Ñ‚Ð¸Ð²Ð½Ð¸Ð¼, Z буде лише підніматиÑÑ Ð½Ð°Ð» " -"вказаним абÑолютним Z. Ви можете налаштувати цей параметр так, що піднÑÑ‚Ñ‚Ñ " -"буде пропуÑкатиÑÑ Ð½Ð° перших шарах." - -#: src/libslic3r/PrintConfig.cpp:1793 -msgid "Below Z" -msgstr "Ðижче Z" - -#: src/libslic3r/PrintConfig.cpp:1794 -msgid "Only lift Z below" -msgstr "Тільки опуÑкати Z" - -#: src/libslic3r/PrintConfig.cpp:1795 -======= "Якщо передбачуваний Ñ‡Ð°Ñ ÑˆÐ°Ñ€Ñƒ менше ~%1%s, вентилÑтор працюватиме на %2%%% Ñ– " "швидкіÑÑ‚ÑŒ друку буде зменшена, так що на цей шар буде витрачено не менше " "%3%s (однак швидкіÑÑ‚ÑŒ ніколи не зменшитьÑÑ Ð½Ð¸Ð¶Ñ‡Ðµ %4%мм/Ñ)." #: src/slic3r/GUI/PresetHints.cpp:40 #, boost-format ->>>>>>> master msgid "" "If estimated layer time is greater, but still below ~%1%s, fan will run at a " "proportionally decreasing speed between %2%%% and %3%%%." msgstr "" -<<<<<<< HEAD -"Якщо ви вÑтановите це Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð¿Ð¾Ð·Ð¸Ñ‚Ð¸Ð²Ð½Ð¸Ð¼, Z буде лише опуÑкатиÑÑ Ð½Ð¸Ð¶Ñ‡Ðµ " -"вказаного абÑолютного Z. Ви можете налаштувати цей параметр так, що піднÑÑ‚Ñ‚Ñ " -"буде обмежене на перших шарах." - -#: src/libslic3r/PrintConfig.cpp:1803 src/libslic3r/PrintConfig.cpp:1811 -msgid "Extra length on restart" -msgstr "Додаткова довжина при перезапуÑку" - -#: src/libslic3r/PrintConfig.cpp:1804 -======= "Якщо передбачуваний Ñ‡Ð°Ñ ÑˆÐ°Ñ€Ñƒ більше, але вÑе ще менше ~%1%s, вентилÑтор " "працюватиме із пропорційно зменшуваною швидкіÑÑ‚ÑŽ між %2%%% Ñ– %3%%%." #: src/slic3r/GUI/PresetHints.cpp:44 #, boost-format ->>>>>>> master msgid "" "If estimated layer time is greater, but still below ~%1%s, fan will run at " "%2%%%" msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1812 -msgid "" -"When the retraction is compensated after changing tool, the extruder will " -"push this additional amount of filament." -======= #: src/slic3r/GUI/PresetHints.cpp:55 #, boost-format msgid "Fan speed will be ramped from zero at layer %1% to %2%%% at layer %3%." ->>>>>>> master msgstr "" "ШвидкіÑÑ‚ÑŒ вентилÑтора буде збільшена з Ð½ÑƒÐ»Ñ Ð½Ð° шарі %1% до %2%%% на шарі %3%." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1819 src/libslic3r/PrintConfig.cpp:1820 -msgid "Retraction Speed" -msgstr "ШвидкіÑÑ‚ÑŒ перериваннÑ" - -#: src/libslic3r/PrintConfig.cpp:1821 -msgid "The speed for retractions (it only applies to the extruder motor)." -msgstr "ШвидкіÑÑ‚ÑŒ Ð¿ÐµÑ€ÐµÑ€Ð¸Ð²Ð°Ð½Ð½Ñ (це ÑтоÑуєтьÑÑ Ð»Ð¸ÑˆÐµ двигуна екÑтрудера)." - -#: src/libslic3r/PrintConfig.cpp:1827 src/libslic3r/PrintConfig.cpp:1828 -msgid "Deretraction Speed" -msgstr "ШвидкіÑÑ‚ÑŒ піÑлÑ-перериваннÑ" - -#: src/libslic3r/PrintConfig.cpp:1829 -msgid "" -"The speed for loading of a filament into extruder after retraction (it only " -"applies to the extruder motor). If left to zero, the retraction speed is " -"used." -msgstr "" -"ШвидкіÑÑ‚ÑŒ Ð·Ð°Ð²ÐµÐ´ÐµÐ½Ð½Ñ Ñ„Ñ–Ð»Ð°Ð¼ÐµÐ½Ñ‚Ð° в екÑтрудер піÑÐ»Ñ Ð¿ÐµÑ€ÐµÑ€Ð¸Ð²Ð°Ð½Ð½Ñ (це ÑтоÑуєтьÑÑ " -"лише двигуна екÑтрудера ). Якщо залишити 0, викориÑтовуєтьÑÑ ÑˆÐ²Ð¸Ð´ÐºÑ–ÑÑ‚ÑŒ " -"Ð¿ÐµÑ€ÐµÑ€Ð¸Ð²Ð°Ð½Ð½Ñ ." - -#: src/libslic3r/PrintConfig.cpp:1836 -msgid "Seam position" -msgstr "ÐŸÐ¾Ð·Ð¸Ñ†Ñ–Ñ ÑˆÐ²Ð°" - -#: src/libslic3r/PrintConfig.cpp:1838 -msgid "Position of perimeters starting points." -msgstr "ÐŸÐ¾Ð·Ð¸Ñ†Ñ–Ñ Ñтартових точок периметра." - -#: src/libslic3r/PrintConfig.cpp:1844 -msgid "Random" -msgstr "Випадкова" - -#: src/libslic3r/PrintConfig.cpp:1845 -msgid "Nearest" -msgstr "Ðайближча" - -#: src/libslic3r/PrintConfig.cpp:1846 -msgid "Aligned" -msgstr "ВирівнÑно" - -#: src/libslic3r/PrintConfig.cpp:1854 -msgid "Direction" -msgstr "ÐапрÑмок" - -#: src/libslic3r/PrintConfig.cpp:1856 -msgid "Preferred direction of the seam" -msgstr "Бажаний напрÑмок шва" - -#: src/libslic3r/PrintConfig.cpp:1857 -msgid "Seam preferred direction" -msgstr "Бажаний напрÑмок шва" - -#: src/libslic3r/PrintConfig.cpp:1864 -msgid "Jitter" -msgstr "Джиттер" - -#: src/libslic3r/PrintConfig.cpp:1866 -msgid "Seam preferred direction jitter" -msgstr "Бажаний напрÑмок шва джитера" - -#: src/libslic3r/PrintConfig.cpp:1867 -msgid "Preferred direction of the seam - jitter" -msgstr "Бажаний напрÑмок шва - джитера" - -#: src/libslic3r/PrintConfig.cpp:1874 -msgid "Distance from object" -msgstr "ВідÑтань від об'єкту" - -#: src/libslic3r/PrintConfig.cpp:1875 -msgid "" -"Distance between skirt and object(s). Set this to zero to attach the skirt " -"to the object(s) and get a brim for better adhesion." -msgstr "" -"ВідÑтань між плінтуÑом та об'єктом (-ами). УÑтановіть 0, щоб прикріпити " -"Ð¿Ð»Ñ–Ð½Ñ‚ÑƒÑ Ð´Ð¾ об'єкта (-ів) Ñ– отримати край Ð´Ð»Ñ ÐºÑ€Ð°Ñ‰Ð¾Ñ— адгезії." - -#: src/libslic3r/PrintConfig.cpp:1882 -msgid "Skirt height" -msgstr "ВиÑота плінтуÑу" - -#: src/libslic3r/PrintConfig.cpp:1883 -======= #: src/slic3r/GUI/PresetHints.cpp:57 #, boost-format msgid "During the other layers, fan will always run at %1%%%" @@ -18848,7 +7945,6 @@ msgid "%3.2f mm³/s at filament speed %3.2f mm/s." msgstr "%3.2f мм³/Ñ Ð¿Ñ€Ð¸ швидкоÑÑ‚Ñ– філаменту %3.2f мм/Ñ." #: src/slic3r/GUI/PresetHints.cpp:215 ->>>>>>> master msgid "" "Recommended object thin wall thickness: Not available due to invalid layer " "height." @@ -18856,31 +7952,6 @@ msgstr "" "Рекомендована товщина Ñтінки об'єкту: ÐедоÑтупний через невірне Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ " "виÑоти шару." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1890 -msgid "Draft shield" -msgstr "Чорновий щит" - -#: src/libslic3r/PrintConfig.cpp:1891 -msgid "" -"If enabled, the skirt will be as tall as a highest printed object. This is " -"useful to protect an ABS or ASA print from warping and detaching from print " -"bed due to wind draft." -msgstr "" -"Якщо увімкнено, ÑÐ¿Ñ–Ð´Ð½Ð¸Ñ†Ñ Ð±ÑƒÐ´Ðµ такою ж виÑокою, Ñк найвищий друкований " -"предмет. Це кориÑно, щоб захиÑтити друк ABS або ASA від деформації та " -"від'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð²Ñ–Ð´ друкарÑького Ñтолу через протÑг." - -#: src/libslic3r/PrintConfig.cpp:1897 -msgid "Loops (minimum)" -msgstr "Петлі (мінімум)" - -#: src/libslic3r/PrintConfig.cpp:1898 -msgid "Skirt Loops" -msgstr "Петлі плінтуÑу" - -#: src/libslic3r/PrintConfig.cpp:1899 -======= #: src/slic3r/GUI/PresetHints.cpp:221 #, c-format, boost-format msgid "Recommended object thin wall thickness for layer height %.2f and" @@ -18892,7 +7963,6 @@ msgid "%d lines: %.2f mm" msgstr "%d Ñ€Ñдків: %.2f мм" #: src/slic3r/GUI/PresetHints.cpp:240 ->>>>>>> master msgid "" "Recommended object thin wall thickness: Not available due to excessively " "small extrusion width." @@ -18900,72 +7970,13 @@ msgstr "" "Рекомендована товщина Ñтінки об'єкту: ÐедоÑтупний через надмірно малу ширину " "екÑтрузії." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1907 -msgid "Slow down if layer print time is below" -msgstr "УповільненнÑ, Ñкщо Ñ‡Ð°Ñ Ð´Ñ€ÑƒÐºÑƒ шару нижче" - -#: src/libslic3r/PrintConfig.cpp:1908 -======= #: src/slic3r/GUI/PresetHints.cpp:269 ->>>>>>> master msgid "" "Top / bottom shell thickness hint: Not available due to invalid layer height." msgstr "" "Підказка щодо товщини верхньої/нижньої оболонки: ÐедоÑтупна через " "неправильну виÑоту шару." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1917 -msgid "Small perimeters" -msgstr "Маленькі периметри" - -#: src/libslic3r/PrintConfig.cpp:1919 -msgid "" -"This separate setting will affect the speed of perimeters having radius <= " -"6.5mm (usually holes). If expressed as percentage (for example: 80%) it will " -"be calculated on the perimeters speed setting above. Set to zero for auto." -msgstr "" -"Цей окремий параметр впливає на швидкіÑÑ‚ÑŒ периметрів, що мають Ñ€Ð°Ð´Ñ–ÑƒÑ <= 6,5 " -"мм (Ñк правило, дірки). Якщо вона виражена у відÑотках (наприклад: 80%), " -"вона буде розрахована за наведеним вище параметром швидкоÑÑ‚Ñ–. Ð’Ñтановити 0 " -"Ð´Ð»Ñ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡Ð½Ð¾Ð³Ð¾ викориÑтаннÑ." - -#: src/libslic3r/PrintConfig.cpp:1929 -msgid "Solid infill threshold area" -msgstr "Порогова площа Ñуцільного наповненнÑ" - -#: src/libslic3r/PrintConfig.cpp:1931 -msgid "" -"Force solid infill for regions having a smaller area than the specified " -"threshold." -msgstr "" -"Ð’Ñтановити Ñуцільне Ð·Ð°Ð¿Ð¾Ð²Ð½ÐµÐ½Ð½Ñ Ð´Ð»Ñ Ñ€ÐµÐ³Ñ–Ð¾Ð½Ñ–Ð², що мають площу, меншу " -"зазначеного порогу." - -#: src/libslic3r/PrintConfig.cpp:1932 -msgid "mm²" -msgstr "мм²" - -#: src/libslic3r/PrintConfig.cpp:1938 -msgid "Solid infill extruder" -msgstr "ЕкÑтрудер Ñуцільних наповнень" - -#: src/libslic3r/PrintConfig.cpp:1940 -msgid "The extruder to use when printing solid infill." -msgstr "ЕкÑтрудер Ð´Ð»Ñ Ð´Ñ€ÑƒÐºÑƒ Ñуцільних наповнень." - -#: src/libslic3r/PrintConfig.cpp:1946 -msgid "Solid infill every" -msgstr "Суцільне Ð½Ð°Ð¿Ð¾Ð²Ð½ÐµÐ½Ð½Ñ ÐºÐ¾Ð¶Ð½Ñ–" - -#: src/libslic3r/PrintConfig.cpp:1948 -msgid "" -"This feature allows to force a solid layer every given number of layers. " -"Zero to disable. You can set this to any value (for example 9999); Slic3r " -"will automatically choose the maximum possible number of layers to combine " -"according to nozzle diameter and layer height." -======= #: src/slic3r/GUI/PresetHints.cpp:282 #, boost-format msgid "Top shell is %1% mm thick for layer height %2% mm." @@ -19013,188 +8024,20 @@ msgstr "Group" #: src/slic3r/GUI/PrintHostDialogs.cpp:84 #, c-format, boost-format msgid "Upload filename doesn't end with \"%s\". Do you wish to continue?" ->>>>>>> master msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1960 -msgid "" -"Set this to a non-zero value to set a manual extrusion width for infill for " -"solid surfaces. If left zero, default extrusion width will be used if set, " -"otherwise 1.125 x nozzle diameter will be used. If expressed as percentage " -"(for example 90%) it will be computed over layer height." -======= #: src/slic3r/GUI/PrintHostDialogs.cpp:92 msgid "Upload and Print" ->>>>>>> master msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1971 -msgid "" -"Speed for printing solid regions (top/bottom/internal horizontal shells). " -"This can be expressed as a percentage (for example: 80%) over the default " -"infill speed above. Set to zero for auto." -======= #: src/slic3r/GUI/PrintHostDialogs.cpp:103 msgid "Upload and Simulate" ->>>>>>> master msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1983 -msgid "Number of solid layers to generate on top and bottom surfaces." -======= #: src/slic3r/GUI/PrintHostDialogs.cpp:115 msgid "Upload" ->>>>>>> master msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:1989 src/libslic3r/PrintConfig.cpp:1990 -msgid "Minimum thickness of a top / bottom shell" -msgstr "Мінімальна товщина верхньої / нижньої оболонки" - -#: src/libslic3r/PrintConfig.cpp:1996 -msgid "Spiral vase" -msgstr "Спіральна ваза" - -#: src/libslic3r/PrintConfig.cpp:1997 -msgid "" -"This feature will raise Z gradually while printing a single-walled object in " -"order to remove any visible seam. This option requires a single perimeter, " -"no infill, no top solid layers and no support material. You can still set " -"any number of bottom solid layers as well as skirt/brim loops. It won't work " -"when printing more than one single object." -msgstr "" -"Ð¦Ñ Ñ„ÑƒÐ½ÐºÑ†Ñ–Ñ Ð±ÑƒÐ´Ðµ поÑтупово підвищувати Z протÑгом друку одного-Ñтінного " -"об'єкта Ð´Ð»Ñ ÑƒÐ½Ð¸ÐºÐ½ÐµÐ½Ð½Ñ Ð±ÑƒÐ´ÑŒ-Ñкого видимого шву. Цей параметр вимагає " -"одношарового периметру, відÑутнє наповненнÑ, відÑутніÑÑ‚ÑŒ верхніх Ñуцільних " -"шарів Ñ– відÑутніÑÑ‚ÑŒ матеріалу підтримки. Ви вÑе ще можете вÑтановити будь-" -"Ñку кількіÑÑ‚ÑŒ нижніх твердих шарів, а також Ñпідниці краю. Це не Ñпрацює при " -"друку більше, ніж одного об'єкта." - -#: src/libslic3r/PrintConfig.cpp:2005 -msgid "Temperature variation" -msgstr "Ð’Ð°Ñ€Ñ–Ð°Ñ†Ñ–Ñ Ñ‚ÐµÐ¼Ð¿ÐµÑ€Ð°Ñ‚ÑƒÑ€Ð¸" - -#: src/libslic3r/PrintConfig.cpp:2006 -msgid "" -"Temperature difference to be applied when an extruder is not active. Enables " -"a full-height \"sacrificial\" skirt on which the nozzles are periodically " -"wiped." -msgstr "" -"Відмітка температури, Ñка заÑтоÑовуєтьÑÑ, коли екÑтрудер не активний. Вмикає " -"\"жертовний\" Ð¿Ð»Ñ–Ð½Ñ‚ÑƒÑ Ð½Ð° повній виÑоті, на Ñкі періодично очищуютьÑÑ Ñопла." - -#: src/libslic3r/PrintConfig.cpp:2016 -msgid "" -"This start procedure is inserted at the beginning, after bed has reached the " -"target temperature and extruder just started heating, and before extruder " -"has finished heating. If PrusaSlicer detects M104 or M190 in your custom " -"codes, such commands will not be prepended automatically so you're free to " -"customize the order of heating commands and other custom actions. Note that " -"you can use placeholder variables for all PrusaSlicer settings, so you can " -"put a \"M109 S[first_layer_temperature]\" command wherever you want." -msgstr "" -"Ð¦Ñ Ð¿Ñ€Ð¾Ñ†ÐµÐ´ÑƒÑ€Ð° початку вÑтавлÑєтьÑÑ Ð½Ð° початку, піÑÐ»Ñ Ñ‚Ð¾Ð³Ð¾, Ñк Ñтіл доÑÑгне " -"цільової температури, а екÑтрудер тільки починає нагріватиÑÑ, Ñ– перед тим, " -"Ñк екÑтрудер закінчить нагріваннÑ. Якщо Slic3r виÑвлÑÑ” M104 або M190 у ваших " -"кориÑтувацьких кодах, такі команди не будуть додаватиÑÑ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡Ð½Ð¾, щоб ви " -"могли вільно налаштовувати порÑдок команд нагріву та інших Ñпеціальних дій. " -"Зверніть увагу, що ви можете викориÑтовувати шаблонні змінні Ð´Ð»Ñ Ð²ÑÑ–Ñ… " -"параметрів Slic3r, щоб ви могли поÑтавити команду \"M109 S " -"[first_layer_temperature]\" де завгодно." - -#: src/libslic3r/PrintConfig.cpp:2031 -msgid "" -"This start procedure is inserted at the beginning, after any printer start " -"gcode (and after any toolchange to this filament in case of multi-material " -"printers). This is used to override settings for a specific filament. If " -"PrusaSlicer detects M104, M109, M140 or M190 in your custom codes, such " -"commands will not be prepended automatically so you're free to customize the " -"order of heating commands and other custom actions. Note that you can use " -"placeholder variables for all PrusaSlicer settings, so you can put a \"M109 " -"S[first_layer_temperature]\" command wherever you want. If you have multiple " -"extruders, the gcode is processed in extruder order." -msgstr "" -"Ð¦Ñ Ð¿Ñ€Ð¾Ñ†ÐµÐ´ÑƒÑ€Ð° початку вÑтавлÑєтьÑÑ Ð½Ð° початку, піÑÐ»Ñ Ð±ÑƒÐ´ÑŒ-Ñкого Ñтартового G-" -"коду принтера (Ñ– піÑÐ»Ñ Ð±ÑƒÐ´ÑŒ-Ñкої зміни інÑтрументу на цей філамент, у разі " -"багато-матеріальних принтерів). Вона викориÑтовуєтьÑÑ Ð´Ð»Ñ Ð·Ð°Ð¼Ñ–Ð½Ð¸ налаштувань " -"Ð´Ð»Ñ Ð¿ÐµÐ²Ð½Ð¾Ð³Ð¾ філаменту. Якщо PrusaSlicer виÑвить M104, M109, M140 або M190 у " -"ваших кориÑтувацьких кодах, такі команди не додаватимутьÑÑ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡Ð½Ð¾, тому " -"ви можете налаштувати порÑдок команд Ð½Ð°Ð³Ñ€Ñ–Ð²Ð°Ð½Ð½Ñ Ñ‚Ð° інші Ñпеціальні дії. " -"Зверніть увагу, що ви можете викориÑтовувати шаблонні змінні Ð´Ð»Ñ Ð²ÑÑ–Ñ… " -"налаштувань PrusaSlicer, тому ви можете поÑтавити команду \"M109 S " -"[first_layer_temperature]\" де завгодно. Якщо у Ð²Ð°Ñ ÐºÑ–Ð»ÑŒÐºÐ° екÑтрудерів, G-" -"код оброблÑєтьÑÑ Ð² порÑдку екÑтрудера." - -#: src/libslic3r/PrintConfig.cpp:2047 -msgid "Color change G-code" -msgstr "G-код зміни кольору" - -#: src/libslic3r/PrintConfig.cpp:2048 -msgid "This G-code will be used as a code for the color change" -msgstr "Цей G-код буде викориÑтовуватиÑÑ Ñк код Ð´Ð»Ñ Ð·Ð¼Ñ–Ð½Ð¸ кольору" - -#: src/libslic3r/PrintConfig.cpp:2057 -msgid "This G-code will be used as a code for the pause print" -msgstr "Цей G-код буде викориÑтовуватиÑÑ Ñк код Ð´Ð»Ñ Ð¿Ð°ÑƒÐ·Ð¸ друку" - -#: src/libslic3r/PrintConfig.cpp:2066 -msgid "This G-code will be used as a custom code" -msgstr "Цей G-код буде викориÑтовуватиÑÑ Ñк влаÑний код" - -#: src/libslic3r/PrintConfig.cpp:2074 -msgid "Single Extruder Multi Material" -msgstr "Мульти-матеріальний (ММ) друк з одним екÑтрудером" - -#: src/libslic3r/PrintConfig.cpp:2075 -msgid "The printer multiplexes filaments into a single hot end." -msgstr "Принтер змішує філаменту в єдиний гарÑчий кінець." - -#: src/libslic3r/PrintConfig.cpp:2080 -msgid "Prime all printing extruders" -msgstr "Підготовка вÑÑ–Ñ… друкуючих екÑтрудерів" - -#: src/libslic3r/PrintConfig.cpp:2081 -msgid "" -"If enabled, all printing extruders will be primed at the front edge of the " -"print bed at the start of the print." -msgstr "" -"Якщо увімкнено, уÑÑ– друкуючі екÑтрудери будуть отеÑтовані на передньому краї " -"друкарÑького Ñтолу перед початком друку." - -#: src/libslic3r/PrintConfig.cpp:2086 -msgid "No sparse layers (EXPERIMENTAL)" -msgstr "Ðемає розріджених шарів (ЕКСПЕРИМЕÐТÐЛЬÐИЙ)" - -#: src/libslic3r/PrintConfig.cpp:2087 -msgid "" -"If enabled, the wipe tower will not be printed on layers with no " -"toolchanges. On layers with a toolchange, extruder will travel downward to " -"print the wipe tower. User is responsible for ensuring there is no collision " -"with the print." -msgstr "" -"Якщо увімкнено, вежа Ð²Ð¸Ñ‚Ð¸Ñ€Ð°Ð½Ð½Ñ Ð½Ðµ друкуєтьÑÑ Ð½Ð° шарах без змін інÑтрументів. " -"Ðа шарах із зміною інÑтрументу екÑтрудер рухатиметьÑÑ Ð²Ð½Ð¸Ð·, щоб надрукувати " -"вежу витираннÑ. КориÑтувач неÑе відповідальніÑÑ‚ÑŒ за те, щоб не було " -"Ð·Ñ–Ñ‚ÐºÐ½ÐµÐ½Ð½Ñ Ð· друком." - -#: src/libslic3r/PrintConfig.cpp:2094 -msgid "Generate support material" -msgstr "Створити підтримуючий матеріал" - -#: src/libslic3r/PrintConfig.cpp:2096 -msgid "Enable support material generation." -msgstr "Увімкнути генерацію матеріалів підтримки." - -#: src/libslic3r/PrintConfig.cpp:2100 -msgid "Auto generated supports" -msgstr "Ðвтоматично згенеровані підтримки" - -#: src/libslic3r/PrintConfig.cpp:2102 -======= #: src/slic3r/GUI/PrintHostDialogs.cpp:247 msgid "ID" msgstr "ID" @@ -19350,25 +8193,10 @@ msgstr "КопіÑ" #: src/slic3r/GUI/SavePresetDialog.cpp:283 #, boost-format ->>>>>>> master msgid "" "You have selected physical printer \"%1%\" \n" "with related printer preset \"%2%\"" msgstr "" -<<<<<<< HEAD -"Якщо увімкнено, підтримка буде генеруватиÑÑ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡Ð½Ð¾ на оÑнові порогового " -"Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð·Ð²Ð¸Ñу. Якщо вимкнено, підтримка буде генеруватиÑÑ Ð»Ð¸ÑˆÐµ Ð´Ð»Ñ " -"\"ПримуÑових підтримок\"." - -#: src/libslic3r/PrintConfig.cpp:2108 -msgid "XY separation between an object and its support" -msgstr "Розподіл XY між об'єктом та його підтримкою" - -#: src/libslic3r/PrintConfig.cpp:2110 -msgid "" -"XY separation between an object and its support. If expressed as percentage " -"(for example 50%), it will be calculated over external perimeter width." -======= "Ви вибрали фізичний принтер \"%1%\"\n" "із пов'Ñзаним преÑетом \"%2%\"" @@ -19440,16 +8268,8 @@ msgstr "МаÑштабувати під облаÑÑ‚ÑŒ друку" #: src/slic3r/GUI/SendSystemInfoDialog.cpp:114 msgid "Data to send" ->>>>>>> master msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2120 -msgid "Pattern angle" -msgstr "Кут шаблону" - -#: src/libslic3r/PrintConfig.cpp:2122 -======= #: src/slic3r/GUI/SendSystemInfoDialog.cpp:550 #: src/slic3r/GUI/SendSystemInfoDialog.cpp:618 msgid "Send system info" @@ -19457,7 +8277,6 @@ msgstr "" #: src/slic3r/GUI/SendSystemInfoDialog.cpp:581 #, boost-format ->>>>>>> master msgid "" "This is the first time you are running %1%. We would like to ask you to send " "some of your system information to us. This will only happen once and we " @@ -19465,24 +8284,13 @@ msgid "" "version)." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2132 src/libslic3r/PrintConfig.cpp:2927 -======= #: src/slic3r/GUI/SendSystemInfoDialog.cpp:585 ->>>>>>> master msgid "" "If we know your hardware, operating system, etc., it will greatly help us in " "development and prioritization, because we will be able to focus our effort " "more efficiently and spend time on features that are needed the most." msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2138 -msgid "Contact Z distance" -msgstr "Контактна відÑтань по оÑÑ– Z" - -#: src/libslic3r/PrintConfig.cpp:2140 -======= #: src/slic3r/GUI/SendSystemInfoDialog.cpp:588 msgid "Is it safe?" msgstr "" @@ -24586,7 +13394,6 @@ msgid "Top contact Z distance" msgstr "" #: src/libslic3r/PrintConfig.cpp:2550 ->>>>>>> master msgid "" "The vertical distance between object and support material interface. Setting " "this to 0 will also prevent Slic3r from using bridge flow and speed for the " @@ -32377,55 +21184,6 @@ msgstr "Ð’&ибрати вÑе" msgid "Select All" msgstr "Вибрати вÑе" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2147 -msgid "0 (soluble)" -msgstr "0 (розчинний)" - -#: src/libslic3r/PrintConfig.cpp:2148 -msgid "0.2 (detachable)" -msgstr "0,2 (відривний)" - -#: src/libslic3r/PrintConfig.cpp:2153 -msgid "Enforce support for the first" -msgstr "Забезпечити підтримку першого(их)" - -#: src/libslic3r/PrintConfig.cpp:2155 -msgid "" -"Generate support material for the specified number of layers counting from " -"bottom, regardless of whether normal support material is enabled or not and " -"regardless of any angle threshold. This is useful for getting more adhesion " -"of objects having a very thin or poor footprint on the build plate." -msgstr "" -"Генерувати допоміжний матеріал Ð´Ð»Ñ Ð·Ð°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¾Ñ— кількоÑÑ‚Ñ– шарів, що " -"підраховують знизу, незалежно від того, включено чи ні нормальний матеріал " -"підтримки, Ñ– незалежно від будь-Ñкого порогу кута. Це кориÑно Ð´Ð»Ñ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ " -"більшої адгезії об'єктів, що мають дуже тонкий або поганий Ñлід на збірній " -"плаÑтині." - -#: src/libslic3r/PrintConfig.cpp:2160 -msgid "Enforce support for the first n layers" -msgstr "Забезпечити підтримку перших n шарів" - -#: src/libslic3r/PrintConfig.cpp:2166 -msgid "Support material/raft/skirt extruder" -msgstr "Підтримуючий матеріал / пліт / Ð¿Ð»Ñ–Ð½Ñ‚ÑƒÑ ÐµÐºÑтрудеру" - -#: src/libslic3r/PrintConfig.cpp:2168 -msgid "" -"The extruder to use when printing support material, raft and skirt (1+, 0 to " -"use the current extruder to minimize tool changes)." -msgstr "" -"ЕкÑтрудер Ð´Ð»Ñ Ð´Ñ€ÑƒÐºÑƒ підтримуючого матеріалу, плоту та плінтуÑу (1+, 0 Ð´Ð»Ñ " -"викориÑÑ‚Ð°Ð½Ð½Ñ Ð¿Ð¾Ñ‚Ð¾Ñ‡Ð½Ð¾Ð³Ð¾ екÑтрудера, щоб мінімізувати зміни інÑтрументу)." - -#: src/libslic3r/PrintConfig.cpp:2177 -msgid "" -"Set this to a non-zero value to set a manual extrusion width for support " -"material. If left zero, default extrusion width will be used if set, " -"otherwise nozzle diameter will be used. If expressed as percentage (for " -"example 90%) it will be computed over layer height." -======= #: ../src/common/docview.cpp:1895 msgid "Select a document template" msgstr "Виберіть шаблон документа" @@ -32461,52 +21219,8 @@ msgstr "Оберіть рівень ÑпиÑку Ð´Ð»Ñ Ñ€ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ð½Ð½Ñ." #. TRANSLATORS: Name of keyboard key #: ../src/common/accelcmn.cpp:82 msgid "Separator" ->>>>>>> master -msgstr "" - -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2186 -msgid "Interface loops" -msgstr "ІнтерфейÑні петлі" - -#: src/libslic3r/PrintConfig.cpp:2188 -msgid "" -"Cover the top contact layer of the supports with loops. Disabled by default." -msgstr "" -"Закрити петлÑми верхній контактний шар підтримки. За замовчаннÑм вимкнено." - -#: src/libslic3r/PrintConfig.cpp:2193 -msgid "Support material/raft interface extruder" -msgstr "ЕкÑтрудер інтерфейÑу підтримуючого матеріалу / плоту" - -#: src/libslic3r/PrintConfig.cpp:2195 -msgid "" -"The extruder to use when printing support material interface (1+, 0 to use " -"the current extruder to minimize tool changes). This affects raft too." msgstr "" -"ЕкÑтрудер, що викориÑтовуєтьÑÑ Ð¿Ñ–Ð´ Ñ‡Ð°Ñ Ð´Ñ€ÑƒÐºÑƒ інтерфейÑу матеріалу підтримки " -"(1+, 0 Ð´Ð»Ñ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ð½Ð½Ñ Ð¿Ð¾Ñ‚Ð¾Ñ‡Ð½Ð¾Ð³Ð¾ екÑтрудера, щоб звеÑти до мінімуму зміни " -"інÑтрументу). Це також впливає на плот." -#: src/libslic3r/PrintConfig.cpp:2202 -msgid "Interface layers" -msgstr "ІнтерфейÑні шари" - -#: src/libslic3r/PrintConfig.cpp:2204 -msgid "" -"Number of interface layers to insert between the object(s) and support " -"material." -msgstr "" -"КількіÑÑ‚ÑŒ шарів інтерфейÑу Ð´Ð»Ñ Ð²Ñтавки між об'єктом(ами) та підтримуючим " -"матеріалом." - -#: src/libslic3r/PrintConfig.cpp:2211 -msgid "Interface pattern spacing" -msgstr "ВідÑтань між шаблонами інтерфейÑу" - -#: src/libslic3r/PrintConfig.cpp:2213 -msgid "Spacing between interface lines. Set zero to get a solid interface." -======= #: ../src/common/cmdline.cpp:1083 #, c-format msgid "Separator expected after the option '%s'." @@ -32535,122 +21249,12 @@ msgstr "" #: ../src/richtext/richtextbackgroundpage.cpp:271 msgid "Sh&adow spread:" ->>>>>>> master msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2222 -msgid "" -"Speed for printing support material interface layers. If expressed as " -"percentage (for example 50%) it will be calculated over support material " -"speed." -======= #: ../src/richtext/richtextbackgroundpage.cpp:179 msgid "Shadow" ->>>>>>> master -msgstr "" - -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2231 -msgid "Pattern" -msgstr "Шаблон" - -#: src/libslic3r/PrintConfig.cpp:2233 -msgid "Pattern used to generate support material." -msgstr "Шаблон, що викориÑтовуєтьÑÑ Ð´Ð»Ñ ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð¼Ð°Ñ‚ÐµÑ€Ñ–Ð°Ð»Ñƒ підтримки." - -#: src/libslic3r/PrintConfig.cpp:2239 -msgid "Rectilinear grid" -msgstr "ПрÑмолінійна Ñітка" - -#: src/libslic3r/PrintConfig.cpp:2245 -msgid "Pattern spacing" -msgstr "ВідÑтань між шаблонами" - -#: src/libslic3r/PrintConfig.cpp:2247 -msgid "Spacing between support material lines." -msgstr "ВідÑтань між лініÑми підтримуючого матеріалу." - -#: src/libslic3r/PrintConfig.cpp:2256 -msgid "Speed for printing support material." -msgstr "ШвидкіÑÑ‚ÑŒ друку підтримуючого матеріалу." - -#: src/libslic3r/PrintConfig.cpp:2263 -msgid "Synchronize with object layers" -msgstr "Синхронізувати з шарами об'єкту" - -#: src/libslic3r/PrintConfig.cpp:2265 -msgid "" -"Synchronize support layers with the object print layers. This is useful with " -"multi-material printers, where the extruder switch is expensive." -msgstr "" -"Синхронізувати шари підтримки з шарами друку об'єкта. Це кориÑно " -"викориÑтовувати з багато-матеріальними принтерами, де Ð¿ÐµÑ€ÐµÐ¼Ð¸ÐºÐ°Ð½Ð½Ñ " -"екÑтрудерів -затратна процедура." - -#: src/libslic3r/PrintConfig.cpp:2271 -msgid "Overhang threshold" -msgstr "Порог навиÑаннÑ" - -#: src/libslic3r/PrintConfig.cpp:2273 -msgid "" -"Support material will not be generated for overhangs whose slope angle (90° " -"= vertical) is above the given threshold. In other words, this value " -"represent the most horizontal slope (measured from the horizontal plane) " -"that you can print without support material. Set to zero for automatic " -"detection (recommended)." msgstr "" -"Матеріал підтримки не буде Ñформований Ð´Ð»Ñ Ð²Ð¸Ñтупів, кут нахилу (90° = " -"вертикальний) Ñких перевищує заданий порог. Іншими Ñловами, це Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ " -"предÑтавлÑÑ” найбільш горизонтальний Ñхил (вимірюваний з горизонтальної " -"площини), Ñкий ви можете надрукувати без підтримуючого матеріалу. Ð’Ñтановити " -"0 Ð´Ð»Ñ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡Ð½Ð¾Ð³Ð¾ Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ (рекомендовано)." - -#: src/libslic3r/PrintConfig.cpp:2285 -msgid "With sheath around the support" -msgstr "З оболонкою навколо підтримки" -#: src/libslic3r/PrintConfig.cpp:2287 -msgid "" -"Add a sheath (a single perimeter line) around the base support. This makes " -"the support more reliable, but also more difficult to remove." -msgstr "" -"Додати оболонку (одну лінію периметра) навколо базової підтримки. Це робить " -"підтримку більш надійною, але Ñ—Ñ— важче видалити." - -#: src/libslic3r/PrintConfig.cpp:2294 -msgid "" -"Nozzle temperature for layers after the first one. Set this to zero to " -"disable temperature control commands in the output G-code." -msgstr "" -"Температура Ñопла Ð´Ð»Ñ ÑˆÐ°Ñ€Ñ–Ð² піÑÐ»Ñ Ð¿ÐµÑ€ÑˆÐ¾Ð³Ð¾. Ð’Ñтановіть Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð½ÑƒÐ»Ñ, щоб " -"вимкнути команди Ñ€ÐµÐ³ÑƒÐ»ÑŽÐ²Ð°Ð½Ð½Ñ Ñ‚ÐµÐ¼Ð¿ÐµÑ€Ð°Ñ‚ÑƒÑ€Ð¸ у вихідному G-коді." - -#: src/libslic3r/PrintConfig.cpp:2297 -msgid "Nozzle temperature" -msgstr "Температура Ñопла" - -#: src/libslic3r/PrintConfig.cpp:2303 -msgid "Detect thin walls" -msgstr "ВиÑÐ²Ð»ÐµÐ½Ð½Ñ Ñ‚Ð¾Ð½ÐºÐ¸Ñ… Ñтінок" - -#: src/libslic3r/PrintConfig.cpp:2305 -msgid "" -"Detect single-width walls (parts where two extrusions don't fit and we need " -"to collapse them into a single trace)." -msgstr "" -"Ð’Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð¾Ð´Ð½Ð¾ÑˆÐ°Ñ€Ð¾Ð²Ð¾Ñ— Ñтінки (чаÑтини, де два екÑтрузії не підходÑÑ‚ÑŒ, Ñ– нам " -"потрібно згорнути Ñ—Ñ… у єдиний Ñлід)." - -#: src/libslic3r/PrintConfig.cpp:2311 -msgid "Threads" -msgstr "Ðитки" - -#: src/libslic3r/PrintConfig.cpp:2312 -msgid "" -"Threads are used to parallelize long-running tasks. Optimal threads number " -"is slightly above the number of available cores/processors." -======= #: ../src/richtext/richtextbackgroundpage.cpp:258 #, fuzzy msgid "Shadow c&olour:" @@ -32734,34 +21338,8 @@ msgstr "Розмір:" #. TRANSLATORS: System cursor name #: ../src/propgrid/advprops.cpp:1775 msgid "Sizing" ->>>>>>> master msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2324 -msgid "" -"This custom code is inserted before every toolchange. Placeholder variables " -"for all PrusaSlicer settings as well as {previous_extruder} and " -"{next_extruder} can be used. When a tool-changing command which changes to " -"the correct extruder is included (such as T{next_extruder}), PrusaSlicer " -"will emit no other such command. It is therefore possible to script custom " -"behaviour both before and after the toolchange." -msgstr "" -"Цей кориÑтувацький код вÑтавлÑєтьÑÑ Ð¿ÐµÑ€ÐµÐ´ кожною заміною інÑтрументу. Можна " -"викориÑтовувати шаблонні змінні Ð´Ð»Ñ Ð²ÑÑ–Ñ… налаштувань PrusaSlicer, таких Ñк " -"{previous_extruder} та {next_extruder}. Коли включаєтьÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° зміни " -"інÑтрумента, Ñка змінюєтьÑÑ Ð½Ð° правильний екÑтрудер (наприклад, " -"T{next_extruder}), PrusaSlicer не видаÑÑ‚ÑŒ жодної такої команди. Отже, можна " -"Ñтворювати Ñценарії до поведінки Ñк до, так Ñ– піÑÐ»Ñ Ð·Ð°Ð¼Ñ–Ð½Ð¸ інÑтрументу." - -#: src/libslic3r/PrintConfig.cpp:2337 -msgid "" -"Set this to a non-zero value to set a manual extrusion width for infill for " -"top surfaces. You may want to use thinner extrudates to fill all narrow " -"regions and get a smoother finish. If left zero, default extrusion width " -"will be used if set, otherwise nozzle diameter will be used. If expressed as " -"percentage (for example 90%) it will be computed over layer height." -======= #. TRANSLATORS: System cursor name #: ../src/propgrid/advprops.cpp:1772 msgid "Sizing N-S" @@ -32770,60 +21348,13 @@ msgstr "" #. TRANSLATORS: System cursor name #: ../src/propgrid/advprops.cpp:1771 msgid "Sizing NE-SW" ->>>>>>> master msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2349 -msgid "" -"Speed for printing top solid layers (it only applies to the uppermost " -"external layers and not to their internal solid layers). You may want to " -"slow down this to get a nicer surface finish. This can be expressed as a " -"percentage (for example: 80%) over the solid infill speed above. Set to zero " -"for auto." -======= #. TRANSLATORS: System cursor name #: ../src/propgrid/advprops.cpp:1773 msgid "Sizing NW-SE" ->>>>>>> master -msgstr "" - -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2364 -msgid "Number of solid layers to generate on top surfaces." -msgstr "КількіÑÑ‚ÑŒ Ñуцільних шарів, генерованих на верхніх поверхнÑÑ…." - -#: src/libslic3r/PrintConfig.cpp:2365 -msgid "Top solid layers" -msgstr "Верхні Ñуцільні шари" - -#: src/libslic3r/PrintConfig.cpp:2373 -msgid "" -"The number of top solid layers is increased above top_solid_layers if " -"necessary to satisfy minimum thickness of top shell. This is useful to " -"prevent pillowing effect when printing with variable layer height." msgstr "" -"КількіÑÑ‚ÑŒ верхніх твердих шарів збільшуєтьÑÑ Ð½Ð°Ð´ top_solid_layers, Ñкщо це " -"необхідно Ð´Ð»Ñ Ð·Ð°Ð´Ð¾Ð²Ð¾Ð»ÐµÐ½Ð½Ñ Ð¼Ñ–Ð½Ñ–Ð¼Ð°Ð»ÑŒÐ½Ð¾Ñ— товщини верхньої оболонки. Це кориÑно " -"Ð´Ð»Ñ Ð·Ð°Ð¿Ð¾Ð±Ñ–Ð³Ð°Ð½Ð½Ñ ÐµÑ„ÐµÐºÑ‚Ñƒ подушки під Ñ‡Ð°Ñ Ð´Ñ€ÑƒÐºÑƒ зі змінною виÑотою шару." - -#: src/libslic3r/PrintConfig.cpp:2376 -msgid "Minimum top shell thickness" -msgstr "Мінімальна товщина верхньої оболонки" -#: src/libslic3r/PrintConfig.cpp:2383 -msgid "Speed for travel moves (jumps between distant extrusion points)." -msgstr "ШвидкіÑÑ‚ÑŒ рухів переÑÑƒÐ²Ð°Ð½Ð½Ñ (Ñтрибки між далекими точками екÑтрузії)." - -#: src/libslic3r/PrintConfig.cpp:2391 -msgid "Use firmware retraction" -msgstr "ВикориÑтовувати відмову прошивки" - -#: src/libslic3r/PrintConfig.cpp:2392 -msgid "" -"This experimental setting uses G10 and G11 commands to have the firmware " -"handle the retraction. This is only supported in recent Marlin." -======= #. TRANSLATORS: System cursor name #: ../src/propgrid/advprops.cpp:1774 msgid "Sizing W-E" @@ -32844,19 +21375,8 @@ msgstr "&Мала капітель" #. TRANSLATORS: Name of keyboard key #: ../src/common/accelcmn.cpp:79 msgid "Snapshot" ->>>>>>> master msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2398 -msgid "Use relative E distances" -msgstr "ВикориÑтовувати відноÑні E відÑтані" - -#: src/libslic3r/PrintConfig.cpp:2399 -msgid "" -"If your firmware requires relative E values, check this, otherwise leave it " -"unchecked. Most firmwares use absolute values." -======= #: ../src/richtext/richtextborderspage.cpp:611 msgid "Solid" msgstr "Суцільна" @@ -32903,16 +21423,8 @@ msgstr "Перевірка правопиÑу" #. TRANSLATORS: System cursor name #: ../src/propgrid/advprops.cpp:1776 msgid "Spraycan" ->>>>>>> master msgstr "" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2405 -msgid "Use volumetric E" -msgstr "ВикориÑтовувати об'ємний Е" - -#: src/libslic3r/PrintConfig.cpp:2406 -======= #: ../src/common/paper.cpp:104 msgid "Statement, 5 1/2 x 8 1/2 in" msgstr "Statement, 5 1/2 x 8 1/2 дюйм" @@ -33128,26 +21640,11 @@ msgstr "Код Ñимволу." #: ../src/common/fontmap.cpp:203 #, c-format ->>>>>>> master msgid "" "The charset '%s' is unknown. You may select\n" "another charset to replace it with or choose\n" "[Cancel] if it cannot be replaced" msgstr "" -<<<<<<< HEAD -"Цей екÑпериментальний параметр викориÑтовує виводи Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ E в кубічних " -"міліметрах заміÑÑ‚ÑŒ лінійних міліметрів. Якщо ваша прошивку ще не знає " -"діаметр ниток, ви можете вÑтановити такі команди, Ñк \"M200 D " -"[filament_diameter_0] T0\" у вашому Ñтарті G-коду, щоб включити об'ємний " -"режим Ñ– викориÑтовувати діаметр філаменту, пов'Ñзаний з вибраним філаментем " -"у Slic3r. ОÑтаннім чаÑом це підтримуєтьÑÑ Ð»Ð¸ÑˆÐµ Marlin-ом." - -#: src/libslic3r/PrintConfig.cpp:2416 -msgid "Enable variable layer height feature" -msgstr "Увімкнути функцію шарів змінної виÑоти" - -#: src/libslic3r/PrintConfig.cpp:2417 -======= "Ðабір Ñимволів «%s» невідомий. Ви можете вибрати\n" "заміÑÑ‚ÑŒ нього інший набір або натиÑнути [СкаÑувати], \n" "Ñкщо його не можна замінити" @@ -33164,7 +21661,6 @@ msgstr "Типовий Ñтиль Ð´Ð»Ñ Ð½Ð°Ñтупного абзацу." #: ../src/generic/dirdlgg.cpp:202 #, c-format ->>>>>>> master msgid "" "The directory '%s' does not exist\n" "Create it now?" @@ -33172,13 +21668,6 @@ msgstr "" "Каталог «%s» не приÑутній\n" "Створити його зараз?" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2423 -msgid "Wipe while retracting" -msgstr "Ð’Ð¸Ñ‚Ð¸Ñ€Ð°Ð½Ð½Ñ Ð¿Ñ€Ð¾Ñ‚Ñгом ретракту" - -#: src/libslic3r/PrintConfig.cpp:2424 -======= #: ../src/html/htmprint.cpp:271 #, c-format msgid "" @@ -33194,7 +21683,6 @@ msgstr "" #: ../src/common/docview.cpp:1202 #, c-format ->>>>>>> master msgid "" "The file '%s' doesn't exist and couldn't be opened.\n" "It has been removed from the most recently used files list." @@ -33483,12 +21971,8 @@ msgstr "Ð—Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð° «%s» повинно бути заРmsgid "The value of the corner radius." msgstr "Ð—Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ñ€Ð°Ð´Ñ–ÑƒÑа закругленнÑ." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2431 -======= #: ../src/msw/dialup.cpp:433 #, c-format ->>>>>>> master msgid "" "The version of remote access service (RAS) installed on this machine is too " "old, please upgrade (the following required function is missing: %s)." @@ -33496,85 +21980,6 @@ msgstr "" "ВерÑÑ–Ñ Ñлужби віддаленого доÑтупу (RAS), вÑтановлена на цій машині " "заÑтаріла, будь лаÑка, оновіть Ñ—Ñ— (не виÑтачає функції %s)." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2437 -msgid "Purging volumes - load/unload volumes" -msgstr "ОбÑÑги Ð²Ð¸Ñ‚Ð¸Ñ€Ð°Ð½Ð½Ñ - обÑÑги заведеннÑ/виведеннÑ" - -#: src/libslic3r/PrintConfig.cpp:2438 -msgid "" -"This vector saves required volumes to change from/to each tool used on the " -"wipe tower. These values are used to simplify creation of the full purging " -"volumes below." -msgstr "" -"Цей вектор економить необхідні обÑÑги Ð´Ð»Ñ Ð·Ð¼Ñ–Ð½Ð¸ від / до кожного " -"інÑтрументу, що викориÑтовуєтьÑÑ Ð½Ð° вежі витираннÑ. Ці Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ " -"викориÑтовуютьÑÑ Ð´Ð»Ñ ÑÐ¿Ñ€Ð¾Ñ‰ÐµÐ½Ð½Ñ ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð¿Ð¾Ð²Ð½Ð¸Ñ… обÑÑгів продувки нижче." - -#: src/libslic3r/PrintConfig.cpp:2444 -msgid "Purging volumes - matrix" -msgstr "Ð¢Ð°Ð±Ð»Ð¸Ñ†Ñ Ð¾Ð±ÑÑгів очищеннÑ" - -#: src/libslic3r/PrintConfig.cpp:2445 -msgid "" -"This matrix describes volumes (in cubic milimetres) required to purge the " -"new filament on the wipe tower for any given pair of tools." -msgstr "" -"Ð¦Ñ Ð¼Ð°Ñ‚Ñ€Ð¸Ñ†Ñ Ð¾Ð¿Ð¸Ñує обÑÑги (у кубічних міліметрах), необхідні Ð´Ð»Ñ Ð²Ð¸Ñ‚Ð¸Ñ€Ð°Ð½Ð½Ñ " -"нового філаменту на вежі Ð²Ð¸Ñ‚Ð¸Ñ€Ð°Ð½Ð½Ñ Ð´Ð»Ñ Ð±ÑƒÐ´ÑŒ-Ñкої пари інÑтрументів." - -#: src/libslic3r/PrintConfig.cpp:2454 -msgid "Position X" -msgstr "ÐŸÐ¾Ð·Ð¸Ñ†Ñ–Ñ X" - -#: src/libslic3r/PrintConfig.cpp:2455 -msgid "X coordinate of the left front corner of a wipe tower" -msgstr "X координата лівого переднього кута вичищуючої вежі" - -#: src/libslic3r/PrintConfig.cpp:2461 -msgid "Position Y" -msgstr "ÐŸÐ¾Ð·Ð¸Ñ†Ñ–Ñ Y" - -#: src/libslic3r/PrintConfig.cpp:2462 -msgid "Y coordinate of the left front corner of a wipe tower" -msgstr "Y координата лівого переднього кута вичищуючої вежі" - -#: src/libslic3r/PrintConfig.cpp:2469 -msgid "Width of a wipe tower" -msgstr "Ширина вичищуючої вежі" - -#: src/libslic3r/PrintConfig.cpp:2475 -msgid "Wipe tower rotation angle" -msgstr "Кут повороту вежі витираннÑ" - -#: src/libslic3r/PrintConfig.cpp:2476 -msgid "Wipe tower rotation angle with respect to x-axis." -msgstr "Кут повороту вежі Ð²Ð¸Ñ‚Ð¸Ñ€Ð°Ð½Ð½Ñ Ð·Ð° віÑÑÑŽ Ð¥." - -#: src/libslic3r/PrintConfig.cpp:2483 -msgid "Wipe into this object's infill" -msgstr "Витирати до Ð½Ð°Ð¿Ð¾Ð²Ð½ÐµÐ½Ð½Ñ Ñ†ÑŒÐ¾Ð³Ð¾ об'єкту" - -#: src/libslic3r/PrintConfig.cpp:2484 -msgid "" -"Purging after toolchange will done inside this object's infills. This lowers " -"the amount of waste but may result in longer print time due to additional " -"travel moves." -msgstr "" -"ÐžÑ‡Ð¸Ñ‰ÐµÐ½Ð½Ñ Ð¿Ñ–ÑÐ»Ñ Ð·Ð°Ð¼Ñ–Ð½Ð¸ інÑтрументу виконуєтьÑÑ Ð²Ñередині заповнювачів цього " -"об’єкта. Це зменшує кількіÑÑ‚ÑŒ відходів, але може призвеÑти до Ð·Ð±Ñ–Ð»ÑŒÑˆÐµÐ½Ð½Ñ " -"чаÑу друку через додаткові переміщеннÑ." - -#: src/libslic3r/PrintConfig.cpp:2491 -msgid "Wipe into this object" -msgstr "Витирати до цього об'єкту" - -#: src/libslic3r/PrintConfig.cpp:2492 -msgid "" -"Object will be used to purge the nozzle after a toolchange to save material " -"that would otherwise end up in the wipe tower and decrease print time. " -"Colours of the objects will be mixed as a result." -======= #: ../src/richtext/richtextbackgroundpage.cpp:242 #: ../src/richtext/richtextbackgroundpage.cpp:244 #, fuzzy @@ -33674,31 +22079,8 @@ msgstr "" #. TRANSLATORS: Keyword of system colour #: ../src/propgrid/advprops.cpp:892 msgid "TooltipText" ->>>>>>> master msgstr "" -"Об'єкт буде викориÑтаний Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð´ÑƒÐ²ÐºÐ¸ Ñопла піÑÐ»Ñ Ð·Ð°Ð¼Ñ–Ð½Ð¸ інÑтрументу, щоб " -"заощадити матеріал, Ñкий інакше потрапив би до вежі витираннÑ, Ñ– зменшити " -"Ñ‡Ð°Ñ Ð´Ñ€ÑƒÐºÑƒ. Ð’ результаті кольори предметів будуть змішані." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2498 -msgid "Maximal bridging distance" -msgstr "МакÑимальна моÑтова відÑтань" - -#: src/libslic3r/PrintConfig.cpp:2499 -msgid "Maximal distance between supports on sparse infill sections." -msgstr "МакÑимальна відÑтань між підтримками на рідкіÑних ділÑнках заповненнÑ." - -#: src/libslic3r/PrintConfig.cpp:2505 -msgid "XY Size Compensation" -msgstr "Ð—Ñ€Ñ–Ð²Ð½Ð¾Ð²Ð°Ð¶ÐµÐ½Ð½Ñ Ñ€Ð¾Ð·Ð¼Ñ–Ñ€Ñƒ за XY" - -#: src/libslic3r/PrintConfig.cpp:2507 -msgid "" -"The object will be grown/shrunk in the XY plane by the configured value " -"(negative = inwards, positive = outwards). This might be useful for fine-" -"tuning hole sizes." -======= #: ../src/generic/prntdlgg.cpp:881 msgid "Top margin (mm):" msgstr "Ð’ÐµÑ€Ñ…Ð½Ñ Ð¼ÐµÐ¶Ð° (мм):" @@ -33719,17 +22101,9 @@ msgstr "Так" #: ../src/common/fs_mem.cpp:227 #, c-format msgid "Trying to remove file '%s' from memory VFS, but it is not loaded!" ->>>>>>> master msgstr "" "Спроба Ð²Ð¸Ð»ÑƒÑ‡ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ð° «%s» зі ÑпиÑку пам'ÑÑ‚Ñ– VFS, але його не завантажено!" -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2515 -msgid "Z offset" -msgstr "Ð—Ð¼Ñ–Ñ‰ÐµÐ½Ð½Ñ Z" - -#: src/libslic3r/PrintConfig.cpp:2516 -======= #: ../src/common/fmapbase.cpp:156 msgid "Turkish (ISO-8859-9)" msgstr "Turkish (ISO-8859-9)" @@ -33760,7 +22134,6 @@ msgstr "Тип має міÑтити Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ enum — long" #: ../src/propgrid/propgridiface.cpp:401 #, c-format ->>>>>>> master msgid "" "Type operation \"%s\" failed: Property labeled \"%s\" is of type \"%s\", NOT " "\"%s\"." @@ -33768,292 +22141,6 @@ msgstr "" "Помилка дії з типами «%s»: влаÑтивіÑÑ‚ÑŒ з міткою «%s» належить до типу «%s», " "а не «%s»." -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2583 -msgid "Display width" -msgstr "Ширина диÑплеÑ" - -#: src/libslic3r/PrintConfig.cpp:2584 -msgid "Width of the display" -msgstr "Ширина диÑплеÑ" - -#: src/libslic3r/PrintConfig.cpp:2589 -msgid "Display height" -msgstr "ВиÑота диÑплеÑ" - -#: src/libslic3r/PrintConfig.cpp:2590 -msgid "Height of the display" -msgstr "ВиÑота диÑплею" - -#: src/libslic3r/PrintConfig.cpp:2595 -msgid "Number of pixels in" -msgstr "КількіÑÑ‚ÑŒ пікÑелів за віÑÑÑŽ" - -#: src/libslic3r/PrintConfig.cpp:2597 -msgid "Number of pixels in X" -msgstr "КількіÑÑ‚ÑŒ пікÑелів за віÑÑÑŽ X" - -#: src/libslic3r/PrintConfig.cpp:2603 -msgid "Number of pixels in Y" -msgstr "КількіÑÑ‚ÑŒ пікÑелів за віÑÑÑŽ Y" - -#: src/libslic3r/PrintConfig.cpp:2608 -msgid "Display horizontal mirroring" -msgstr "Горизонтальне Ð²Ñ–Ð´Ð´Ð·ÐµÑ€ÐºÐ°Ð»ÐµÐ½Ð½Ñ Ð´Ð¸ÑплеÑ" - -#: src/libslic3r/PrintConfig.cpp:2609 -msgid "Mirror horizontally" -msgstr "Віддзеркалити горизонтально" - -#: src/libslic3r/PrintConfig.cpp:2610 -msgid "Enable horizontal mirroring of output images" -msgstr "Увімкнути горизонтальне Ð²Ñ–Ð´Ð´Ð·ÐµÑ€ÐºÐ°Ð»ÐµÐ½Ð½Ñ Ð²Ð¸Ñ…Ñ–Ð´Ð½Ð¸Ñ… зображень" - -#: src/libslic3r/PrintConfig.cpp:2615 -msgid "Display vertical mirroring" -msgstr "Вертикальне Ð²Ñ–Ð´Ð´Ð·ÐµÑ€ÐºÐ°Ð»ÐµÐ½Ð½Ñ Ð´Ð¸ÑплеÑ" - -#: src/libslic3r/PrintConfig.cpp:2616 -msgid "Mirror vertically" -msgstr "Віддзеркалити вертикально" - -#: src/libslic3r/PrintConfig.cpp:2617 -msgid "Enable vertical mirroring of output images" -msgstr "Увімкнути вертикальне Ð²Ñ–Ð´Ð´Ð·ÐµÑ€ÐºÐ°Ð»ÐµÐ½Ð½Ñ Ð²Ð¸Ñ…Ñ–Ð´Ð½Ð¸Ñ… зображень" - -#: src/libslic3r/PrintConfig.cpp:2622 -msgid "Display orientation" -msgstr "ÐžÑ€Ñ–Ñ”Ð½Ñ‚Ð°Ñ†Ñ–Ñ Ð´Ð¸ÑплеÑ" - -#: src/libslic3r/PrintConfig.cpp:2623 -msgid "" -"Set the actual LCD display orientation inside the SLA printer. Portrait mode " -"will flip the meaning of display width and height parameters and the output " -"images will be rotated by 90 degrees." -msgstr "" -"Ð’Ñтановіть фактичну орієнтацію LCD-диÑÐ¿Ð»ÐµÑ Ð²Ñередині SLA принтера. " -"Портретний режим переверне Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ–Ð² ширини та виÑоти диÑплеÑ, а " -"вихідні Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ Ð¿Ð¾Ð²ÐµÑ€Ð½ÑƒÑ‚ÑŒ на 90 градуÑів." - -#: src/libslic3r/PrintConfig.cpp:2629 -msgid "Landscape" -msgstr "Ðльбомна" - -#: src/libslic3r/PrintConfig.cpp:2630 -msgid "Portrait" -msgstr "Книжкова" - -#: src/libslic3r/PrintConfig.cpp:2635 -msgid "Fast" -msgstr "Швидкий" - -#: src/libslic3r/PrintConfig.cpp:2636 -msgid "Fast tilt" -msgstr "Швидкий нахил" - -#: src/libslic3r/PrintConfig.cpp:2637 -msgid "Time of the fast tilt" -msgstr "Ð§Ð°Ñ ÑˆÐ²Ð¸Ð´ÐºÐ¾Ð³Ð¾ нахилу" - -#: src/libslic3r/PrintConfig.cpp:2644 -msgid "Slow" -msgstr "Повільний" - -#: src/libslic3r/PrintConfig.cpp:2645 -msgid "Slow tilt" -msgstr "Повільний нахил" - -#: src/libslic3r/PrintConfig.cpp:2646 -msgid "Time of the slow tilt" -msgstr "Ð§Ð°Ñ Ð¿Ð¾Ð²Ñ–Ð»ÑŒÐ½Ð¾Ð³Ð¾ нахилу" - -#: src/libslic3r/PrintConfig.cpp:2653 -msgid "Area fill" -msgstr "Заповнена облаÑÑ‚ÑŒ" - -#: src/libslic3r/PrintConfig.cpp:2654 -msgid "" -"The percentage of the bed area. \n" -"If the print area exceeds the specified value, \n" -"then a slow tilt will be used, otherwise - a fast tilt" -msgstr "" -"ВідÑоток площі Ñтолу.\n" -"Якщо облаÑÑ‚ÑŒ друку перевищує вказане значеннÑ,\n" -"тоді буде викориÑтовуватиÑÑ Ð¿Ð¾Ð²Ñ–Ð»ÑŒÐ½Ð¸Ð¹ нахил, інакше - швидкий нахил" - -#: src/libslic3r/PrintConfig.cpp:2661 src/libslic3r/PrintConfig.cpp:2662 -#: src/libslic3r/PrintConfig.cpp:2663 -msgid "Printer scaling correction" -msgstr "ÐšÐ¾Ñ€ÐµÐºÑ†Ñ–Ñ Ð¼Ð°ÑÑˆÑ‚Ð°Ð±ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ñ€Ð¸Ð½Ñ‚ÐµÑ€Ð°" - -#: src/libslic3r/PrintConfig.cpp:2669 src/libslic3r/PrintConfig.cpp:2670 -msgid "Printer absolute correction" -msgstr "ÐбÑолютна ÐºÐ¾Ñ€ÐµÐºÑ†Ñ–Ñ Ð¿Ñ€Ð¸Ð½Ñ‚ÐµÑ€Ð°" - -#: src/libslic3r/PrintConfig.cpp:2671 -msgid "" -"Will inflate or deflate the sliced 2D polygons according to the sign of the " -"correction." -msgstr "Ðадує або ÑпуÑтить нарізані 2D-полігони відповідно до знака корекції." - -#: src/libslic3r/PrintConfig.cpp:2677 -msgid "Elephant foot minimum width" -msgstr "Мінімальна ширина Ñлонової Ñтопи" - -#: src/libslic3r/PrintConfig.cpp:2679 -msgid "" -"Minimum width of features to maintain when doing elephant foot compensation." -msgstr "" -"Мінімальна ширина чаÑтей, Ñку Ñлід підтримувати, виконуючи компенÑацію Ñтопи " -"Ñлона." - -#: src/libslic3r/PrintConfig.cpp:2686 src/libslic3r/PrintConfig.cpp:2687 -msgid "Printer gamma correction" -msgstr "Гамма - ÐºÐ¾Ñ€ÐµÐºÑ†Ñ–Ñ Ð¿Ñ€Ð¸Ð½Ñ‚ÐµÑ€Ð°" - -#: src/libslic3r/PrintConfig.cpp:2688 -msgid "" -"This will apply a gamma correction to the rasterized 2D polygons. A gamma " -"value of zero means thresholding with the threshold in the middle. This " -"behaviour eliminates antialiasing without losing holes in polygons." -msgstr "" -"Це заÑтоÑує гамма-корекцію до раÑтеризованих 2D-полігонів. Ðульове Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ " -"гамми означає порогове Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð· порогом поÑередині. Така поведінка уÑуває " -"згладжуваннÑ, не втрачаючи дірок у полігонах." - -#: src/libslic3r/PrintConfig.cpp:2700 src/libslic3r/PrintConfig.cpp:2701 -msgid "SLA material type" -msgstr "Тип SLA-матеріалу" - -#: src/libslic3r/PrintConfig.cpp:2712 src/libslic3r/PrintConfig.cpp:2713 -msgid "Initial layer height" -msgstr "ВиÑота першого шару" - -#: src/libslic3r/PrintConfig.cpp:2719 src/libslic3r/PrintConfig.cpp:2720 -msgid "Bottle volume" -msgstr "Об’єм плÑшки" - -#: src/libslic3r/PrintConfig.cpp:2721 -msgid "ml" -msgstr "мл" - -#: src/libslic3r/PrintConfig.cpp:2726 src/libslic3r/PrintConfig.cpp:2727 -msgid "Bottle weight" -msgstr "Вага плÑшки" - -#: src/libslic3r/PrintConfig.cpp:2728 -msgid "kg" -msgstr "кг" - -#: src/libslic3r/PrintConfig.cpp:2735 -msgid "g/ml" -msgstr "г/мл" - -#: src/libslic3r/PrintConfig.cpp:2742 -msgid "money/bottle" -msgstr "грошових одиниць/плÑшку" - -#: src/libslic3r/PrintConfig.cpp:2747 -msgid "Faded layers" -msgstr "Шари початкового контакту" - -#: src/libslic3r/PrintConfig.cpp:2748 -msgid "" -"Number of the layers needed for the exposure time fade from initial exposure " -"time to the exposure time" -msgstr "" -"КількіÑÑ‚ÑŒ шарів, необхідних Ð´Ð»Ñ Ñ‡Ð°Ñу екÑпозиції, зменшуєтьÑÑ Ð²Ñ–Ð´ початкового " -"чаÑу екÑпозиції до чаÑу екÑпозиції" - -#: src/libslic3r/PrintConfig.cpp:2755 src/libslic3r/PrintConfig.cpp:2756 -msgid "Minimum exposure time" -msgstr "Мінімальний Ñ‡Ð°Ñ ÐµÐºÑпозиції" - -#: src/libslic3r/PrintConfig.cpp:2763 src/libslic3r/PrintConfig.cpp:2764 -msgid "Maximum exposure time" -msgstr "МакÑимальний Ñ‡Ð°Ñ ÐµÐºÑпозиції" - -#: src/libslic3r/PrintConfig.cpp:2771 src/libslic3r/PrintConfig.cpp:2772 -msgid "Exposure time" -msgstr "Ð§Ð°Ñ ÐµÐºÑпозиції" - -#: src/libslic3r/PrintConfig.cpp:2778 src/libslic3r/PrintConfig.cpp:2779 -msgid "Minimum initial exposure time" -msgstr "Мінімальний Ñ‡Ð°Ñ Ð¿Ð¾Ñ‡Ð°Ñ‚ÐºÐ¾Ð²Ð¾Ñ— екÑпозиції" - -#: src/libslic3r/PrintConfig.cpp:2786 src/libslic3r/PrintConfig.cpp:2787 -msgid "Maximum initial exposure time" -msgstr "МакÑимальний Ñ‡Ð°Ñ Ð¿Ð¾Ñ‡Ð°Ñ‚ÐºÐ¾Ð²Ð¾Ñ— екÑпозиції" - -#: src/libslic3r/PrintConfig.cpp:2794 src/libslic3r/PrintConfig.cpp:2795 -msgid "Initial exposure time" -msgstr "Ð§Ð°Ñ Ð¿Ð¾Ñ‡Ð°Ñ‚ÐºÐ¾Ð²Ð¾Ñ— екÑпозиції" - -#: src/libslic3r/PrintConfig.cpp:2801 src/libslic3r/PrintConfig.cpp:2802 -msgid "Correction for expansion" -msgstr "Поправка на розширеннÑ" - -#: src/libslic3r/PrintConfig.cpp:2808 -msgid "SLA print material notes" -msgstr "Примітки до друкованих SLA-матеріалів" - -#: src/libslic3r/PrintConfig.cpp:2809 -msgid "You can put your notes regarding the SLA print material here." -msgstr "Тут ви можете поміÑтити Ñвої нотатки щодо SLA-матеріалу." - -#: src/libslic3r/PrintConfig.cpp:2821 src/libslic3r/PrintConfig.cpp:2832 -msgid "Default SLA material profile" -msgstr "Профіль SLA-матеріалу за замовчаннÑм" - -#: src/libslic3r/PrintConfig.cpp:2843 -msgid "Generate supports" -msgstr "Генерувати підтримки" - -#: src/libslic3r/PrintConfig.cpp:2845 -msgid "Generate supports for the models" -msgstr "Генерувати підтримки Ð´Ð»Ñ Ð¼Ð¾Ð´ÐµÐ»ÐµÐ¹" - -#: src/libslic3r/PrintConfig.cpp:2850 -msgid "Pinhead front diameter" -msgstr "Діаметр головки Ñтовпа" - -#: src/libslic3r/PrintConfig.cpp:2852 -msgid "Diameter of the pointing side of the head" -msgstr "Діаметр ноÑику головки" - -#: src/libslic3r/PrintConfig.cpp:2859 -msgid "Head penetration" -msgstr "ÐŸÑ€Ð¾Ð½Ð¸ÐºÐ½ÐµÐ½Ð½Ñ Ð³Ð¾Ð»Ð¾Ð²ÐºÐ¸" - -#: src/libslic3r/PrintConfig.cpp:2861 -msgid "How much the pinhead has to penetrate the model surface" -msgstr "Ðа Ñкільки ноÑики повинні проникати в поверхню моделі" - -#: src/libslic3r/PrintConfig.cpp:2868 -msgid "Pinhead width" -msgstr "Ширина головки Ñтовпа" - -#: src/libslic3r/PrintConfig.cpp:2870 -msgid "Width from the back sphere center to the front sphere center" -msgstr "Ширина від центру задньої кулі до передньої кулі" - -#: src/libslic3r/PrintConfig.cpp:2878 -msgid "Pillar diameter" -msgstr "Діаметр Ñтовпів" - -#: src/libslic3r/PrintConfig.cpp:2880 -msgid "Diameter in mm of the support pillars" -msgstr "Діаметр Ñтовпів підтримки у мм" - -#: src/libslic3r/PrintConfig.cpp:2888 -msgid "Small pillar diameter percent" -msgstr "Процентний діаметр малих Ñтовпів" - -#: src/libslic3r/PrintConfig.cpp:2890 -msgid "" -"The percentage of smaller pillars compared to the normal pillar diameter " -"which are used in problematic areas where a normal pilla cannot fit." -======= #: ../src/common/paper.cpp:133 msgid "US Std Fanfold, 14 7/8 x 11 in" msgstr "US Std Fanfold, 14 7/8 x 11 дюйм" @@ -34575,56 +22662,8 @@ msgstr "ПопередженнÑ: " #. TRANSLATORS: System cursor name #: ../src/propgrid/advprops.cpp:1778 msgid "Watch" ->>>>>>> master msgstr "" -"ВідÑоток менших Ñтовпів порівнÑно з нормальним діаметром Ñтовпа, Ñкі " -"викориÑтовуютьÑÑ Ð² проблемних зонах, де нормальний Ñтовп не може поміÑтитиÑÑ." -#: src/libslic3r/PrintConfig.cpp:2899 -msgid "Max bridges on a pillar" -msgstr "МакÑ. моÑтів на Ñтовпі" - -<<<<<<< HEAD -#: src/libslic3r/PrintConfig.cpp:2901 -msgid "" -"Maximum number of bridges that can be placed on a pillar. Bridges hold " -"support point pinheads and connect to pillars as small branches." -msgstr "" -"МакÑимальна кількіÑÑ‚ÑŒ моÑтів, Ñкі можна розміÑтити на тримаючому Ñтовпі. " -"МоÑти утримують верхівки опор Ñ– з'єднуютьÑÑ Ð·Ñ– Ñтовпами Ñк гілочки." - -#: src/libslic3r/PrintConfig.cpp:2909 -msgid "Pillar connection mode" -msgstr "Режим з'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ñтовпів" - -#: src/libslic3r/PrintConfig.cpp:2910 -msgid "" -"Controls the bridge type between two neighboring pillars. Can be zig-zag, " -"cross (double zig-zag) or dynamic which will automatically switch between " -"the first two depending on the distance of the two pillars." -msgstr "" -"Керує типом моÑту між двома ÑуÑідніми Ñтовпами. Може бути зигзагоподібним, " -"поперечним (подвійний зигзагоподібний) або динамічним, Ñкий автоматично " -"перемикаєтьÑÑ Ð¼Ñ–Ð¶ першими двома залежно від відÑтані двох Ñтовпів." - -#: src/libslic3r/PrintConfig.cpp:2918 -msgid "Zig-Zag" -msgstr "Зіг-Заг" - -#: src/libslic3r/PrintConfig.cpp:2919 -msgid "Cross" -msgstr "ПерехреÑний" - -#: src/libslic3r/PrintConfig.cpp:2920 -msgid "Dynamic" -msgstr "Динамічний" - -#: src/libslic3r/PrintConfig.cpp:2932 -msgid "Pillar widening factor" -msgstr "Коефіцієнт Ñ€Ð¾Ð·ÑˆÐ¸Ñ€ÐµÐ½Ð½Ñ Ñтовпа" - -#: src/libslic3r/PrintConfig.cpp:2934 -======= #. TRANSLATORS: Label of font weight #: ../src/propgrid/advprops.cpp:685 msgid "Weight" @@ -34933,1114 +22972,11 @@ msgid "an internal error has occurred in the DDEML." msgstr "Ð²Ð½ÑƒÑ‚Ñ€Ñ–ÑˆÐ½Ñ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° у DDEML." #: ../src/msw/dde.cpp:1171 ->>>>>>> master msgid "" "an invalid transaction identifier was passed to a DDEML function.\n" "Once the application has returned from an XTYP_XACT_COMPLETE callback,\n" "the transaction identifier for that callback is no longer valid." msgstr "" -<<<<<<< HEAD -"Ð—Ð»Ð¸Ñ‚Ñ‚Ñ Ð¼Ð¾Ñтів або Ñтовпів в інші Ñтовпи може збільшити радіуÑ. Ðуль означає " -"відÑутніÑÑ‚ÑŒ збільшеннÑ, один означає повне збільшеннÑ." - -#: src/libslic3r/PrintConfig.cpp:2943 -msgid "Support base diameter" -msgstr "Діаметр оÑнови підтримки" - -#: src/libslic3r/PrintConfig.cpp:2945 -msgid "Diameter in mm of the pillar base" -msgstr "Діаметр оÑнови Ñтовпа у мм" - -#: src/libslic3r/PrintConfig.cpp:2953 -msgid "Support base height" -msgstr "ВиÑота оÑнови підтримки" - -#: src/libslic3r/PrintConfig.cpp:2955 -msgid "The height of the pillar base cone" -msgstr "ВиÑота конуÑа оÑнови Ñтовпа" - -#: src/libslic3r/PrintConfig.cpp:2962 -msgid "Support base safety distance" -msgstr "Безпечна відÑтань між оÑновами підтримки" - -#: src/libslic3r/PrintConfig.cpp:2965 -msgid "" -"The minimum distance of the pillar base from the model in mm. Makes sense in " -"zero elevation mode where a gap according to this parameter is inserted " -"between the model and the pad." -msgstr "" -"Мінімальна відÑтань оÑнови Ñтовпа від моделі в мм. Має ÑÐµÐ½Ñ Ñƒ режимі " -"нульового піднÑÑ‚Ñ‚Ñ, коли між моделлю та майданчиком вÑтавлÑєтьÑÑ Ð·Ð°Ð·Ð¾Ñ€ " -"відповідно до цього параметра." - -#: src/libslic3r/PrintConfig.cpp:2975 -msgid "Critical angle" -msgstr "Критичний кут" - -#: src/libslic3r/PrintConfig.cpp:2977 -msgid "The default angle for connecting support sticks and junctions." -msgstr "Кут за замовчуваннÑм Ð´Ð»Ñ Ð·'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð¾Ð¿Ð¾Ñ€Ð½Ð¸Ñ… палочок Ñ– з'єднань." - -#: src/libslic3r/PrintConfig.cpp:2985 -msgid "Max bridge length" -msgstr "МакÑимальна довжина моÑту" - -#: src/libslic3r/PrintConfig.cpp:2987 -msgid "The max length of a bridge" -msgstr "МакÑимальна довжина моÑту" - -#: src/libslic3r/PrintConfig.cpp:2994 -msgid "Max pillar linking distance" -msgstr "МакÑ. відÑтань між Ñтовпами" - -#: src/libslic3r/PrintConfig.cpp:2996 -msgid "" -"The max distance of two pillars to get linked with each other. A zero value " -"will prohibit pillar cascading." -msgstr "" -"МакÑимальна відÑтань двох Ñтовпів Ð´Ð»Ñ Ð·'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð¼Ñ–Ð¶ Ñобою. Ðульове Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ " -"заборонÑÑ” каÑÐºÐ°Ð´ÑƒÐ²Ð°Ð½Ð½Ñ Ñтовпів." - -#: src/libslic3r/PrintConfig.cpp:3006 -msgid "" -"How much the supports should lift up the supported object. If \"Pad around " -"object\" is enabled, this value is ignored." -msgstr "" -"Скільки опор повинно піднімати підтримуваний об’єкт. Якщо ввімкнено функцію " -"\"Подушка навколо об’єкта\", це Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ñ–Ð³Ð½Ð¾Ñ€ÑƒÑ”Ñ‚ÑŒÑÑ." - -#: src/libslic3r/PrintConfig.cpp:3017 -msgid "This is a relative measure of support points density." -msgstr "ВідноÑний показних щільноÑÑ‚Ñ– точок підтримки." - -#: src/libslic3r/PrintConfig.cpp:3023 -msgid "Minimal distance of the support points" -msgstr "Мінімальна відÑтань опорних точок" - -#: src/libslic3r/PrintConfig.cpp:3025 -msgid "No support points will be placed closer than this threshold." -msgstr "Жодні точки підтримки не будуть розміщені ближче цього порогу." - -#: src/libslic3r/PrintConfig.cpp:3031 -msgid "Use pad" -msgstr "ВикориÑтовувати полушку" - -#: src/libslic3r/PrintConfig.cpp:3033 -msgid "Add a pad underneath the supported model" -msgstr "Додати подушечку під підтримувану модель" - -#: src/libslic3r/PrintConfig.cpp:3038 -msgid "Pad wall thickness" -msgstr "Товщина Ñтінки подушки" - -#: src/libslic3r/PrintConfig.cpp:3040 -msgid "The thickness of the pad and its optional cavity walls." -msgstr "Товщина подушки та Ñ—Ñ— додаткових Ñтінок порожнини." - -#: src/libslic3r/PrintConfig.cpp:3048 -msgid "Pad wall height" -msgstr "ВиÑота Ñтінки подушки" - -#: src/libslic3r/PrintConfig.cpp:3049 -msgid "" -"Defines the pad cavity depth. Set to zero to disable the cavity. Be careful " -"when enabling this feature, as some resins may produce an extreme suction " -"effect inside the cavity, which makes peeling the print off the vat foil " -"difficult." -msgstr "" -"Визначає глибину порожнини подушечки. Ð’Ñтановіть нуль, щоб вимкнути " -"порожнину. Будьте обережні, включаючи цю функцію, оÑкільки деÑкі Ñмоли " -"можуть мати надзвичайний ефект вÑÐ¼Ð¾ÐºÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð²Ñередині порожнини, що " -"уÑкладнює Ð²Ñ–Ð´ÑˆÐ°Ñ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð²Ñ–Ð´Ð±Ð¸Ñ‚ÐºÐ° з фольги." - -#: src/libslic3r/PrintConfig.cpp:3062 -msgid "Pad brim size" -msgstr "Розмір краю подушки" - -#: src/libslic3r/PrintConfig.cpp:3063 -msgid "How far should the pad extend around the contained geometry" -msgstr "Як далеко повинна розширюватиÑÑ Ð¿Ð¾Ð´ÑƒÑˆÐºÐ° навколо вміщуваної геометрії" - -#: src/libslic3r/PrintConfig.cpp:3073 -msgid "Max merge distance" -msgstr "МакÑ. відÑтань об'єднаннÑ" - -#: src/libslic3r/PrintConfig.cpp:3075 -msgid "" -"Some objects can get along with a few smaller pads instead of a single big " -"one. This parameter defines how far the center of two smaller pads should " -"be. If theyare closer, they will get merged into one pad." -msgstr "" -"ДеÑкі предмети можуть уживатиÑÑ Ð· кількома меншими подушками заміÑÑ‚ÑŒ однієї " -"великої. Цей параметр визначає, наÑкільки далеко повинен бути центр двох " -"менших подушок. Якщо вони Ñтануть ближче, вони об’єднаютьÑÑ Ð² одну велику." - -#: src/libslic3r/PrintConfig.cpp:3095 -msgid "Pad wall slope" -msgstr "Ðахил Ñтінки подушки" - -#: src/libslic3r/PrintConfig.cpp:3097 -msgid "" -"The slope of the pad wall relative to the bed plane. 90 degrees means " -"straight walls." -msgstr "" -"Ðахил Ñтінки подушки відноÑно площини Ñтолу. 90 градуÑів означає прÑмі Ñтіни." - -#: src/libslic3r/PrintConfig.cpp:3108 -msgid "Create pad around object and ignore the support elevation" -msgstr "Створити подушку навколо об’єкта та ігнорувати піднÑÑ‚Ñ‚Ñ Ð¿Ñ–Ð´Ñ‚Ñ€Ð¸Ð¼ÐºÐ¸" - -#: src/libslic3r/PrintConfig.cpp:3113 -msgid "Pad around object everywhere" -msgstr "Подушка Ñкрізь навколо об’єкта" - -#: src/libslic3r/PrintConfig.cpp:3115 -msgid "Force pad around object everywhere" -msgstr "Створити подушку навколо об’єкта" - -#: src/libslic3r/PrintConfig.cpp:3120 -msgid "Pad object gap" -msgstr "Розрив Подушка-Об'єкт" - -#: src/libslic3r/PrintConfig.cpp:3122 -msgid "" -"The gap between the object bottom and the generated pad in zero elevation " -"mode." -msgstr "" -"Розрив між дном об’єкта та генерованою подушкою в режимі нульового піднÑÑ‚Ñ‚Ñ." - -#: src/libslic3r/PrintConfig.cpp:3131 -msgid "Pad object connector stride" -msgstr "Крок з'єднувача Подушка-Об'єкт" - -#: src/libslic3r/PrintConfig.cpp:3133 -msgid "" -"Distance between two connector sticks which connect the object and the " -"generated pad." -msgstr "" -"ВідÑтань між двома з'єднувальними паличками, Ñкі з'єднують об'єкт та " -"генеровану подушку." - -#: src/libslic3r/PrintConfig.cpp:3140 -msgid "Pad object connector width" -msgstr "Ширина з'єднувача Подушка-Об'єкт" - -#: src/libslic3r/PrintConfig.cpp:3142 -msgid "" -"Width of the connector sticks which connect the object and the generated pad." -msgstr "" -"Ширина з'єднувальної паличками, що з'єднує об'єкт та генеровану подушку." - -#: src/libslic3r/PrintConfig.cpp:3149 -msgid "Pad object connector penetration" -msgstr "Глибина Ð¿Ñ€Ð¾Ð½Ð¸ÐºÐ½ÐµÐ½Ð½Ñ Ð·'єднувача Подушка-Об'єкт" - -#: src/libslic3r/PrintConfig.cpp:3152 -msgid "How much should the tiny connectors penetrate into the model body." -msgstr "Ðа Ñкільки крихітні з'єднувачі повинні проникати в тіло моделі." - -#: src/libslic3r/PrintConfig.cpp:3159 -msgid "Enable hollowing" -msgstr "Увімкнути Ñ„Ð¾Ñ€Ð¼ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ð¾Ñ€Ð¾Ð¶Ð½Ð¸Ð½" - -#: src/libslic3r/PrintConfig.cpp:3161 -msgid "Hollow out a model to have an empty interior" -msgstr "Випорожнити модель, щоб мати порожній інтер’єр" - -#: src/libslic3r/PrintConfig.cpp:3166 -msgid "Wall thickness" -msgstr "Товщина Ñтінки" - -#: src/libslic3r/PrintConfig.cpp:3168 -msgid "Minimum wall thickness of a hollowed model." -msgstr "Мінімальна товщина Ñтінки порожниÑтої моделі." - -#: src/libslic3r/PrintConfig.cpp:3176 -msgid "Accuracy" -msgstr "ТочніÑÑ‚ÑŒ" - -#: src/libslic3r/PrintConfig.cpp:3178 -msgid "" -"Performance vs accuracy of calculation. Lower values may produce unwanted " -"artifacts." -msgstr "" -"ПродуктивніÑÑ‚ÑŒ проти точноÑÑ‚Ñ– розрахунку. Менші Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð¼Ð¾Ð¶ÑƒÑ‚ÑŒ Ñпричинити " -"небажані артефакти." - -#: src/libslic3r/PrintConfig.cpp:3188 -msgid "" -"Hollowing is done in two steps: first, an imaginary interior is calculated " -"deeper (offset plus the closing distance) in the object and then it's " -"inflated back to the specified offset. A greater closing distance makes the " -"interior more rounded. At zero, the interior will resemble the exterior the " -"most." -msgstr "" -"Ð’Ð¸Ð¿Ð¾Ñ€Ð¾Ð¶Ð½ÐµÐ½Ð½Ñ Ð²Ð¸ÐºÐ¾Ð½ÑƒÑ”Ñ‚ÑŒÑÑ Ñƒ два етапи: Ñпочатку уÑвний інтер’єр обчиÑлюєтьÑÑ " -"глибше (Ð·Ð¼Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð¿Ð»ÑŽÑ Ð²Ñ–Ð´Ñтань закриттÑ) в об’єкті, а потім він завищуєтьÑÑ " -"назад до заданого зміщеннÑ. Більша відÑтань до Ð·Ð°ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ñ€Ð¾Ð±Ð¸Ñ‚ÑŒ інтер’єр " -"більш округлим. При нулі інтер’єр найбільше буде нагадувати екÑтер’єр." - -#: src/libslic3r/PrintConfig.cpp:3606 -msgid "Export OBJ" -msgstr "ЕкÑпорт OBJ" - -#: src/libslic3r/PrintConfig.cpp:3607 -msgid "Export the model(s) as OBJ." -msgstr "ЕкÑпорт моделі Ñк OBJ." - -#: src/libslic3r/PrintConfig.cpp:3618 -msgid "Export SLA" -msgstr "ЕкÑпорт SLA" - -#: src/libslic3r/PrintConfig.cpp:3619 -msgid "Slice the model and export SLA printing layers as PNG." -msgstr "Ðарізати модель та екÑпортувати шари SLA-друку до PNG." - -#: src/libslic3r/PrintConfig.cpp:3624 -msgid "Export 3MF" -msgstr "ЕкÑпортувати 3MF" - -#: src/libslic3r/PrintConfig.cpp:3625 -msgid "Export the model(s) as 3MF." -msgstr "ЕкÑпорт моделі Ñк 3MF." - -#: src/libslic3r/PrintConfig.cpp:3629 -msgid "Export AMF" -msgstr "ЕкÑпортувати AMF" - -#: src/libslic3r/PrintConfig.cpp:3630 -msgid "Export the model(s) as AMF." -msgstr "ЕкÑпорт моделі Ñк ÐMF." - -#: src/libslic3r/PrintConfig.cpp:3634 -msgid "Export STL" -msgstr "ЕкÑпорт STL" - -#: src/libslic3r/PrintConfig.cpp:3635 -msgid "Export the model(s) as STL." -msgstr "ЕкÑпорт моделі Ñк STL." - -#: src/libslic3r/PrintConfig.cpp:3640 -msgid "Slice the model and export toolpaths as G-code." -msgstr "Ðарізати та екÑпортувати G-код." - -#: src/libslic3r/PrintConfig.cpp:3645 -msgid "G-code viewer" -msgstr "ПереглÑдач G-коду" - -#: src/libslic3r/PrintConfig.cpp:3646 -msgid "Visualize an already sliced and saved G-code" -msgstr "Візуалізувати вже нарізаний та збережений G-код" - -#: src/libslic3r/PrintConfig.cpp:3651 -msgid "Slice" -msgstr "Ðарізати" - -#: src/libslic3r/PrintConfig.cpp:3652 -msgid "" -"Slice the model as FFF or SLA based on the printer_technology configuration " -"value." -msgstr "" -"Ðарізати модель Ñк FFF або SLA на оÑнові Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ printer_technology, " -"зазначеного у конфігурації." - -#: src/libslic3r/PrintConfig.cpp:3657 -msgid "Help" -msgstr "Допомога" - -#: src/libslic3r/PrintConfig.cpp:3658 -msgid "Show this help." -msgstr "Показати цю підказку." - -#: src/libslic3r/PrintConfig.cpp:3663 -msgid "Help (FFF options)" -msgstr "Допомога (FFF параметри)" - -#: src/libslic3r/PrintConfig.cpp:3664 -msgid "Show the full list of print/G-code configuration options." -msgstr "Показати повний ÑпиÑок параметрів конфігурації друку / G-коду." - -#: src/libslic3r/PrintConfig.cpp:3668 -msgid "Help (SLA options)" -msgstr "Допомога (SLA параметри)" - -#: src/libslic3r/PrintConfig.cpp:3669 -msgid "Show the full list of SLA print configuration options." -msgstr "Показати повний перелік параметрів конфігурації SLA-друку." - -#: src/libslic3r/PrintConfig.cpp:3673 -msgid "Output Model Info" -msgstr "Ð†Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ Ð¿Ñ€Ð¾ вихідну модель" - -#: src/libslic3r/PrintConfig.cpp:3674 -msgid "Write information about the model to the console." -msgstr "ПиÑати інформацію про модель на конÑолі." - -#: src/libslic3r/PrintConfig.cpp:3678 -msgid "Save config file" -msgstr "Зберегти файл конфігурації" - -#: src/libslic3r/PrintConfig.cpp:3679 -msgid "Save configuration to the specified file." -msgstr "Зберегти конфігурацію у вказаному файлі." - -#: src/libslic3r/PrintConfig.cpp:3689 -msgid "Align XY" -msgstr "ВирівнÑти XY" - -#: src/libslic3r/PrintConfig.cpp:3690 -msgid "Align the model to the given point." -msgstr "ВирівнÑйте модель за заданою точкою." - -#: src/libslic3r/PrintConfig.cpp:3695 -msgid "Cut model at the given Z." -msgstr "Розрізати модель за заданим Z." - -#: src/libslic3r/PrintConfig.cpp:3716 -msgid "Center" -msgstr "Центр" - -#: src/libslic3r/PrintConfig.cpp:3717 -msgid "Center the print around the given center." -msgstr "Відцентруйте друк навколо заданого центру." - -#: src/libslic3r/PrintConfig.cpp:3721 -msgid "Don't arrange" -msgstr "Ðе впорÑдковувати" - -#: src/libslic3r/PrintConfig.cpp:3722 -msgid "" -"Do not rearrange the given models before merging and keep their original XY " -"coordinates." -msgstr "" -"Ðе переÑтавлÑйте дані моделі перед об’єднаннÑм та зберігайте Ñ—Ñ… початкові " -"координати XY." - -#: src/libslic3r/PrintConfig.cpp:3725 -msgid "Duplicate" -msgstr "Дублювати" - -#: src/libslic3r/PrintConfig.cpp:3726 -msgid "Multiply copies by this factor." -msgstr "Збільшить кількіÑÑ‚ÑŒ копій на цей коефіцієнт." - -#: src/libslic3r/PrintConfig.cpp:3730 -msgid "Duplicate by grid" -msgstr "Дублювати за Ñіткою" - -#: src/libslic3r/PrintConfig.cpp:3731 -msgid "Multiply copies by creating a grid." -msgstr "Збільшить кількіÑÑ‚ÑŒ копій, Ñтворивши Ñітку." - -#: src/libslic3r/PrintConfig.cpp:3735 -msgid "" -"Arrange the supplied models in a plate and merge them in a single model in " -"order to perform actions once." -msgstr "" -"Розташувати поÑтавлені моделі на платформі та об’єднати Ñ—Ñ… в одну модель, " -"щоб виконати дії один раз." - -#: src/libslic3r/PrintConfig.cpp:3740 -msgid "" -"Try to repair any non-manifold meshes (this option is implicitly added " -"whenever we need to slice the model to perform the requested action)." -msgstr "" -"Спробуйте відновити будь-Ñкі нерізноманітні Ñітки (Ñ†Ñ Ð¾Ð¿Ñ†Ñ–Ñ Ð½ÐµÑвно додаєтьÑÑ " -"кожного разу, коли нам потрібно нарізати модель Ð´Ð»Ñ Ð²Ð¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ Ð·Ð°Ð¿Ð¸Ñ‚ÑƒÐ²Ð°Ð½Ð¾Ñ— " -"дії)." - -#: src/libslic3r/PrintConfig.cpp:3744 -msgid "Rotation angle around the Z axis in degrees." -msgstr "Кут Ð¾Ð±ÐµÑ€Ñ‚Ð°Ð½Ð½Ñ Ð½Ð°Ð²ÐºÐ¾Ð»Ð¾ оÑÑ– Z у градуÑах." - -#: src/libslic3r/PrintConfig.cpp:3748 -msgid "Rotate around X" -msgstr "Обертати навколо оÑÑ– X" - -#: src/libslic3r/PrintConfig.cpp:3749 -msgid "Rotation angle around the X axis in degrees." -msgstr "Кут Ð¾Ð±ÐµÑ€Ñ‚Ð°Ð½Ð½Ñ Ð½Ð°Ð²ÐºÐ¾Ð»Ð¾ оÑÑ– Ð¥ у градуÑах." - -#: src/libslic3r/PrintConfig.cpp:3753 -msgid "Rotate around Y" -msgstr "Обертати навколо оÑÑ– Y" - -#: src/libslic3r/PrintConfig.cpp:3754 -msgid "Rotation angle around the Y axis in degrees." -msgstr "Кут Ð¾Ð±ÐµÑ€Ñ‚Ð°Ð½Ð½Ñ Ð½Ð°Ð²ÐºÐ¾Ð»Ð¾ оÑÑ– Y у градуÑах." - -#: src/libslic3r/PrintConfig.cpp:3759 -msgid "Scaling factor or percentage." -msgstr "Коефіцієнт маÑÑˆÑ‚Ð°Ð±ÑƒÐ²Ð°Ð½Ð½Ñ Ð°Ð±Ð¾ відÑоток." - -#: src/libslic3r/PrintConfig.cpp:3764 -msgid "" -"Detect unconnected parts in the given model(s) and split them into separate " -"objects." -msgstr "" -"Визначити непоєднані чаÑтини у даній моделі (моделÑÑ…) та розділити Ñ—Ñ… на " -"окремі об’єкти." - -#: src/libslic3r/PrintConfig.cpp:3767 -msgid "Scale to Fit" -msgstr "МаÑштабувати під облаÑÑ‚ÑŒ друку" - -#: src/libslic3r/PrintConfig.cpp:3768 -msgid "Scale to fit the given volume." -msgstr "МаÑштабувати під задану облаÑÑ‚ÑŒ друку." - -#: src/libslic3r/Zipper.cpp:27 -msgid "Error with zip archive" -msgstr "Помилка ZIP-архіву" - -#: src/libslic3r/PrintObject.cpp:112 -msgid "Processing triangulated mesh" -msgstr "Обробка триангульованої Ñітки" - -#: src/libslic3r/PrintObject.cpp:157 -msgid "Generating perimeters" -msgstr "Ð¡Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð¿ÐµÑ€Ð¸Ð¼ÐµÑ‚Ñ€Ñ–Ð²" - -#: src/libslic3r/PrintObject.cpp:260 -msgid "Preparing infill" -msgstr "Підготовка заповненнÑ" - -#: src/libslic3r/PrintObject.cpp:421 -msgid "Generating support material" -msgstr "Ð¡Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð¿Ñ–Ð´Ñ‚Ñ€Ð¸Ð¼Ð¾Ðº" - -#~ msgid "new unknown value %1% was changed to default value %2%" -#~ msgstr "" -#~ "нове невідоме Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ %1% було змінено на Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð·Ð° промовчаннÑм %2%" - -#~ msgid "" -#~ "Loading profiles found following incompatibilities:%1% To recover these " -#~ "files, incompatible values were changed to default values.\n" -#~ " But data in files won't be changed until you save them in PrusaSlicer." -#~ msgstr "" -#~ "Під Ñ‡Ð°Ñ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾Ñ„Ñ–Ð»Ñ–Ð² було знайдено наÑтупні неÑуміÑноÑÑ‚Ñ–:%1% Щоб " -#~ "відновити ці файли, неÑуміÑні Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð±ÑƒÐ»Ð¾ змінено на Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð·Ð° " -#~ "промовчаннÑм.\n" -#~ " Ðле дані у файлах не будуть змінені, поки ви не збережете Ñ—Ñ… у " -#~ "PrusaSlicer." - -#~ msgid "" -#~ "Loading %1% file found incompatibilities.\n" -#~ "To recover this file, incompatible values were changed to default values:" -#~ "%2%But data in files won't be changed until you save them in PrusaSlicer." -#~ msgstr "" -#~ "Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ %1% файла виÑвили неÑуміÑніÑÑ‚ÑŒ.\n" -#~ "Щоб відновити цей файл, неÑуміÑні Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð±ÑƒÐ»Ð¾ змінено на Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð·Ð° " -#~ "промовчаннÑм:%2% Ðле дані у файлах не змінюватимутьÑÑ, доки ви не " -#~ "збережете Ñ—Ñ… у PrusaSlicer." - -#~ msgid "Note that" -#~ msgstr "Зверніть увагу, що" - -#~ msgid "Ignore non-existent config files" -#~ msgstr "Ігнорувати неіÑнуючі конфігураційні файли" - -#~ msgid "Do not fail if a file supplied to --load does not exist." -#~ msgstr "Ðе відмовлÑти, Ñкщо файл, Ñкий подаєтьÑÑ Ð´Ð¾ --load, не Ñ–Ñнує." - -#~ msgid "" -#~ "Forward-compatibility rule when loading configurations from config files " -#~ "and project files (3MF, AMF)." -#~ msgstr "" -#~ "Правило прÑмої ÑуміÑноÑÑ‚Ñ– під Ñ‡Ð°Ñ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ ÐºÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ð¹ з файлів " -#~ "конфігурації та файлів проекту (3MF, AMF)." - -#~ msgid "" -#~ "This version of PrusaSlicer may not understand configurations produced by " -#~ "newest PrusaSlicer versions. For example, newer PrusaSlicer may extend " -#~ "the list of supported firmware flavors. One may decide to bail out or to " -#~ "substitute an unknown value with a default silently or verbosely." -#~ msgstr "" -#~ "Ð¦Ñ Ð²ÐµÑ€ÑÑ–Ñ PrusaSlicer може не розуміти конфігурацій, Ñтворених новітніми " -#~ "верÑÑ–Ñми PrusaSlicer. Ðаприклад, новіший PrusaSlicer може розширити " -#~ "ÑпиÑок підтримуваних прошивок. Можна вирішити звільнитиÑÑ Ð°Ð±Ð¾ замінити " -#~ "невідоме Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð½Ð° типове мовчки або вÑлівно." - -#~ msgid "Load config file" -#~ msgstr "Завантажити файл конфігурації" - -#~ msgid "" -#~ "Load configuration from the specified file. It can be used more than once " -#~ "to load options from multiple files." -#~ msgstr "" -#~ "Завантажити конфігурацію із зазначеного файлу. Його можна викориÑтовувати " -#~ "більше одного разу Ð´Ð»Ñ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð¾Ð¿Ñ†Ñ–Ð¹ з декількох файлів." - -#~ msgid "Output File" -#~ msgstr "Вихідний файл" - -#~ msgid "" -#~ "The file where the output will be written (if not specified, it will be " -#~ "based on the input file)." -#~ msgstr "" -#~ "Файл, в Ñкий буде запиÑано вихідні дані (Ñкщо не вказано, він " -#~ "базуватиметьÑÑ Ð½Ð° вхідному файлі)." - -#~ msgid "Single instance mode" -#~ msgstr "Режим одного екземплÑру PrusaSlicer" - -#~ msgid "" -#~ "If enabled, the command line arguments are sent to an existing instance " -#~ "of GUI PrusaSlicer, or an existing PrusaSlicer window is activated. " -#~ "Overrides the \"single_instance\" configuration value from application " -#~ "preferences." -#~ msgstr "" -#~ "Якщо увімкнено, аргументи командного Ñ€Ñдка надÑилаютьÑÑ Ð´Ð¾ Ñ–Ñнуючого " -#~ "екземплÑра графічного інтерфейÑу PrusaSlicer, або ж активуєтьÑÑ Ñ–Ñнуюче " -#~ "вікно PrusaSlicer. Замінює Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ ÐºÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ— \"single_instance\" у " -#~ "налаштуваннÑÑ… програми." - -#~ msgid "Data directory" -#~ msgstr "Каталог даних" - -#~ msgid "" -#~ "Load and store settings at the given directory. This is useful for " -#~ "maintaining different profiles or including configurations from a network " -#~ "storage." -#~ msgstr "" -#~ "Завантажити та зберегти Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ñƒ вказаному каталозі. Це кориÑно Ð´Ð»Ñ " -#~ "Ð²ÐµÐ´ÐµÐ½Ð½Ñ Ñ€Ñ–Ð·Ð½Ð¸Ñ… профілів або Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ ÐºÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ð¹ із мережевого Ñховища." - -#~ msgid "Logging level" -#~ msgstr "Рівень журналізації" - -#~ msgid "" -#~ "Sets logging sensitivity. 0:fatal, 1:error, 2:warning, 3:info, 4:debug, 5:" -#~ "trace\n" -#~ "For example. loglevel=2 logs fatal, error and warning level messages." -#~ msgstr "" -#~ "Ð’Ñтановлює чутливіÑÑ‚ÑŒ журналюваннÑ. 0:fatal, 1:помилка, 2:попередженнÑ, 3:" -#~ "info, 4:налагодженнÑ, 5:trace\n" -#~ "Ðаприклад. loglevel=2 журнали фатальних, помилок Ñ– повідомлень Ñ€Ñ–Ð²Ð½Ñ " -#~ "попередженнÑ." - -#~ msgid "Render with a software renderer" -#~ msgstr "Візуалізувати за допомогою програмного заÑобу візуалізації" - -#~ msgid "" -#~ "Render with a software renderer. The bundled MESA software renderer is " -#~ "loaded instead of the default OpenGL driver." -#~ msgstr "" -#~ "Візуалізувати за допомогою програмного заÑобу візуалізації. Комплектний " -#~ "візуалізатор програмного Ð·Ð°Ð±ÐµÐ·Ð¿ÐµÑ‡ÐµÐ½Ð½Ñ MESA завантажуєтьÑÑ Ð·Ð°Ð¼Ñ–ÑÑ‚ÑŒ " -#~ "драйвера OpenGL за замовчуваннÑм." - -#~ msgid "Import SL1 archive" -#~ msgstr "Імпорт SL1-архіву" - -#~ msgid "Load an SL1 archive" -#~ msgstr "Завантажити SL1-архів" - -#~ msgid "" -#~ "You should to change a name of your printer device. It can't be saved." -#~ msgstr "Вам Ñлід змінити назву принтера. Задану назву неможливо зберегти." - -#~ msgid "Save SL1 file as:" -#~ msgstr "Зберегти SL1-файл Ñк:" - -#~ msgid "Connection to Prusa SL1 works correctly." -#~ msgstr "ÐŸÑ–Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ Ð´Ð¾ Prusa SL1 працює правильно." - -#~ msgid "" -#~ "Picture sizes to be stored into a .gcode and .sl1 files, in the following " -#~ "format: \"XxY, XxY, ...\"" -#~ msgstr "" -#~ "Розміри зображень, Ñкі Ñлід зберігати у файлах .gcode та .sl1, у такому " -#~ "форматі: \"XxY, XxY, ...\"" - -#~ msgid "About Slic3r" -#~ msgstr "Про Slic3r" - -#~ msgid "Choose a file to import bed shape from (STL/OBJ/AMF/3MF/PRUSA):" -#~ msgstr "Виберіть файл, щоб імпортувати форму полотна з (STL/OBJ/AMF/PRUSA):" - -#~ msgid "Error! " -#~ msgstr "Помилка! " - -#~ msgid "slic3r version" -#~ msgstr "верÑÑ–Ñ slic3r" - -#~ msgid "min slic3r version" -#~ msgstr "мінімальна верÑÑ–Ñ slic3r" - -#~ msgid "max slic3r version" -#~ msgstr "макÑимальна верÑÑ–Ñ slic3r" - -#~ msgid "Welcome to the Slic3r %s" -#~ msgstr "ЛаÑкаво проÑимо до Slic3r %s" - -#~ msgid "Cut object:" -#~ msgstr "Розрізати об'єкт:" - -#~ msgid "Left mouse click - add point" -#~ msgstr "Ліва кнопка миші - додати точку" - -#~ msgid "Right mouse click - remove point" -#~ msgstr "Права кнопка миші - видалити точку" - -#~ msgid "SLA Support Points [L]" -#~ msgstr "Точки SLA підтримки [L]" - -#~ msgid "Array of language names and identifiers should have the same size." -#~ msgstr "МаÑив імен мов та Ñ—Ñ… ідентифікаторів має бути однакового розміру." - -#~ msgid "Slic3r View Mode" -#~ msgstr "Режим переглÑду Slic3r'у" - -#~ msgid "Change Application &Language" -#~ msgstr "Змінити &мову заÑтоÑуваннÑ" - -#~ msgid "Application will be restarted after language change." -#~ msgstr "ЗаÑтоÑÑƒÐ²Ð°Ð½Ð½Ñ Ð±ÑƒÐ´Ðµ перезапущене піÑÐ»Ñ Ð·Ð¼Ñ–Ð½Ð¸ мови." - -#~ msgid "You have unsaved changes " -#~ msgstr "У Ð²Ð°Ñ Ñ” незбережені зміни " - -#~ msgid ". Discard changes and continue anyway?" -#~ msgstr ". Відхилити зміни Ñ– продовжити в будь-Ñкому випадку?" - -#~ msgid "Unsaved Presets" -#~ msgstr "Ðезбереженні налаштуваннÑ" - -#~ msgid "Unretractions" -#~ msgstr "ÐеперериваннÑ" - -#~ msgid "Delete All" -#~ msgstr "Видалити вÑе" - -#~ msgid "" -#~ " - Remember to check for updates at http://github.com/prusa3d/slic3r/" -#~ "releases" -#~ msgstr "" -#~ " - Пам'Ñтайте оновлювати з http://github.com/prusa3d/slic3r/releases" - -#~ msgid "Quit Slic3r" -#~ msgstr "Вийти зі Slic3r" - -#~ msgid "Open the Prusa Edition releases page in your browser" -#~ msgstr "Відкрити Ñторінку релізів Prusa Edition у Ñвоєму браузері" - -#~ msgid "Slic3r &Website" -#~ msgstr "Веб-Ñайт Slic3r" - -#~ msgid "Open the Slic3r website in your browser" -#~ msgstr "Відкрити Ñторінку Slic3r у Ñвоєму браузері" - -#~ msgid "Slic3r &Manual" -#~ msgstr "ПоÑібник до Slic3r" - -#~ msgid "Open the Slic3r manual in your browser" -#~ msgstr "Відкрити Ñторінку поÑібнику до Slic3r у Ñвоєму браузері" - -#~ msgid "Report an issue on the Slic3r Prusa Edition" -#~ msgstr "Повідомити про проблему на Slic3r Prusa Edition" - -#~ msgid "&About Slic3r" -#~ msgstr "&Про Slic3r" - -#~ msgid "Save " -#~ msgstr "Зберегти " - -#~ msgid " file as:" -#~ msgstr " файл Ñк:" - -#~ msgid "Processing " -#~ msgstr "Обробка " - -#~ msgid " was successfully sliced." -#~ msgstr " був уÑпішно нарізаний." - -#~ msgid "" -#~ "This file contains several objects positioned at multiple heights. " -#~ "Instead of considering them as multiple objects, should I consider\n" -#~ "this file as a single object having multiple parts?\n" -#~ msgstr "" -#~ "Цей файл міÑтить кілька об'єктів, розташованих на декількох виÑотах. " -#~ "ЗаміÑÑ‚ÑŒ того, щоб розглÑдати Ñ—Ñ… Ñк кілька об'єктів, чи потрібно " -#~ "розглÑнути\n" -#~ "цей файл Ñк єдиний об'єкт, що має декілька чаÑтин?\n" - -#~ msgid "" -#~ "Multiple objects were loaded for a multi-material printer.\n" -#~ "Instead of considering them as multiple objects, should I consider\n" -#~ "these files to represent a single object having multiple parts?\n" -#~ msgstr "" -#~ "До мульти-матеріального принтеру завантажено кілька об'єктів.\n" -#~ "ЗаміÑÑ‚ÑŒ того, щоб розглÑдати Ñ—Ñ… Ñк кілька об'єктів, чи потрібно " -#~ "розглÑнути\n" -#~ "ці файл Ñк єдиний об'єкт, що має декілька чаÑтин?\n" - -#~ msgid "Export failed" -#~ msgstr "ЕкÑпортувати не вдалоÑÑ" - -#~ msgid "Increase copies" -#~ msgstr "Збільшити копії" - -#~ msgid "Place one more copy of the selected object" -#~ msgstr "Розташувати ще одну копію обраного об'єкта" - -#~ msgid "Decrease copies" -#~ msgstr "Зменшити копії" - -#~ msgid "Remove one copy of the selected object" -#~ msgstr "Вилучіть одну копію обраного об'єкта" - -#~ msgid "Change the number of copies of the selected object" -#~ msgstr "Змінити кількіÑÑ‚ÑŒ копій обраного об'єкта" - -#~ msgid "Reload from Disk" -#~ msgstr "Перезавантажити з диÑка" - -#~ msgid "Reload the selected file from Disk" -#~ msgstr "Перезавантажити вибраний файл із диÑка" - -#~ msgid "Use legacy OpenGL 1.1 rendering" -#~ msgstr "ВикориÑтовувати заÑтарілий OpenGL 1.1 рендеринг" - -#~ msgid "" -#~ "If you have rendering issues caused by a buggy OpenGL 2.0 driver, you may " -#~ "try to check this checkbox. This will disable the layer height editing " -#~ "and anti aliasing, so it is likely better to upgrade your graphics driver." -#~ msgstr "" -#~ "Якщо у Ð²Ð°Ñ Ð²Ð¸Ð½Ð¸ÐºÐ°ÑŽÑ‚ÑŒ проблеми з візуалізацією, Ñпричинені помилковим " -#~ "драйвером OpenGL 2.0, Ñпробуйте вибрати цю опцію. Це призведе до " -#~ "Ð²Ð¸Ð¼ÐºÐ½ÐµÐ½Ð½Ñ Ñ€ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ð½Ð½Ñ Ð²Ð¸Ñоти шару та згладжуваннÑ, тому краще оновити " -#~ "графічний драйвер." - -#~ msgid "You need to restart Slic3r to make the changes effective." -#~ msgstr "З метою ефективноÑÑ‚Ñ– зміни, Вам потрібно буде перезапуÑтити Slic3r." - -#~ msgid "" -#~ "If estimated layer time is below ~%ds, fan will run at %d%% and print " -#~ "speed will be reduced so that no less than %ds are spent on that layer " -#~ "(however, speed will never be reduced below %dmm/s)." -#~ msgstr "" -#~ "Якщо запланований Ñ‡Ð°Ñ Ð´Ñ€ÑƒÐºÑƒ шару нижче ~%dÑ, вентилÑтор буде працювати на" -#~ "%d%%, Ñ– швидкіÑÑ‚ÑŒ друку буде зменшена, так що на цей шар витрачаєтьÑÑ Ð½Ðµ " -#~ "менше %dÑ (однак швидкіÑÑ‚ÑŒ ніколи не зменшитьÑÑ Ð½Ð¸Ð¶Ñ‡Ðµ %d mm/s) ." - -#~ msgid "" -#~ "\n" -#~ "If estimated layer time is greater, but still below ~%ds, fan will run at " -#~ "a proportionally decreasing speed between %d%% and %d%%." -#~ msgstr "" -#~ "\n" -#~ "Якщо запланований Ñ‡Ð°Ñ Ð´Ñ€ÑƒÐºÑƒ шару більше, але вÑе ще нижче ~%dÑ, " -#~ "вентилÑтор буде працювати з пропорційно зменшуваною швидкіÑÑ‚ÑŽ між %d%% та " -#~ "%d%%." - -#~ msgid "" -#~ "\n" -#~ "During the other layers, fan " -#~ msgstr "" -#~ "\n" -#~ "Під Ñ‡Ð°Ñ Ð´Ñ€ÑƒÐºÑƒ інших шарів вентилÑтор " - -#~ msgid "Fan " -#~ msgstr "ВентилÑтор " - -#~ msgid "will always run at %d%% " -#~ msgstr "буде завжди працювати на %d%% " - -#~ msgid "except for the first %d layers" -#~ msgstr "за винÑтком перших %d шарів" - -#~ msgid "except for the first layer" -#~ msgstr "за винÑтком першого шару" - -#~ msgid "will be turned off." -#~ msgstr "буде вимкнено." - -#~ msgid " flow rate is maximized " -#~ msgstr " швидкіÑÑ‚ÑŒ потоку макÑимізуєтьÑÑ " - -#~ msgid "when printing " -#~ msgstr "коли друкуємо " - -#~ msgid " with a volumetric rate " -#~ msgstr " з об'ємною швидкіÑÑ‚ÑŽ " - -#~ msgid "%3.2f mm³/s" -#~ msgstr "%3.2f мм³/Ñ" - -#~ msgid " at filament speed %3.2f mm/s." -#~ msgstr " при швидкоÑÑ‚Ñ– філаменту %3.2f мм/Ñ." - -#~ msgid "Recommended object thin wall thickness for layer height %.2f and " -#~ msgstr "Рекомендована товщина Ñтінки Ð´Ð»Ñ Ð²Ð¸Ñоти шару %.2f та " - -#~ msgid "%d lines: %.2lf mm" -#~ msgstr "%d Ñ€Ñдків: %.2lf мм" - -#~ msgid "Save current " -#~ msgstr "Зберегти поточний " - -#~ msgid "Extruder clearance (mm)" -#~ msgstr "Розмір екÑтрудера (мм)" - -#~ msgid "" -#~ "The Spiral Vase mode requires:\n" -#~ "- one perimeter\n" -#~ "- no top solid layers\n" -#~ "- 0% fill density\n" -#~ "- no support material\n" -#~ "- no ensure_vertical_shell_thickness\n" -#~ "\n" -#~ "Shall I adjust those settings in order to enable Spiral Vase?" -#~ msgstr "" -#~ "Режим Ñпіральної вази вимагає:\n" -#~ "- один периметр\n" -#~ "- немає верхніх щільних шарів\n" -#~ "- 0% щільніÑÑ‚ÑŒ заповненнÑ\n" -#~ "- немає підтримуючого матеріалу\n" -#~ "- не забезпечує товщини вертикальної оболонки\n" -#~ "\n" -#~ "Чи потрібно змінити ці налаштуваннÑ, щоб увімкнути режим Спіральної вази?" - -#~ msgid "" -#~ "The Wipe Tower currently supports the non-soluble supports only\n" -#~ "if they are printed with the current extruder without triggering a tool " -#~ "change.\n" -#~ "(both support_material_extruder and support_material_interface_extruder " -#~ "need to be set to 0).\n" -#~ "\n" -#~ "Shall I adjust those settings in order to enable the Wipe Tower?" -#~ msgstr "" -#~ "Вичіщуюча веж в даний Ñ‡Ð°Ñ Ð¿Ñ–Ð´Ñ‚Ñ€Ð¸Ð¼ÑƒÑ” лише нерозчинну підтримку\n" -#~ "Ñкщо вони друкуютьÑÑ Ð· поточним екÑтрудером, не запуÑкаючи зміну " -#~ "інÑтрументу.\n" -#~ "(обидва Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ support_material_extruder Ñ– " -#~ "support_material_interface_extruder повинні бути вÑтановлені на 0).\n" -#~ "\n" -#~ "Чи потрібно коригувати ці налаштуваннÑ, щоб увімкнути вичіщуючу веж?" - -#~ msgid "" -#~ "For the Wipe Tower to work with the soluble supports, the support layers\n" -#~ "need to be synchronized with the object layers.\n" -#~ "\n" -#~ "Shall I synchronize support layers in order to enable the Wipe Tower?" -#~ msgstr "" -#~ "Ð”Ð»Ñ Ñ‚Ð¾Ð³Ð¾, щоб Вичіщуюча веж працювала з розчинними підтримками, шари " -#~ "підтримки\n" -#~ "повинні бути Ñинхронізовані з шаром об'єкта.\n" -#~ "\n" -#~ "Чи потрібно Ñинхронізувати шари підтримки, щоб увімкнути вичіщуючу веж?" - -#~ msgid "" -#~ "Supports work better, if the following feature is enabled:\n" -#~ "- Detect bridging perimeters\n" -#~ "\n" -#~ "Shall I adjust those settings for supports?" -#~ msgstr "" -#~ "Підтримка працює краще, Ñкщо ввімкнено таку функцію:\n" -#~ "- ВиÑÐ²Ð»ÐµÐ½Ð½Ñ Ð²Ð¸ÑÑчих периметрів(перемичок)\n" -#~ "\n" -#~ "Чи потрібно змінити ці Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ð»Ñ Ð¿Ñ–Ð´Ñ‚Ñ€Ð¸Ð¼ÐºÐ¸?" - -#~ msgid "The " -#~ msgstr "Шаблон Ð½Ð°Ð¿Ð¾Ð²Ð½ÐµÐ½Ð½Ñ " - -#~ msgid "" -#~ " infill pattern is not supposed to work at 100%% density.\n" -#~ "\n" -#~ "Shall I switch to rectilinear fill pattern?" -#~ msgstr "" -#~ " не підтримуєтьÑÑ Ð½Ð° 100% щільноÑÑ‚Ñ–.\n" -#~ "\n" -#~ "Чи потрібно змінити його на Rectilinear шаблон заповненнÑ?" - -#~ msgid "Temperature " -#~ msgstr "Температура " - -#~ msgid " Browse " -#~ msgstr " ПереглÑнути " - -#~ msgid " Set " -#~ msgstr " Ð’Ñтановити " - -#~ msgid "USB/Serial connection" -#~ msgstr "USB/поÑлідовне з'єднаннÑ" - -#~ msgid "Serial port" -#~ msgstr "ПоÑлідовний порт" - -#~ msgid "Rescan serial ports" -#~ msgstr "Сканувати ще раз поÑлідовні порти" - -#~ msgid "Connection to printer works correctly." -#~ msgstr "ÐŸÑ–Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ Ð´Ð¾ принтера працює коректно." - -#~ msgid "Connection failed." -#~ msgstr "ÐŸÑ–Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ Ð½Ðµ вдалоÑÑ." - -#~ msgid "Unsaved Changes" -#~ msgstr "Ðезбережені зміни" - -#~ msgid "Are you sure you want to " -#~ msgstr "Ви впевнені, що хочете " - -#~ msgid " the selected preset?" -#~ msgstr " вибране налаштуваннÑ?" - -#~ msgid " Preset" -#~ msgstr " ÐалаштуваннÑ" - -#~ msgid " as:" -#~ msgstr " Ñк:" - -#~ msgid "" -#~ "When printing multi-material objects, this settings will make slic3r to " -#~ "clip the overlapping object parts one by the other (2nd part will be " -#~ "clipped by the 1st, 3rd part will be clipped by the 1st and 2nd etc)." -#~ msgstr "" -#~ "Під Ñ‡Ð°Ñ Ð´Ñ€ÑƒÐºÑƒ багатоматеріальних об'єктів ці Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð·Ð¼ÑƒÑˆÑƒÑŽÑ‚ÑŒ slic3r " -#~ "обрізати чаÑтини, що перекриваютьÑÑ Ð¾Ð´Ð¸Ð½ одною (друга чаÑтина буде " -#~ "обрізана першою, Ñ‚Ñ€ÐµÑ‚Ñ - першою та другою, тощо)." - -#~ msgid "" -#~ "This end procedure is inserted at the end of the output file. Note that " -#~ "you can use placeholder variables for all Slic3r settings." -#~ msgstr "" -#~ "Ð¦Ñ ÐºÑ–Ð½Ñ†ÐµÐ²Ð° процедура вÑтавлÑєтьÑÑ Ð² кінці вихідного файлу. Зауважте, що " -#~ "ви можете викориÑтовувати заповнювачі змінних Ð´Ð»Ñ Ð²ÑÑ–Ñ… параметрів Slic3r." - -#~ msgid "" -#~ "This end procedure is inserted at the end of the output file, before the " -#~ "printer end gcode. Note that you can use placeholder variables for all " -#~ "Slic3r settings. If you have multiple extruders, the gcode is processed " -#~ "in extruder order." -#~ msgstr "" -#~ "Ð¦Ñ ÐºÑ–Ð½Ñ†ÐµÐ²Ð° процедура вÑтавлÑєтьÑÑ Ð² кінці вихідного файлу перед кінцевим " -#~ "кодом принтера. Зауважте, що ви можете викориÑтовувати заповнювачі " -#~ "змінних Ð´Ð»Ñ Ð²ÑÑ–Ñ… параметрів Slic3r. Якщо у Ð²Ð°Ñ Ñ” кілька екÑтрудерів, G-" -#~ "code оброблÑєтьÑÑ Ð² порÑдку екÑтрудерів." - -#~ msgid "mm or % (leave 0 for default)" -#~ msgstr "мм або % (залиште 0 за замовчаннÑм)" - -#~ msgid "mm or % (leave 0 for auto)" -#~ msgstr "мм або % (залиште 0 Ð´Ð»Ñ Ð°Ð²Ñ‚Ð¾Ð¾Ð±Ñ‡Ð¸ÑленнÑ)" - -#~ msgid "" -#~ "Extruder temperature for first layer. If you want to control temperature " -#~ "manually during print, set this to zero to disable temperature control " -#~ "commands in the output file." -#~ msgstr "" -#~ "Температура екÑтрудеру Ð´Ð»Ñ Ð¿ÐµÑ€ÑˆÐ¾Ð³Ð¾ шару. Якщо ви хочете контролювати " -#~ "температуру вручну під Ñ‡Ð°Ñ Ð´Ñ€ÑƒÐºÑƒ, вÑтановіть 0, щоб вимкнути команди " -#~ "ÐºÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ñ‚ÐµÐ¼Ð¿ÐµÑ€Ð°Ñ‚ÑƒÑ€Ð¾ÑŽ у вихідному файлі." - -#~ msgid "" -#~ "Some G/M-code commands, including temperature control and others, are not " -#~ "universal. Set this option to your printer's firmware to get a compatible " -#~ "output. The \"No extrusion\" flavor prevents Slic3r from exporting any " -#~ "extrusion value at all." -#~ msgstr "" -#~ "ДеÑкі команди G/M-коду, включаючи контроль температури тощо, не Ñ” " -#~ "універÑальними. УÑтановіть цей параметр на прошивку принтера, щоб " -#~ "отримати ÑуміÑний вихід. \"ВідÑутніÑÑ‚ÑŒ екÑтрузії\" не дозволÑÑ” Slic3r " -#~ "екÑпортувати будь-Ñке Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ ÐµÐºÑтрузії." - -#~ msgid "" -#~ "This is the acceleration your printer will use for perimeters. A high " -#~ "value like 9000 usually gives good results if your hardware is up to the " -#~ "job. Set zero to disable acceleration control for perimeters." -#~ msgstr "" -#~ "Це приÑкореннÑ, Ñке ваш принтер викориÑтовуватиме Ð´Ð»Ñ Ð¿ÐµÑ€Ð¸Ð¼ÐµÑ‚Ñ€Ñ–Ð². ВиÑока " -#~ "значеннÑ, таке Ñк 9000, зазвичай дає хороші результати, Ñкщо ваше " -#~ "апаратне Ð·Ð°Ð±ÐµÐ·Ð¿ÐµÑ‡ÐµÐ½Ð½Ñ Ð²Ñ–Ð´Ð¿Ð¾Ð²Ñ–Ð´Ð°Ñ” завданню. Ð’Ñтановити 0, щоб вимкнути " -#~ "регулÑтор приÑÐºÐ¾Ñ€ÐµÐ½Ð½Ñ Ð´Ð»Ñ Ð¿ÐµÑ€Ð¸Ð¼ÐµÑ‚Ñ€Ñ–Ð²." - -#~ msgid "USB/serial port for printer connection." -#~ msgstr "USB / поÑлідовний порт Ð´Ð»Ñ Ð¿Ñ–Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¸Ð½Ñ‚ÐµÑ€Ð°." - -#~ msgid "Serial port speed" -#~ msgstr "ШвидкіÑÑ‚ÑŒ поÑлідовного порту" - -#~ msgid "Speed (baud) of USB/serial port for printer connection." -#~ msgstr "ШвидкіÑÑ‚ÑŒ (бод) USB / поÑлідовного порту Ð´Ð»Ñ Ð¿Ñ–Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¸Ð½Ñ‚ÐµÑ€Ð°." - -#~ msgid "" -#~ "This feature will raise Z gradually while printing a single-walled object " -#~ "in order to remove any visible seam. This option requires a single " -#~ "perimeter, no infill, no top solid layers and no support material. You " -#~ "can still set any number of bottom solid layers as well as skirt/brim " -#~ "loops. It won't work when printing more than an object." -#~ msgstr "" -#~ "Ð¦Ñ Ñ„ÑƒÐ½ÐºÑ†Ñ–Ñ Ð±ÑƒÐ´Ðµ поÑтупово підвищувати Z протÑгом друку одного-Ñтінного " -#~ "об'єкта Ð´Ð»Ñ ÑƒÐ½Ð¸ÐºÐ½ÐµÐ½Ð½Ñ Ð±ÑƒÐ´ÑŒ-Ñкого видимого шву. Цей параметр вимагає " -#~ "одношарового периметру, відÑутнє наповненнÑ, відÑутніÑÑ‚ÑŒ верхніх " -#~ "Ñуцільних шарів Ñ– відÑутніÑÑ‚ÑŒ матеріалу підтримки. Ви вÑе ще можете " -#~ "вÑтановити будь-Ñку кількіÑÑ‚ÑŒ нижніх Ñуцільних шарів, а також петель " -#~ "плінтуÑу/краю. Це не Ñпрацює при друку більше, ніж одного об'єкта." - -#~ msgid "" -#~ "This start procedure is inserted at the beginning, after bed has reached " -#~ "the target temperature and extruder just started heating, and before " -#~ "extruder has finished heating. If Slic3r detects M104 or M190 in your " -#~ "custom codes, such commands will not be prepended automatically so you're " -#~ "free to customize the order of heating commands and other custom actions. " -#~ "Note that you can use placeholder variables for all Slic3r settings, so " -#~ "you can put a \"M109 S[first_layer_temperature]\" command wherever you " -#~ "want." -#~ msgstr "" -#~ "Ð¦Ñ Ð¿Ð¾Ñ‡Ð°Ñ‚ÐºÐ¾Ð²Ð° процедура вÑтавлÑєтьÑÑ Ð½Ð° початку, піÑÐ»Ñ Ñ‚Ð¾Ð³Ð¾, Ñк полотно " -#~ "доÑÑгне цільової температури, а екÑтрудер тільки починає нагріватиÑÑ, Ñ– " -#~ "перед тим, Ñк екÑтрудер закінчить нагріваннÑ. Якщо Slic3r виÑвлÑÑ” M104 " -#~ "або M190 у ваших кориÑтувацьких кодах, такі команди не будуть додаватиÑÑ " -#~ "автоматично, щоб ви могли вільно налаштовувати порÑдок команд нагріву та " -#~ "інших Ñпеціальних дій. Зверніть увагу, що ви можете викориÑтовувати " -#~ "змінні-заповнювачі Ð´Ð»Ñ Ð²ÑÑ–Ñ… параметрів Slic3r, щоб ви могли поÑтавити " -#~ "команду \"M109 S [first_layer_temperature]\" де завгодно." - -#~ msgid "" -#~ "This start procedure is inserted at the beginning, after any printer " -#~ "start gcode. This is used to override settings for a specific filament. " -#~ "If Slic3r detects M104, M109, M140 or M190 in your custom codes, such " -#~ "commands will not be prepended automatically so you're free to customize " -#~ "the order of heating commands and other custom actions. Note that you can " -#~ "use placeholder variables for all Slic3r settings, so you can put a " -#~ "\"M109 S[first_layer_temperature]\" command wherever you want. If you " -#~ "have multiple extruders, the gcode is processed in extruder order." -#~ msgstr "" -#~ "Ð¦Ñ Ð¿Ð¾Ñ‡Ð°Ñ‚ÐºÐ¾Ð²Ð° процедура вÑтавлÑєтьÑÑ Ð½Ð° початку, піÑÐ»Ñ Ñ‚Ð¾Ð³Ð¾, Ñк будь-Ñкий " -#~ "принтер запуÑкає G-code. Це викориÑтовуєтьÑÑ Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ " -#~ "параметрів Ð´Ð»Ñ Ð¿ÐµÐ²Ð½Ð¾Ñ— нитки. Якщо Slic3r виÑвлÑÑ” M104, M109, M140 або " -#~ "M190 у ваших кориÑтувацьких кодах, такі команди не будуть автоматично " -#~ "додаватиÑÑ, тому ви можете налаштувати порÑдок команд нагріву та інших " -#~ "Ñпеціальних дій. Зверніть увагу, що ви можете викориÑтовувати змінні-" -#~ "заповнювачі Ð´Ð»Ñ Ð²ÑÑ–Ñ… параметрів Slic3r, щоб ви могли поÑтавити команду " -#~ "\"M109 S [first_layer_temperature]\" де завгодно. Якщо у Ð²Ð°Ñ Ñ” кілька " -#~ "екÑтрудерів, G-code оброблÑєтьÑÑ Ð² порÑдку екÑтрудерів." - -#~ msgid "soluble" -#~ msgstr "розчинний" - -#~ msgid "detachable" -#~ msgstr "відривний" - -#~ msgid "" -#~ "Extruder temperature for layers after the first one. Set this to zero to " -#~ "disable temperature control commands in the output." -#~ msgstr "" -#~ "Температура екÑтрудеру Ð´Ð»Ñ ÑˆÐ°Ñ€Ñ–Ð² піÑÐ»Ñ Ð¿ÐµÑ€ÑˆÐ¾Ð³Ð¾. УÑтановіть 0, щоб " -#~ "вимкнути команди ÐºÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ñ‚ÐµÐ¼Ð¿ÐµÑ€Ð°Ñ‚ÑƒÑ€Ð¾ÑŽ на виході." - -#~ msgid "" -#~ "This custom code is inserted right before every extruder change. Note " -#~ "that you can use placeholder variables for all Slic3r settings as well as " -#~ "[previous_extruder] and [next_extruder]." -#~ msgstr "" -#~ "Цей Ñпеціальний код вÑтавлÑєтьÑÑ Ð±ÐµÐ·Ð¿Ð¾Ñередньо перед кожною зміненою " -#~ "екÑтрудера. Зверніть увагу, що ви можете викориÑтовувати змінні-" -#~ "заповнювачі Ð´Ð»Ñ Ð²ÑÑ–Ñ… параметрів Slic3r, а також [previous_extruder] Ñ– " -#~ "[next_extruder]." -======= "до функції DDEML передано помилковий ідентифікатор дії.\n" "Тільки-но програма повернулаÑÑ Ð·Ñ– зворотного виклику XTYP_XACT_COMPLETE,\n" "ідентифікатор дії Ð´Ð»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ виклику вже не Ñ” дійÑним." @@ -36840,4 +23776,3 @@ msgstr "помилка zlib %d" #: ../src/richtext/richtextbulletspage.cpp:288 msgid "~" msgstr "~" ->>>>>>> master diff --git a/resources/localization/zh_cn/PrusaSlicer.mo b/resources/localization/zh_cn/PrusaSlicer.mo Binary files differdeleted file mode 100644 index d4d20d55d..000000000 --- a/resources/localization/zh_cn/PrusaSlicer.mo +++ /dev/null diff --git a/resources/localization/zh_tw/PrusaSlicer.mo b/resources/localization/zh_tw/PrusaSlicer.mo Binary files differdeleted file mode 100644 index c97213f7f..000000000 --- a/resources/localization/zh_tw/PrusaSlicer.mo +++ /dev/null diff --git a/resources/profiles/Anycubic.idx b/resources/profiles/Anycubic.idx index a07fb93be..12652625c 100644 --- a/resources/profiles/Anycubic.idx +++ b/resources/profiles/Anycubic.idx @@ -1,9 +1,6 @@ -<<<<<<< HEAD -======= min_slic3r_version = 2.3.2-alpha0
0.0.12 Updated Anycubic i3 MEGA(S) profiles.
0.0.11 Added bed model and texture for i3 Mega, i3 Mega S.
->>>>>>> master min_slic3r_version = 2.3.1-beta
0.0.10 Various updates for Anycubic Mega. Added filament profiles.
0.0.9 Updated bed textures
diff --git a/resources/profiles/Anycubic.ini b/resources/profiles/Anycubic.ini index c961b36af..053aecbd5 100644 --- a/resources/profiles/Anycubic.ini +++ b/resources/profiles/Anycubic.ini @@ -1,1900 +1,3 @@ -<<<<<<< HEAD -# Print profiles for the Anycubic printers.
-
-[vendor]
-# Vendor name will be shown by the Config Wizard.
-name = Anycubic
-# Configuration version of this file. Config file will only be installed, if the config_version differs.
-# This means, the server may force the PrusaSlicer configuration to be downgraded.
-config_version = 0.0.10
-# Where to get the updates from?
-config_update_url = https://files.prusa3d.com/wp-content/uploads/repository/PrusaSlicer-settings-master/live/Anycubic/
-# changelog_url = https://files.prusa3d.com/?latest=slicer-profiles&lng=%1%
-
-# The printer models will be shown by the Configuration Wizard in this order,
-# also the first model installed & the first nozzle installed will be activated after install.
-# Printer model name will be shown by the installation wizard.
-
-[printer_model:AKLP]
-name = Anycubic Kossel Linear Plus
-variants = 0.4
-technology = FFF
-family = KOSSEL
-bed_model = AKLP_Bed.stl
-bed_texture = AK.svg
-default_materials = Generic PLA @AKOSSEL; Generic PETG @AKOSSEL; Generic ABS @AKOSSEL
-
-[printer_model:AK]
-name = Anycubic Kossel Pulley (Linear)
-variants = 0.4
-technology = FFF
-family = KOSSEL
-bed_model = AK_Bed.stl
-bed_texture = AK.svg
-default_materials = Generic PLA @AKOSSEL; Generic PETG @AKOSSEL; Generic ABS @AKOSSEL
-
-[printer_model:MEGA0]
-name = Anycubic Mega Zero
-variants = 0.4
-technology = FFF
-family = MEGA
-bed_model = mega0_bed.stl
-bed_texture = mega0.svg
-default_materials = Generic PLA @MEGA0; Generic PETG @MEGA0; Anycubic PLA @MEGA0; Prusament PLA @MEGA0; Prusament PETG @MEGA0
-
-[printer_model:I3MEGA]
-name = Anycubic i3 Mega
-variants = 0.4
-technology = FFF
-family = MEGA
-
-[printer_model:I3MEGAS]
-name = Anycubic i3 Mega S
-variants = 0.4
-technology = FFF
-family = MEGA
-
-[printer_model:PREDATOR]
-name = Anycubic Predator
-variants = 0.4; 0.6; 0.8
-technology = FFF
-family = PREDATOR
-default_materials = Generic PLA @PREDATOR; Generic PETG @PREDATOR; Generic ABS @PREDATOR
-
-# All presets starting with asterisk, for example *common*, are intermediate and they will
-# not make it into the user interface.
-
-## Anycubic KOSSEL
-## Author: https://github.com/tc0fh
-## Initial PR: https://github.com/prusa3d/PrusaSlicer/pull/4220
-
-# Common print preset
-[print:*common_akossel*]
-avoid_crossing_perimeters = 0
-bottom_solid_min_thickness = 0.5
-bridge_angle = 0
-bridge_flow_ratio = 0.8
-bridge_speed = 30
-brim_width = 0
-clip_multipart_objects = 1
-compatible_printers =
-complete_objects = 0
-dont_support_bridges = 1
-elefant_foot_compensation = 0
-ensure_vertical_shell_thickness = 1
-external_fill_pattern = rectilinear
-external_perimeters_first = 0
-external_perimeter_extrusion_width = 0.45
-extra_perimeters = 0
-extruder_clearance_height = 25
-extruder_clearance_radius = 45
-extrusion_width = 0.45
-fill_angle = 45
-fill_density = 20%
-fill_pattern = grid
-first_layer_extrusion_width = 0.42
-first_layer_height = 0.2
-first_layer_speed = 20
-gap_fill_speed = 40
-gcode_comments = 0
-infill_every_layers = 1
-infill_extruder = 1
-infill_extrusion_width = 0.45
-infill_first = 0
-infill_only_where_needed = 0
-infill_overlap = 25%
-interface_shells = 0
-max_print_speed = 200
-max_volumetric_extrusion_rate_slope_negative = 0
-max_volumetric_extrusion_rate_slope_positive = 0
-max_volumetric_speed = 0
-min_skirt_length = 4
-notes =
-overhangs = 0
-only_retract_when_crossing_perimeters = 0
-ooze_prevention = 0
-output_filename_format = {input_filename_base}_{layer_height}mm_{filament_type[0]}_{printer_model}_{print_time}.gcode
-perimeters = 2
-perimeter_extruder = 1
-perimeter_extrusion_width = 0.45
-perimeter_speed = 45
-post_process =
-print_settings_id =
-raft_layers = 0
-resolution = 0
-seam_position = nearest
-single_extruder_multi_material_priming = 0
-skirts = 2
-skirt_distance = 5
-skirt_height = 1
-small_perimeter_speed = 25
-solid_infill_below_area = 0
-solid_infill_every_layers = 0
-solid_infill_extruder = 1
-solid_infill_extrusion_width = 0.45
-spiral_vase = 0
-standby_temperature_delta = -5
-support_material = 0
-support_material_extruder = 0
-support_material_extrusion_width = 0.38
-support_material_interface_extruder = 0
-support_material_angle = 0
-support_material_buildplate_only = 0
-support_material_enforce_layers = 0
-support_material_contact_distance = 0.15
-support_material_interface_contact_loops = 0
-support_material_interface_layers = 2
-support_material_interface_spacing = 0.2
-support_material_interface_speed = 100%
-support_material_pattern = rectilinear
-support_material_spacing = 2
-support_material_speed = 50
-support_material_synchronize_layers = 0
-support_material_threshold = 45
-support_material_with_sheath = 0
-support_material_xy_spacing = 60%
-thin_walls = 0
-top_infill_extrusion_width = 0.4
-top_solid_infill_speed = 40
-top_solid_min_thickness = 0.6
-travel_speed = 180
-wipe_tower = 1
-wipe_tower_bridging = 10
-wipe_tower_rotation_angle = 0
-wipe_tower_width = 60
-wipe_tower_x = 170
-wipe_tower_y = 140
-xy_size_compensation = 0
-bridge_acceleration = 1000
-default_acceleration = 1500
-first_layer_acceleration = 1000
-infill_acceleration = 1500
-perimeter_acceleration = 800
-
-[print:*0.08mm_akossel*]
-inherits = *common_akossel*
-bottom_solid_layers = 10
-bridge_acceleration = 300
-bridge_flow_ratio = 0.7
-bridge_speed = 20
-external_perimeter_speed = 20
-first_layer_acceleration = 500
-gap_fill_speed = 20
-infill_acceleration = 800
-infill_speed = 40
-layer_height = 0.08
-max_print_speed = 80
-perimeter_acceleration = 300
-perimeter_speed = 30
-perimeters = 3
-small_perimeter_speed = 20
-solid_infill_speed = 40
-support_material_extrusion_width = 0.3
-support_material_spacing = 1.5
-support_material_speed = 40
-top_solid_infill_speed = 30
-top_solid_layers = 12
-
-[print:*0.16mm_akossel*]
-inherits = *common_akossel*
-bottom_solid_layers = 5
-layer_height = 0.16
-top_solid_layers = 6
-
-[print:*0.20mm_akossel*]
-inherits = *common_akossel*
-bottom_solid_layers = 4
-bridge_flow_ratio = 0.95
-layer_height = 0.20
-top_solid_layers = 5
-
-[print:*0.24mm_akossel*]
-inherits = *common_akossel*
-bottom_solid_layers = 4
-bridge_flow_ratio = 0.95
-layer_height = 0.24
-perimeter_speed = 50
-external_perimeter_speed = 35
-top_solid_layers = 4
-infill_speed = 100
-solid_infill_speed = 100
-top_solid_infill_speed = 40
-
-[print:*0.30mm_akossel*]
-inherits = *common_akossel*
-bottom_solid_layers = 3
-bridge_flow_ratio = 0.95
-external_perimeter_extrusion_width = 0.6
-external_perimeter_speed = 35
-extrusion_width = 0.5
-infill_extrusion_width = 0.5
-infill_speed = 70
-layer_height = 0.30
-perimeter_extrusion_width = 0.5
-perimeter_speed = 50
-small_perimeter_speed = 30
-solid_infill_extrusion_width = 0.5
-solid_infill_speed = 70
-support_material_speed = 45
-top_infill_extrusion_width = 0.45
-top_solid_infill_speed = 50
-top_solid_layers = 3
-
-[print:0.08mm ULTRADETAIL @AKOSSEL]
-inherits = *0.08mm_akossel*
-fill_density = 15%
-fill_pattern = gyroid
-compatible_printers_condition = printer_notes=~/.*PRINTER_MODEL_AK(|LP).*/ and nozzle_diameter[0]==0.4
-
-[print:0.16mm QUALITY @AKOSSEL]
-inherits = *0.16mm_akossel*
-external_perimeter_speed = 25
-fill_density = 15%
-fill_pattern = gyroid
-infill_speed = 80
-compatible_printers_condition = printer_notes=~/.*PRINTER_MODEL_AK(|LP).*/ and nozzle_diameter[0]==0.4
-
-[print:0.16mm SPEED @AKOSSEL]
-inherits = *0.16mm_akossel*
-external_perimeter_speed = 35
-infill_speed = 120
-perimeter_speed = 60
-solid_infill_speed = 120
-top_solid_infill_speed = 50
-compatible_printers_condition = printer_notes=~/.*PRINTER_MODEL_AK(|LP).*/ and nozzle_diameter[0]==0.4
-
-[print:0.20mm QUALITY @AKOSSEL]
-inherits = *0.20mm_akossel*
-external_perimeter_speed = 25
-fill_density = 15%
-fill_pattern = gyroid
-infill_speed = 80
-compatible_printers_condition = printer_notes=~/.*PRINTER_MODEL_AK(|LP).*/ and nozzle_diameter[0]==0.4
-
-[print:0.20mm SPEED @AKOSSEL]
-inherits = *0.20mm_akossel*
-external_perimeter_speed = 35
-infill_speed = 120
-perimeter_speed = 60
-solid_infill_speed = 120
-top_solid_infill_speed = 50
-compatible_printers_condition = printer_notes=~/.*PRINTER_MODEL_AK(|LP).*/ and nozzle_diameter[0]==0.4
-
-[print:0.24mm DRAFT @AKOSSEL]
-inherits = *0.24mm_akossel*
-compatible_printers_condition = printer_notes=~/.*PRINTER_MODEL_AK(|LP).*/ and nozzle_diameter[0]==0.4
-
-[print:0.30mm FAST @AKOSSEL]
-inherits = *0.30mm_akossel*
-compatible_printers_condition = printer_notes=~/.*PRINTER_MODEL_AK(|LP).*/ and nozzle_diameter[0]==0.4
-
-# Common filament preset
-[filament:*common_akossel*]
-cooling = 0
-compatible_printers =
-extrusion_multiplier = 1
-filament_cost = 0
-filament_density = 0
-filament_diameter = 1.75
-filament_notes = ""
-filament_settings_id = ""
-filament_soluble = 0
-min_print_speed = 15
-slowdown_below_layer_time = 20
-compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_Anycubic.*/ and printer_notes=~/.*PRINTER_MODEL_AK(|LP).*/
-
-[filament:*PLA_akossel*]
-inherits = *common_akossel*
-bed_temperature = 60
-fan_below_layer_time = 100
-filament_colour = #FF3232
-filament_max_volumetric_speed = 10
-filament_type = PLA
-filament_density = 1.24
-filament_cost = 20
-first_layer_bed_temperature = 60
-first_layer_temperature = 200
-fan_always_on = 1
-cooling = 1
-max_fan_speed = 100
-min_fan_speed = 100
-bridge_fan_speed = 100
-disable_fan_first_layers = 1
-temperature = 200
-
-[filament:*PET_akossel*]
-inherits = *common_akossel*
-bed_temperature = 70
-cooling = 1
-disable_fan_first_layers = 3
-fan_below_layer_time = 20
-filament_colour = #FF8000
-filament_max_volumetric_speed = 8
-filament_type = PETG
-filament_density = 1.27
-filament_cost = 30
-first_layer_bed_temperature =70
-first_layer_temperature = 240
-fan_always_on = 1
-max_fan_speed = 50
-min_fan_speed = 20
-bridge_fan_speed = 100
-temperature = 240
-
-[filament:*ABS_akossel*]
-inherits = *common_akossel*
-bed_temperature = 100
-cooling = 0
-disable_fan_first_layers = 3
-fan_below_layer_time = 20
-filament_colour = #3A80CA
-filament_max_volumetric_speed = 10
-filament_type = ABS
-filament_density = 1.04
-filament_cost = 20
-first_layer_bed_temperature = 100
-first_layer_temperature = 245
-fan_always_on = 0
-max_fan_speed = 0
-min_fan_speed = 0
-bridge_fan_speed = 30
-top_fan_speed = 0
-temperature = 245
-
-[filament:Generic PLA @AKOSSEL]
-inherits = *PLA_akossel*
-filament_vendor = Generic
-
-[filament:Generic PETG @AKOSSEL]
-inherits = *PET_akossel*
-filament_vendor = Generic
-
-[filament:Generic ABS @AKOSSEL]
-inherits = *ABS_akossel*
-filament_vendor = Generic
-
-# Common printer preset
-[printer:*common_akossel*]
-printer_technology = FFF
-bed_shape =
-before_layer_gcode = ;BEFORE_LAYER_CHANGE\nG92 E0\n;[layer_z]
-between_objects_gcode =
-deretract_speed = 40
-extruder_colour = #FFFF00
-extruder_offset = 0x0
-gcode_flavor = marlin
-silent_mode = 0
-remaining_times = 0
-machine_max_acceleration_e = 3000
-machine_max_acceleration_extruding = 1000
-machine_max_acceleration_retracting = 1000
-machine_max_acceleration_x = 1500
-machine_max_acceleration_y = 1500
-machine_max_acceleration_z = 1500
-machine_max_feedrate_e = 60
-machine_max_feedrate_x = 200
-machine_max_feedrate_y = 200
-machine_max_feedrate_z = 200
-machine_max_jerk_e = 5
-machine_max_jerk_x = 5
-machine_max_jerk_y = 5
-machine_max_jerk_z = 5
-machine_min_extruding_rate = 0
-machine_min_travel_rate = 0
-layer_gcode = ;AFTER_LAYER_CHANGE\n;[layer_z]
-max_layer_height = 0.3
-min_layer_height = 0.08
-max_print_height = 300
-nozzle_diameter = 0.4
-printer_notes =
-printer_settings_id =
-retract_before_travel = 2
-retract_before_wipe = 70%
-retract_layer_change = 1
-retract_length = 5
-retract_length_toolchange = 1
-retract_lift = 0
-retract_lift_above = 0
-retract_lift_below = 0
-retract_restart_extra = 0
-retract_restart_extra_toolchange = 0
-retract_speed = 60
-single_extruder_multi_material = 0
-start_gcode =
-end_gcode = M104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG28 ; home\nM84 ; disable motors
-toolchange_gcode =
-use_firmware_retraction = 0
-use_relative_e_distances = 1
-use_volumetric_e = 0
-variable_layer_height = 1
-wipe = 1
-z_offset = 0
-default_print_profile = 0.20mm QUALITY @AKOSSEL
-default_filament_profile = Generic PLA @AKOSSEL
-
-[printer:Anycubic Kossel Linear Plus]
-inherits = *common_akossel*
-printer_model = AKLP
-printer_variant = 0.4
-printer_notes = Do not remove the following keywords! These keywords are used in the "compatible printer" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_VENDOR_Anycubic\nPRINTER_MODEL_AKLP\nPRINTER_HAS_BOWDEN\n
-bed_shape = 114.562x10.0229,113.253x19.9695,111.081x29.7642,108.065x39.3323,104.225x48.6011,99.5929x57.5,94.2025x65.9613,88.0951x73.9206,81.3173x81.3173,73.9206x88.0951,65.9613x94.2025,57.5x99.5929,48.6011x104.225,39.3323x108.065,29.7642x111.081,19.9695x113.253,10.0229x114.562,7.04172e-15x115,-10.0229x114.562,-19.9695x113.253,-29.7642x111.081,-39.3323x108.065,-48.6011x104.225,-57.5x99.5929,-65.9613x94.2025,-73.9206x88.0951,-81.3173x81.3173,-88.0951x73.9206,-94.2025x65.9613,-99.5929x57.5,-104.225x48.6011,-108.065x39.3323,-111.081x29.7642,-113.253x19.9695,-114.562x10.0229,-115x1.40834e-14,-114.562x-10.0229,-113.253x-19.9695,-111.081x-29.7642,-108.065x-39.3323,-104.225x-48.6011,-99.5929x-57.5,-94.2025x-65.9613,-88.0951x-73.9206,-81.3173x-81.3173,-73.9206x-88.0951,-65.9613x-94.2025,-57.5x-99.5929,-48.6011x-104.225,-39.3323x-108.065,-29.7642x-111.081,-19.9695x-113.253,-10.0229x-114.562,-2.11252e-14x-115,10.0229x-114.562,19.9695x-113.253,29.7642x-111.081,39.3323x-108.065,48.6011x-104.225,57.5x-99.5929,65.9613x-94.2025,73.9206x-88.0951,81.3173x-81.3173,88.0951x-73.9206,94.2025x-65.9613,99.5929x-57.5,104.225x-48.6011,108.065x-39.3323,111.081x-29.7642,113.253x-19.9695,114.562x-10.0229,115x-2.81669e-14
-start_gcode = G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 ; home\nG1 X-54.672 Y95.203 Z0.3 F9000\nG92 E0.0\nG1 F1000\nG1 X-52.931 Y96.185 E0.300\nG1 X-50.985 Y97.231 E0.331\nG1 X-49.018 Y98.238 E0.331\nG1 X-47.032 Y99.205 E0.331\nG1 X-45.026 Y100.132 E0.331\nG1 X-43.003 Y101.019 E0.331\nG1 X-40.961 Y101.864 E0.331\nG1 X-38.904 Y102.668 E0.331\nG1 X-36.83 Y103.431 E0.331\nG1 X-34.742 Y104.152 E0.331\nG1 X-32.639 Y104.83 E0.331\nG1 X-30.523 Y105.466 E0.331\nG1 X-28.395 Y106.06 E0.331\nG1 X-26.255 Y106.61 E0.331\nG1 X-24.105 Y107.117 E0.331\nG1 X-21.945 Y107.581 E0.331\nG1 X-19.776 Y108.001 E0.331\nG1 X-17.599 Y108.377 E0.331\nG1 X-15.415 Y108.71 E0.331\nG1 X-13.224 Y108.998 E0.331\nG1 X-11.028 Y109.242 E0.331\nG1 X-8.828 Y109.442 E0.331\nG1 X-6.624 Y109.598 E0.331\nG1 X-4.418 Y109.709 E0.331\nG1 X-2.209 Y109.776 E0.332\nG1 X0 Y109.798 E0.331\nG1 X2.209 Y109.776 E0.690\nG1 X4.418 Y109.709 E0.691\nG1 X6.624 Y109.598 E0.690\nG1 X8.828 Y109.442 E0.690\nG1 X11.028 Y109.242 E0.690\nG1 X13.224 Y108.998 E0.690\nG1 X15.415 Y108.71 E0.691\nG1 X17.599 Y108.377 E0.690\nG1 X19.776 Y108.001 E0.690\nG1 X21.945 Y107.581 E0.690\nG1 X24.105 Y107.117 E0.690\nG1 X26.255 Y106.61 E0.690\nG1 X28.395 Y106.06 E0.690\nG1 X30.523 Y105.466 E0.690\nG1 X32.639 Y104.83 E0.690\nG1 X34.742 Y104.152 E0.690\nG1 X36.83 Y103.431 E0.690\nG1 X38.904 Y102.668 E0.691\nG1 X40.961 Y101.864 E0.690\nG1 X43.003 Y101.019 E0.691\nG1 X45.026 Y100.132 E0.690\nG1 X47.032 Y99.205 E0.691\nG1 X49.018 Y98.238 E0.690\nG1 X50.985 Y97.231 E0.691\nG1 X52.931 Y96.185 E0.690\nG1 X54.672 Y95.203 E0.625\nG92 E0.0\nG1 E-5 F3000 ; retract 5mm\nG1 X52.931 Y96.185 F1000 ; wipe\nG1 X50.985 Y97.231 F1000 ; wipe\nG1 X49.018 Y98.238 F1000 ; wipe\nG1 X0 Y109.798 F1000\nG1 E4.8 F1500; de-retract\nG92 E0.0 ; reset extrusion distance\nM221 S{if layer_height<0.075}100{else}95{endif}
-
-[printer:Anycubic Kossel Pulley (Linear)]
-inherits = *common_akossel*
-printer_model = AK
-printer_variant = 0.4
-printer_notes = Do not remove the following keywords! These keywords are used in the "compatible printer" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_VENDOR_Anycubic\nPRINTER_MODEL_AK\nPRINTER_HAS_BOWDEN\n
-bed_shape = 89.6575x7.84402,88.6327x15.6283,86.9333x23.2937,84.5723x30.7818,81.5677x38.0356,77.9423x45,73.7237x51.6219,68.944x57.8509,63.6396x63.6396,57.8509x68.944,51.6219x73.7237,45x77.9423,38.0356x81.5677,30.7818x84.5723,23.2937x86.9333,15.6283x88.6327,7.84402x89.6575,5.51091e-15x90,-7.84402x89.6575,-15.6283x88.6327,-23.2937x86.9333,-30.7818x84.5723,-38.0356x81.5677,-45x77.9423,-51.6219x73.7237,-57.8509x68.944,-63.6396x63.6396,-68.944x57.8509,-73.7237x51.6219,-77.9423x45,-81.5677x38.0356,-84.5723x30.7818,-86.9333x23.2937,-88.6327x15.6283,-89.6575x7.84402,-90x1.10218e-14,-89.6575x-7.84402,-88.6327x-15.6283,-86.9333x-23.2937,-84.5723x-30.7818,-81.5677x-38.0356,-77.9423x-45,-73.7237x-51.6219,-68.944x-57.8509,-63.6396x-63.6396,-57.8509x-68.944,-51.6219x-73.7237,-45x-77.9423,-38.0356x-81.5677,-30.7818x-84.5723,-23.2937x-86.9333,-15.6283x-88.6327,-7.84402x-89.6575,-1.65327e-14x-90,7.84402x-89.6575,15.6283x-88.6327,23.2937x-86.9333,30.7818x-84.5723,38.0356x-81.5677,45x-77.9423,51.6219x-73.7237,57.8509x-68.944,63.6396x-63.6396,68.944x-57.8509,73.7237x-51.6219,77.9423x-45,81.5677x-38.0356,84.5723x-30.7818,86.9333x-23.2937,88.6327x-15.6283,89.6575x-7.84402,90x-2.20436e-14
-start_gcode = G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 ; home\nG1 X-39.672 Y69.712 Z0.3 F9000\nG92 E0.0\nG1 F1000\nG1 X-38.457 Y70.397 E0.209\nG1 X-37.043 Y71.157 E0.241\nG1 X-35.614 Y71.889 E0.241\nG1 X-34.171 Y72.591 E0.241\nG1 X-32.714 Y73.265 E0.241\nG1 X-31.244 Y73.909 E0.241\nG1 X-29.761 Y74.523 E0.241\nG1 X-28.266 Y75.108 E0.241\nG1 X-26.759 Y75.662 E0.241\nG1 X-25.242 Y76.185 E0.241\nG1 X-23.714 Y76.678 E0.241\nG1 X-22.177 Y77.14 E0.241\nG1 X-20.63 Y77.571 E0.241\nG1 X-19.076 Y77.971 E0.241\nG1 X-17.514 Y78.34 E0.241\nG1 X-15.944 Y78.677 E0.241\nG1 X-14.368 Y78.982 E0.241\nG1 X-12.786 Y79.255 E0.241\nG1 X-11.199 Y79.497 E0.241\nG1 X-9.608 Y79.706 E0.241\nG1 X-8.013 Y79.884 E0.241\nG1 X-6.414 Y80.029 E0.241\nG1 X-4.813 Y80.142 E0.241\nG1 X-3.21 Y80.223 E0.241\nG1 X-1.605 Y80.271 E0.241\nG1 X0 Y80.287 E0.241\nG1 X1.605 Y80.271 E0.502\nG1 X3.21 Y80.223 E0.502\nG1 X4.813 Y80.142 E0.502\nG1 X6.414 Y80.029 E0.502\nG1 X8.013 Y79.884 E0.502\nG1 X9.608 Y79.706 E0.502\nG1 X11.199 Y79.497 E0.501\nG1 X12.786 Y79.255 E0.502\nG1 X14.368 Y78.982 E0.502\nG1 X15.944 Y78.677 E0.502\nG1 X17.514 Y78.34 E0.502\nG1 X19.076 Y77.971 E0.502\nG1 X20.63 Y77.571 E0.501\nG1 X22.177 Y77.14 E0.502\nG1 X23.714 Y76.678 E0.502\nG1 X25.242 Y76.185 E0.502\nG1 X26.759 Y75.662 E0.501\nG1 X28.266 Y75.108 E0.502\nG1 X29.761 Y74.523 E0.502\nG1 X31.244 Y73.909 E0.502\nG1 X32.714 Y73.265 E0.502\nG1 X34.171 Y72.591 E0.502\nG1 X35.614 Y71.889 E0.501\nG1 X37.043 Y71.157 E0.502\nG1 X38.457 Y70.397 E0.502\nG1 X39.672 Y69.712 E0.436\nG92 E0.0\nM221 S{if layer_height<0.075}100{else}95{endif}
-
-## Anycubic MEGA ZERO
-## Author: https://github.com/kad
-## Initial PR: https://github.com/prusa3d/PrusaSlicer/pull/4057
-
-# Common print preset
-[print:*common_mega0*]
-avoid_crossing_perimeters = 1
-bridge_angle = 0
-bridge_flow_ratio = 0.7
-bridge_speed = 25
-brim_width = 0
-clip_multipart_objects = 1
-compatible_printers =
-complete_objects = 0
-dont_support_bridges = 1
-elefant_foot_compensation = 0
-ensure_vertical_shell_thickness = 1
-external_fill_pattern = rectilinear
-external_perimeters_first = 0
-external_perimeter_extrusion_width = 0.45
-extra_perimeters = 0
-extruder_clearance_height = 25
-extruder_clearance_radius = 45
-extrusion_width = 0.45
-fill_angle = 45
-fill_density = 20%
-fill_pattern = grid
-first_layer_extrusion_width = 0.42
-first_layer_height = 0.2
-first_layer_speed = 20
-gap_fill_speed = 30
-gcode_comments = 0
-infill_every_layers = 1
-infill_extruder = 1
-infill_extrusion_width = 0.45
-infill_first = 0
-infill_only_where_needed = 0
-infill_overlap = 25%
-interface_shells = 0
-max_print_speed = 100
-max_volumetric_extrusion_rate_slope_negative = 0
-max_volumetric_extrusion_rate_slope_positive = 0
-max_volumetric_speed = 0
-min_skirt_length = 4
-notes =
-overhangs = 1
-only_retract_when_crossing_perimeters = 0
-ooze_prevention = 0
-output_filename_format = {input_filename_base}_{layer_height}mm_{filament_type[0]}_{printer_model}_{print_time}.gcode
-perimeters = 2
-perimeter_extruder = 1
-perimeter_extrusion_width = 0.45
-post_process =
-print_settings_id =
-raft_layers = 0
-resolution = 0
-seam_position = nearest
-single_extruder_multi_material_priming = 1
-skirts = 2
-skirt_distance = 2
-skirt_height = 2
-small_perimeter_speed = 25
-solid_infill_below_area = 0
-solid_infill_every_layers = 0
-solid_infill_extruder = 1
-solid_infill_extrusion_width = 0.45
-spiral_vase = 0
-standby_temperature_delta = -5
-support_material = 0
-support_material_extruder = 0
-support_material_extrusion_width = 0.4
-support_material_interface_extruder = 0
-support_material_angle = 0
-support_material_buildplate_only = 0
-support_material_enforce_layers = 0
-support_material_contact_distance = 0.15
-support_material_interface_contact_loops = 0
-support_material_interface_layers = 2
-support_material_interface_spacing = 0.2
-support_material_interface_speed = 100%
-support_material_pattern = rectilinear
-support_material_spacing = 2
-support_material_speed = 40
-support_material_synchronize_layers = 0
-support_material_threshold = 45
-support_material_with_sheath = 0
-support_material_xy_spacing = 60%
-thin_walls = 0
-top_infill_extrusion_width = 0.45
-top_solid_infill_speed = 40
-travel_speed = 100
-wipe_tower = 0
-wipe_tower_bridging = 10
-wipe_tower_rotation_angle = 0
-wipe_tower_width = 60
-wipe_tower_x = 170
-wipe_tower_y = 140
-xy_size_compensation = 0
-
-[print:*0.10mm_mega0*]
-inherits = *common_mega0*
-perimeter_speed = 40
-external_perimeter_speed = 25
-infill_speed = 50
-solid_infill_speed = 40
-layer_height = 0.10
-perimeters = 3
-top_infill_extrusion_width = 0.4
-bottom_solid_layers = 6
-top_solid_layers = 7
-
-[print:*0.20mm_mega0*]
-inherits = *common_mega0*
-perimeter_speed = 40
-external_perimeter_speed = 25
-infill_speed = 50
-solid_infill_speed = 40
-layer_height = 0.20
-top_infill_extrusion_width = 0.4
-bottom_solid_layers = 4
-top_solid_layers = 5
-
-[print:*0.30mm_mega0*]
-inherits = *common_mega0*
-perimeter_speed = 40
-external_perimeter_speed = 25
-infill_speed = 50
-solid_infill_speed = 40
-layer_height = 0.24
-top_infill_extrusion_width = 0.45
-bottom_solid_layers = 3
-top_solid_layers = 4
-
-[print:0.10mm DETAIL @MEGA0]
-inherits = *0.10mm_mega0*
-travel_speed = 120
-infill_speed = 50
-solid_infill_speed = 40
-top_solid_infill_speed = 30
-support_material_extrusion_width = 0.38
-compatible_printers_condition = printer_model=="MEGA0" and nozzle_diameter[0]==0.4
-
-[print:0.20mm NORMAL @MEGA0]
-inherits = *0.20mm_mega0*
-travel_speed = 120
-infill_speed = 50
-solid_infill_speed = 40
-top_solid_infill_speed = 30
-support_material_extrusion_width = 0.38
-compatible_printers_condition = printer_model=="MEGA0" and nozzle_diameter[0]==0.4
-
-[print:0.30mm DRAFT @MEGA0]
-inherits = *0.30mm_mega0*
-travel_speed = 120
-infill_speed = 50
-solid_infill_speed = 40
-top_solid_infill_speed = 30
-support_material_extrusion_width = 0.38
-compatible_printers_condition = printer_model=="MEGA0" and nozzle_diameter[0]==0.4
-
-# Common filament preset
-[filament:*common_mega0*]
-cooling = 0
-compatible_printers =
-extrusion_multiplier = 1
-filament_cost = 0
-filament_density = 0
-filament_diameter = 1.75
-filament_notes = ""
-filament_settings_id = ""
-filament_soluble = 0
-min_print_speed = 15
-slowdown_below_layer_time = 20
-compatible_printers_condition = printer_model=="MEGA0"
-
-[filament:*PLA_mega0*]
-inherits = *common_mega0*
-bed_temperature = 40
-fan_below_layer_time = 100
-filament_colour = #FF3232
-filament_max_volumetric_speed = 15
-filament_type = PLA
-filament_density = 1.24
-filament_cost = 20
-first_layer_bed_temperature = 40
-first_layer_temperature = 215
-fan_always_on = 1
-cooling = 1
-max_fan_speed = 100
-min_fan_speed = 100
-bridge_fan_speed = 100
-disable_fan_first_layers = 1
-temperature = 210
-
-[filament:*PET_mega0*]
-inherits = *common_mega0*
-bed_temperature = 70
-cooling = 1
-disable_fan_first_layers = 3
-fan_below_layer_time = 20
-filament_colour = #FF8000
-filament_max_volumetric_speed = 8
-filament_type = PETG
-filament_density = 1.27
-filament_cost = 30
-first_layer_bed_temperature =70
-first_layer_temperature = 240
-fan_always_on = 1
-max_fan_speed = 50
-min_fan_speed = 20
-bridge_fan_speed = 100
-temperature = 240
-
-[filament:*ABS_mega0*]
-inherits = *common_mega0*
-bed_temperature = 100
-cooling = 0
-disable_fan_first_layers = 3
-fan_below_layer_time = 20
-filament_colour = #3A80CA
-filament_max_volumetric_speed = 11
-filament_type = ABS
-filament_density = 1.04
-filament_cost = 20
-first_layer_bed_temperature = 100
-first_layer_temperature = 245
-fan_always_on = 0
-max_fan_speed = 0
-min_fan_speed = 0
-bridge_fan_speed = 30
-top_fan_speed = 0
-temperature = 245
-
-[filament:Generic PLA @MEGA0]
-inherits = *PLA_mega0*
-filament_vendor = Generic
-
-[filament:Generic PETG @MEGA0]
-inherits = *PET_mega0*
-filament_vendor = Generic
-
-[filament:Generic ABS @MEGA0]
-inherits = *ABS_mega0*
-filament_vendor = Generic
-
-[filament:Anycubic PLA @MEGA0]
-inherits = *PLA_mega0*
-filament_vendor = Anycubic
-temperature = 190
-first_layer_temperature = 195
-filament_cost = 24.99
-filament_density = 1.25
-
-[filament:Prusament PLA @MEGA0]
-inherits = *PLA_mega0*
-filament_vendor = Prusa Polymers
-temperature = 215
-bed_temperature = 40
-first_layer_temperature = 215
-filament_cost = 24.99
-filament_density = 1.24
-
-[filament:Prusament PETG @MEGA0]
-inherits = *PET_mega0*
-filament_vendor = Prusa Polymers
-temperature = 245
-bed_temperature = 70
-first_layer_temperature = 245
-filament_cost = 24.99
-filament_density = 1.27
-
-# Common printer preset
-[printer:*common_mega0*]
-printer_technology = FFF
-bed_shape = 0x0,220x0,220x220,0x220
-before_layer_gcode = ; BEFORE_LAYER_CHANGE [layer_num] @ [layer_z]mm
-between_objects_gcode =
-deretract_speed = 0
-extruder_colour = #FFFF00
-extruder_offset = 0x0
-gcode_flavor = marlin
-silent_mode = 0
-remaining_times = 0
-machine_max_acceleration_e = 10000
-machine_max_acceleration_extruding = 2000
-machine_max_acceleration_retracting = 1500
-machine_max_acceleration_x = 3000
-machine_max_acceleration_y = 3000
-machine_max_acceleration_z = 500
-machine_max_feedrate_e = 120
-machine_max_feedrate_x = 500
-machine_max_feedrate_y = 500
-machine_max_feedrate_z = 12
-machine_max_jerk_e = 2.5
-machine_max_jerk_x = 20
-machine_max_jerk_y = 20
-machine_max_jerk_z = 0.4
-machine_min_extruding_rate = 0
-machine_min_travel_rate = 0
-layer_gcode = ; AFTER_LAYER_CHANGE [layer_num] @ [layer_z]mm
-max_layer_height = 0.3
-min_layer_height = 0.1
-max_print_height = 200
-nozzle_diameter = 0.4
-printer_notes =
-printer_settings_id =
-retract_before_travel = 1
-retract_before_wipe = 0%
-retract_layer_change = 1
-retract_length = 6
-retract_length_toolchange = 1
-retract_lift = 0
-retract_lift_above = 0
-retract_lift_below = 0
-retract_restart_extra = 0
-retract_restart_extra_toolchange = 0
-retract_speed = 30
-single_extruder_multi_material = 0
-start_gcode = G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nM117 Homing X/Y ...\nG28 X0 Y0 ;move X/Y to min endstops\nM117 Homing Z ...\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F240 ;move the platform down 15mm\nM117 Heating ...\nM104 S[first_layer_temperature]\n ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature]\n ; wait for extruder temp\nM117 Start cleaning ...\nG92 E0 ;zero the extruded length\nG1 F200 E10 ;extrude 10mm of feed stock\nG92 E0 ;zero the extruded length again\nM117 Intro line ...\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z[first_layer_height] F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z[first_layer_height] F1500.0 E15 ; Draw the first line\nG1 X0.4 Y200.0 Z[first_layer_height] F5000.0 ; Move to side a little\nG1 X0.4 Y20 Z0.3[first_layer_height] F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 E-1 F500 ; Retract filiment by 1 mm\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F240 ; Move over to prevent blob squish\nG92 E0 ; Reset Extruder\nM117 Printing...\n
-end_gcode = M117 Cooling down...\nM104 S0 ; turn off extruder\nM140 S0 ; turn off heatbed\nM107 ; Fan off\nM84 ; disable motors\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 ;X-20 Y-20 F240 ;move Z up a bit and retract filament even more\nG28 X0 ;move X to min endstops, so the head is out of the way\nG90 ;Absolute positionning\nG1 Y200 F3000 ;Present print\nM84 ;steppers off\nM300 P300 S4000\nM117 Finished.\n
-toolchange_gcode =
-use_firmware_retraction = 0
-use_relative_e_distances = 1
-use_volumetric_e = 0
-variable_layer_height = 1
-wipe = 1
-z_offset = 0
-printer_model =
-default_print_profile =
-default_filament_profile =
-
-[printer:Anycubic Mega Zero]
-inherits = *common_mega0*
-printer_model = MEGA0
-printer_variant = 0.4
-max_layer_height = 0.3
-min_layer_height = 0.1
-printer_notes = Do not remove the following keywords! These keywords are used in the "compatible printer" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_VENDOR_ANYCUBIC\nPRINTER_MODEL_MEGA0
-bed_shape = 0x0,220x0,220x220,0x220
-max_print_height = 250
-machine_max_acceleration_e = 5000
-machine_max_acceleration_extruding = 500
-machine_max_acceleration_retracting = 500
-machine_max_acceleration_x = 500
-machine_max_acceleration_y = 500
-machine_max_acceleration_z = 100
-machine_max_feedrate_e = 25
-machine_max_feedrate_x = 500
-machine_max_feedrate_y = 500
-machine_max_feedrate_z = 5
-machine_max_jerk_e = 5
-machine_max_jerk_x = 10
-machine_max_jerk_y = 10
-machine_max_jerk_z = 0.4
-machine_min_extruding_rate = 0
-machine_min_travel_rate = 0
-nozzle_diameter = 0.4
-retract_before_travel = 2
-retract_layer_change = 0
-retract_length = 7
-retract_speed = 30
-retract_lift = 0.2
-deretract_speed = 30
-retract_before_wipe = 70%
-default_print_profile = 0.20mm NORMAL @MEGA0
-default_filament_profile = Anycubic PLA @MEGA0
-start_gcode = G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nM117 Homing X/Y ...\nG28 X0 Y0 ;move X/Y to min endstops\nM117 Homing Z ...\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F240 ;move the platform down 15mm\nM117 Heating ...\nM104 S[first_layer_temperature]\n ; set extruder temp\nM109 S[first_layer_temperature]\n ; wait for extruder temp\nM117 Start cleaning ...\nG92 E0 ;zero the extruded length\nG1 F200 E10 ;extrude 10mm of feed stock\nG92 E0 ;zero the extruded length again\nM117 Intro line ...\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z[first_layer_height] F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z[first_layer_height] F1500.0 E15 ; Draw the first line\nG1 X0.4 Y200.0 Z[first_layer_height] F5000.0 ; Move to side a little\nG1 X0.4 Y20 Z0.3[first_layer_height] F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 E-1 F500 ; Retract filiment by 1 mm\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F240 ; Move over to prevent blob squish\nG92 E0 ; Reset Extruder\nM117 Printing...\n
-end_gcode = M117 Cooling down...\nM104 S0 ; turn off extruder\nM107 ; Fan off\nM84 ; disable motors\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 ;X-20 Y-20 F240 ;move Z up a bit and retract filament even more\nG28 X0 ;move X to min endstops, so the head is out of the way\nG90 ;Absolute positionning\nG1 Y200 F3000 ;Present print\nM84 ;steppers off\nM300 P300 S4000\nM117 Finished.\n
-
-## Anycubic i3 Mega and i3 Mega S
-## Author: https://github.com/Igami
-## Initial PR: https://github.com/prusa3d/PrusaSlicer/pull/4619
-
-[print:*common_mega*]
-bottom_solid_min_thickness = 0.5
-bridge_acceleration = 1000
-bridge_flow_ratio = 0.95
-bridge_speed = 30
-compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_ANYCUBIC.*/ and printer_notes=~/.*PRINTER_MODEL_I3_MEGA.*/ and nozzle_diameter[0]==0.4
-default_acceleration = 1000
-ensure_vertical_shell_thickness = 1
-external_perimeter_extrusion_width = 0.45
-external_perimeter_speed = 25
-extruder_clearance_height = 35
-extruder_clearance_radius = 60
-extrusion_width = 0.45
-fill_density = 15%
-fill_pattern = gyroid
-first_layer_acceleration = 1000
-first_layer_extrusion_width = 0.42
-first_layer_height = 0.2
-first_layer_speed = 20
-gap_fill_speed = 40
-gcode_comments = 1
-infill_acceleration = 1000
-infill_anchor = 2.5
-infill_anchor_max = 12
-infill_extrusion_width = 0.45
-max_print_speed = 200
-min_skirt_length = 4
-only_retract_when_crossing_perimeters = 0
-output_filename_format = {input_filename_base}_{layer_height}mm_{filament_type[0]}_{printer_model}_{print_time}.gcode
-perimeter_acceleration = 800
-perimeter_extrusion_width = 0.45
-perimeter_speed = 45
-perimeters = 2
-seam_position = nearest
-skirt_distance = 2
-skirt_height = 3
-skirts = 1
-small_perimeter_speed = 25
-solid_infill_below_area = 0
-solid_infill_extrusion_width = 0.45
-solid_infill_speed = 80
-support_material_buildplate_only = 1
-support_material_contact_distance = 0.1
-support_material_extrusion_width = 0.35
-support_material_interface_layers = 2
-support_material_interface_spacing = 0.2
-support_material_spacing = 2
-support_material_speed = 50
-support_material_threshold = 55
-thin_walls = 0
-top_infill_extrusion_width = 0.4
-top_solid_infill_speed = 40
-top_solid_layers = 5
-top_solid_min_thickness = 0.6
-travel_speed = 180
-
-[print:*supported_mega*]
-support_material = 1
-
-# XXXXXXXXXXXXXXXXXXXX
-# XXX--- 0.15mm ---XXX
-# XXXXXXXXXXXXXXXXXXXX
-
-[print:*0.15mm_mega*]
-inherits = *common_mega*
-bottom_solid_layers = 5
-layer_height = 0.15
-top_solid_layers = 7
-
-[print:0.15mm QUALITY @MEGA]
-inherits = *0.15mm_mega*
-
-[print:0.15mm QUALITY SUPPORTED @MEGA]
-inherits = *0.15mm_mega*;*supported_mega*
-
-# XXXXXXXXXXXXXXXXXXXX
-# XXX--- 0.20mm ---XXX
-# XXXXXXXXXXXXXXXXXXXX
-
-[print:*0.20mm_mega*]
-inherits = *common_mega*
-bottom_solid_layers = 4
-layer_height = 0.2
-top_solid_layers = 5
-
-[print:0.20mm QUALITY @MEGA]
-inherits = *0.20mm_mega*
-
-[print:0.20mm QUALITY SUPPORTED @MEGA]
-inherits = *0.20mm_mega*;*supported_mega*
-
-# XXXXXXXXXXXXXXXXXXXX
-# XXX--- 0.30mm ---XXX
-# XXXXXXXXXXXXXXXXXXXX
-
-[print:*0.30mm_mega*]
-inherits = *common_mega*
-bottom_solid_layers = 4
-external_perimeter_extrusion_width = 0.6
-external_perimeter_speed = 35
-extrusion_width = 0.5
-fill_pattern = grid
-infill_extrusion_width = 0.5
-infill_speed = 85
-layer_height = 0.3
-perimeter_extrusion_width = 0.5
-perimeter_speed = 50
-small_perimeter_speed = 30
-solid_infill_extrusion_width = 0.5
-support_material_extrusion_width = 0.38
-support_material_speed = 45
-top_solid_layers = 4
-
-[print:0.30mm DRAFT @MEGA]
-inherits = *0.30mm_mega*
-
-[print:0.30mm DRAFT SUPPORTED @MEGA]
-inherits = *0.30mm_mega*;*supported_mega*
-
-# XXXXXXXXXXXXXXXXXXXXXX
-# XXX--- filament ---XXX
-# XXXXXXXXXXXXXXXXXXXXXX
-
-[filament:*common_mega*]
-compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_ANYCUBIC.*/ and printer_notes=~/.*PRINTER_MODEL_I3_MEGA.*/
-end_filament_gcode = "; Filament-specific end gcode"
-fan_always_on = 1
-fan_below_layer_time = 100
-filament_vendor = Generic
-min_print_speed = 15
-slowdown_below_layer_time = 20
-
-[filament:*ABS_mega*]
- inherits = *common_mega*
- bed_temperature = 110
- bridge_fan_speed = 25
- cooling = 0
- fan_always_on = 0
- fan_below_layer_time = 20
- filament_colour = #3A80CA
- filament_cost = 27.82
- filament_density = 1.04
- filament_max_volumetric_speed = 11
- filament_ramming_parameters = "120 100 5.70968 6.03226 7 8.25806 9 9.19355 9.3871 9.77419 10.129 10.3226 10.4516 10.5161| 0.05 5.69677 0.45 6.15484 0.95 8.76774 1.45 9.20323 1.95 9.95806 2.45 10.3871 2.95 10.5677 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6"
- filament_type = ABS
- first_layer_bed_temperature = 105
- first_layer_temperature = 255
- max_fan_speed = 30
- min_fan_speed = 20
- temperature = 255
-
-[filament:Generic ABS @MEGA]
-inherits = *ABS_mega*
-
-[filament:*FLEX_mega*]
-inherits = *common_mega*
-bed_temperature = 50
-bridge_fan_speed = 80
-cooling = 0
-extrusion_multiplier = 1.15
-fan_always_on = 0
-filament_colour = #008000
-filament_cost = 82.00
-filament_density = 1.22
-filament_deretract_speed = 25
-filament_max_volumetric_speed = 1.2
-filament_retract_length = 0.8
-filament_type = FLEX
-first_layer_bed_temperature = 55
-first_layer_temperature = 240
-max_fan_speed = 90
-min_fan_speed = 70
-temperature = 240
-
-[filament:Generic FLEX @MEGA]
-inherits = *FLEX_mega*
-
-[filament:SainSmart TPU @MEGA]
-inherits = *FLEX_mega*
-filament_vendor = SainSmart
-bed_temperature = 50
-bridge_fan_speed = 100
-cooling = 1
-disable_fan_first_layers = 4
-filament_cost = 39.99
-filament_density = 1.21
-filament_deretract_speed = 15
-filament_max_volumetric_speed = 1.8
-filament_notes = "SainSmart TPU gains popularity among 3D Printing community for its balance of rigidity and flexibility. In addition, with a 95A Shore Hardness and improved bed adhesion, it is easier to print even with a stock elementary 3D Printer like the Creality Ender 3. SainSmart TPU will not disappoint if you are looking for flexible filament. From drone parts, phone cases, to small toys, all can be printed with ease.\n\nhttps://www.sainsmart.com/collections/tpu-filament/products/all-colors-tpu-flexible-filament-1-75mm-0-8kg-1-76lb"
-filament_retract_before_travel = 5
-filament_retract_length = 4
-filament_retract_speed = 40
-filament_unloading_speed = 90
-first_layer_bed_temperature = 55
-first_layer_temperature = 235
-full_fan_speed_layer = 6
-max_fan_speed = 80
-min_fan_speed = 80
-slowdown_below_layer_time = 10
-temperature = 235
-
-[filament:*PETG_mega*]
-inherits = *common_mega*
-bed_temperature = 90
-bridge_fan_speed = 50
-fan_below_layer_time = 20
-filament_colour = #FF8000
-filament_cost = 27.82
-filament_density = 1.27
-filament_max_volumetric_speed = 8
-filament_type = PETG
-first_layer_bed_temperature = 90
-first_layer_temperature = 230
-max_fan_speed = 50
-min_fan_speed = 30
-temperature = 240
-
-[filament:Generic PETG @MEGA]
-inherits = *PETG_mega*
-
-[filament:ColorFabb XT-CF20 @MEGA]
-inherits = *PETG_mega*
-compatible_printers_condition = nozzle_diameter[0]>=0.4 and printer_notes=~/.*PRINTER_VENDOR_ANYCUBIC.*/ and printer_notes=~/.*PRINTER_MODEL_I3_MEGA.*/
-extrusion_multiplier = 1.05
-filament_colour = #804040
-filament_cost = 66.60
-filament_density = 1.35
-filament_deretract_speed = 25
-filament_max_volumetric_speed = 2
-filament_notes = "Based on colorFabb_XT, XT-CF20 is a carbon fiber composite material. Loaded with no less than 20% specially sourced carbon fibers we have developed a very stiff and tough 3D printing filament made for functional parts. It is truly a professional printers go-to material, especially for users looking for high melt strength, high melt viscosity and good dimensional accuracy and stability.\n\nhttps://colorfabb.com/xt-cf20"
-filament_retract_before_travel = 1
-filament_retract_length = 1.4
-filament_retract_speed = 40
-filament_spool_weight = 236
-filament_vendor = ColorFabb
-first_layer_temperature = 260
-full_fan_speed_layer = 5
-slowdown_below_layer_time = 15
-temperature = 260
-
-[filament:ERYONE PETG @MEGA]
-inherits = *PETG_mega*
-filament_vendor = ERYONE
-filament_cost = 20.99
-filament_notes = "https://eryone.com/petg/show/10.html"
-
-[filament:FormFutura HDglass @MEGA]
-inherits = *PETG_mega*
-filament_vendor = FormFutura
-filament_cost = 46.65
-filament_notes = "HDglass is a high performance PETG type of 3D printer with unsurpassed 3D printing properties and improved mechanical strength, flexibility, toughness and heat resistance.\n\nhttps://www.formfutura.com/shop/product/hdglass-2812"
-
-[filament:FormFutura ReForm rPET @MEGA]
-inherits = *PETG_mega*
-filament_vendor = FormFutura
-filament_cost = 26.65
-filament_notes = "ReForm rPET is a recycled PETG type of 3D printer filament that is made from post-industrial waste streams of a nearby located plastic bottle manufacturer.\n\nhttps://www.formfutura.com/shop/product/reform-rpet-2836"
-filament_spool_weight = 176
-
-[filament:Janbex transparent PETG @MEGA]
-inherits = *PETG_mega*
-filament_vendor = Janbex
-filament_cost = 31.99
-filament_spool_weight = 222
-first_layer_temperature = 215
-min_fan_speed = 100
-temperature = 210
-
-[filament:*PLA_mega*]
-inherits = *common_mega*
-bed_temperature = 60
-disable_fan_first_layers = 1
-filament_colour = #FF3232
-filament_cost = 25.40
-filament_density = 1.24
-filament_max_volumetric_speed = 10
-first_layer_bed_temperature = 65
-first_layer_temperature = 215
-min_fan_speed = 100
-temperature = 210
-
-[filament:Generic PLA @MEGA]
-inherits = *PLA_mega*
-
-[filament:3Dmensionals PLA @MEGA]
-inherits = *PLA_mega*
-filament_vendor = 3Dmensionals
-filament_cost = 22.90
-filament_notes = "Das 3DFilaments - PLA von 3Dmensionals ist ein sehr leicht zu druckendes 3D-Drucker Filament. Dabei handelt es sich um ein etwas härteres PLA mit einer exzellenten thermischen Stabilität. Das Filament zeichnet sich vor allem durch verzugfreies 3D-Drucken aus und weist minimale bis keine Verformung nach dem Abkühlen auf. Daher ist es besonders gut für den Druck größerer Objekte geeignet. Zudem bietet 3DFilaments - PLA über die gesamte Fadenläge eine hervorragende Durchmesser- und Rundheitstoleranz.\n\nhttps://www.3dmensionals.de/3dfilaments?number=PSU3DM001V"
-
-[filament:3D Warhorse PLA @MEGA]
-inherits = *PLA_mega*
-filament_vendor = 3D Warhorse
-filament_cost = 19.99
-
-[filament:AMOLEN wood PLA]
-inherits = *PLA_mega*
-filament_vendor = AMOLEN
-compatible_printers_condition = nozzle_diameter[0]>0.35 and printer_notes=~/.*PRINTER_VENDOR_ANYCUBIC.*/ and printer_notes=~/.*PRINTER_MODEL_I3_MEGA.*/
-extrusion_multiplier = 1.1
-filament_colour = #DFC287
-filament_cost = 33.99
-filament_density = 1.23
-filament_max_volumetric_speed = 9
-filament_notes = "https://amolen.com/collections/wood/products/amolen-pla-filament-1-75mm-wood-color-3d-printer-filament-1kg2-2lb"
-
-[filament:FormFutura EasyFil PLA @MEGA]
-inherits = *PLA_mega*
-filament_vendor = FormFutura
-filament_cost = 39.93
-filament_notes = "EasyFil PLA is an easy to print PLA type of 3D printer filament that is available in a wide variety of colors. Its improved flowing behavior make 3D printed layers flow more into each other.\n\nhttps://www.formfutura.com/shop/product/easyfil-pla-2801"
-
-[filament:FormFutura ReForm rPLA @MEGA]
-inherits = *PLA_mega*
-filament_vendor = FormFutura
-filament_cost = 26.65
-filament_notes = "ReForm is a sustainable initiative within Formfutura to efficiently manage residual extrusion waste streams and re-use them into high-end upcycled filaments. The ideology behind ReForm is to a make 3D printing more sustainable – without having to make compromises on material properties – and yet keep it affordable.\n\nhttps://www.formfutura.com/shop/product/reform-rpla-2838"
-
-[filament:GIANTARM PLA @MEGA]
-inherits = *PLA_mega*
-filament_vendor = GIANTARM
-filament_cost = 24.99
-
-[filament:Prusament PLA @MEGA]
-inherits = *PLA_mega*
-filament_vendor = Prusa Polymers
-filament_cost = 30.24
-filament_notes = "Affordable filament for everyday printing in premium quality manufactured in-house by Josef Prusa"
-filament_spool_weight = 201
-temperature = 215
-
-[filament:Verbatim PLA @MEGA]
-inherits = *PLA_mega*
-filament_vendor = Verbatim
-filament_cost = 23.88
-
-[printer:*common_mega*]
-printer_technology = FFF
-bed_shape = 0x0,210x0,210x210,0x210
-before_layer_gcode = ;BEFORE_LAYER_CHANGE\nG92 E0.0\n;[layer_z]
-default_filament_profile = Generic PLA @MEGA
-default_print_profile = 0.15mm QUALITY @MEGA
-deretract_speed = 40
-end_gcode = G1 E-1.0 F2100 ; retract\nG92 E0.0\nG1{if max_layer_z < max_print_height} Z{z_offset+min(max_layer_z+30, max_print_height)}{endif} E-34.0 F720 ; move print head up & retract filament\nG4 ; wait\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 X0 Y105 F3000 ; park print head\nM84 ; disable motors
-extruder_colour = #808080
-gcode_flavor = marlin
-layer_gcode = ;AFTER_LAYER_CHANGE\n;[layer_z]
-max_layer_height = 0.36
-max_print_height = 205
-remaining_times = 1
-retract_before_travel = 1.5
-retract_before_wipe = 60%
-retract_layer_change = 1
-retract_length = 3.2
-retract_lift = 0.2
-retract_lift_below = 204
-retract_speed = 70
-silent_mode = 0
-start_gcode = G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM204 S[machine_max_acceleration_extruding] T[machine_max_acceleration_retracting]\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nG28 ; home all\nG1 Y1.0 Z0.3 F1000 ; move print head up\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG92 E0.0\n; initial load\nG1 X205.0 E19 F1000\nG1 Y1.6\nG1 X5.0 E19 F1000\nG92 E0.0\n; intro line\nG1 Y2.0 Z0.2 F1000\nG1 X65.0 E9.0 F1000\nG1 X105.0 E12.5 F1000\nG92 E0.0
-thumbnails = 16x16,220x124
-use_relative_e_distances = 1
-wipe = 1
-machine_max_acceleration_e = 10000
-machine_max_acceleration_extruding = 1250
-machine_max_acceleration_retracting = 1250
-machine_max_acceleration_x = 3000
-machine_max_acceleration_y = 2000
-machine_max_acceleration_z = 60
-machine_max_feedrate_e = 60
-machine_max_feedrate_x = 500
-machine_max_feedrate_y = 500
-machine_max_feedrate_z = 6
-machine_max_jerk_e = 5
-machine_max_jerk_x = 10
-machine_max_jerk_y = 10
-machine_max_jerk_z = 0.4
-
-[printer:Anycubic i3 Mega]
-inherits = *common_mega*
-printer_model = I3MEGA
-printer_variant = 0.4
-printer_notes = Do not remove the following keywords! These keywords are used in the "compatible printer" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_VENDOR_ANYCUBIC\nPRINTER_MODEL_I3_MEGA\nPRINTER_HAS_BOWDEN
-
-[printer:Anycubic i3 Mega S]
-inherits = *common_mega*
-printer_model = I3MEGAS
-printer_variant = 0.4
-printer_notes = Do not remove the following keywords! These keywords are used in the "compatible printer" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_VENDOR_ANYCUBIC\nPRINTER_MODEL_I3_MEGA_S\nPRINTER_HAS_BOWDEN
-machine_max_feedrate_e = 30
-machine_max_feedrate_z = 8
-
-
-## Anycubic PREDATOR
-## Author: https://github.com/tillverka3d
-## Initial PR: https://github.com/prusa3d/PrusaSlicer/pull/4960
-
-#########################################
-###### begin common print presets #######
-#########################################
-
-# Common print preset
-[print:*common predator*]
-spiral_vase = 0
-top_solid_min_thickness = 0.8
-bottom_solid_min_thickness = 0.6
-extra_perimeters = 0
-ensure_vertical_shell_thickness = 1
-avoid_crossing_perimeters = 0
-thin_walls = 0
-overhangs = 1
-seam_position = nearest
-external_perimeters_first = 0
-fill_density = 20%
-external_fill_pattern = rectilinear
-infill_every_layers = 1
-infill_only_where_needed = 0
-solid_infill_every_layers = 0
-fill_angle = 45
-solid_infill_below_area = 20
-bridge_angle = 0
-only_retract_when_crossing_perimeters = 0
-infill_first = 0
-skirts = 1
-skirt_distance = 4
-skirt_height = 1
-min_skirt_length = 8
-brim_width = 0
-support_material = 0
-support_material_auto = 1
-support_material_threshold = 50
-support_material_enforce_layers = 0
-raft_layers = 0
-support_material_contact_distance = 0.1
-support_material_pattern = rectilinear
-support_material_with_sheath = 0
-support_material_spacing = 2
-support_material_angle = 0
-support_material_interface_layers = 2
-support_material_interface_spacing = 0.2
-support_material_interface_contact_loops = 0
-support_material_buildplate_only = 0
-support_material_xy_spacing = 60%
-dont_support_bridges = 1
-support_material_synchronize_layers = 0
-travel_speed = 94
-first_layer_speed = 15
-perimeter_acceleration = 0
-infill_acceleration = 0
-bridge_acceleration = 0
-first_layer_acceleration = 0
-default_acceleration = 0
-max_volumetric_speed = 15
-perimeter_extruder = 1
-infill_extruder = 1
-solid_infill_extruder = 1
-support_material_extruder = 0
-support_material_interface_extruder = 0
-ooze_prevention = 0
-standby_temperature_delta = -5
-wipe_tower = 0
-wipe_tower_x = 170
-wipe_tower_y = 140
-wipe_tower_width = 60
-wipe_tower_rotation_angle = 0
-wipe_tower_bridging = 10
-interface_shells = 0
-bridge_flow_ratio = 0.8
-resolution = 0
-xy_size_compensation = 0
-elefant_foot_compensation = 0.2
-clip_multipart_objects = 1
-complete_objects = 0
-extruder_clearance_radius = 45
-extruder_clearance_height = 25
-gcode_comments = 0
-output_filename_format = {input_filename_base}.gcode
-post_process =
-notes =
-max_volumetric_extrusion_rate_slope_negative = 0
-max_volumetric_extrusion_rate_slope_positive = 0
-print_settings_id =
-
-# Common print preset
-[print:*common predator 0.4 nozzle*]
-inherits = *common predator*
-first_layer_height = 0.16
-infill_overlap = 25%
-compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_ANYCUBIC.*/ and printer_notes=~/.*PRINTER_MODEL_PREDATOR.*/ and printer_notes=~/.*PRINTER_HAS_BOWDEN.*/ and nozzle_diameter[0]==0.4
-
-# Common print preset
-[print:*common predator 0.6 nozzle*]
-inherits = *common predator*
-first_layer_height = 0.24
-infill_overlap = 27%
-compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_ANYCUBIC.*/ and printer_notes=~/.*PRINTER_MODEL_PREDATOR.*/ and printer_notes=~/.*PRINTER_HAS_BOWDEN.*/ and nozzle_diameter[0]==0.6
-
-# Common print preset
-[print:*common predator 0.8 nozzle*]
-inherits = *common predator*
-first_layer_height = 0.32
-infill_overlap = 30%
-compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_ANYCUBIC.*/ and printer_notes=~/.*PRINTER_MODEL_PREDATOR.*/ and printer_notes=~/.*PRINTER_HAS_BOWDEN.*/ and nozzle_diameter[0]==0.8
-
-# Common print preset
-[print:*common predator quality*]
-perimeter_speed = 50
-small_perimeter_speed = 15
-external_perimeter_speed = 70%
-infill_speed = 65
-solid_infill_speed = 85%
-top_solid_infill_speed = 85%
-support_material_speed = 30
-support_material_interface_speed = 85%
-bridge_speed = 30
-gap_fill_speed = 40
-ironing_speed = 15
-
-# Common print preset
-[print:*common predator speed*]
-perimeter_speed = 70
-small_perimeter_speed = 15
-external_perimeter_speed = 70%
-infill_speed = 85
-solid_infill_speed = 85%
-top_solid_infill_speed = 85%
-support_material_speed = 30
-support_material_interface_speed = 85%
-bridge_speed = 30
-gap_fill_speed = 40
-ironing_speed = 15
-
-# Common print preset
-[print:*common predator 0.4 nozzle detailed*]
-inherits = *common predator 0.4 nozzle*
-extrusion_width = 0.42
-first_layer_extrusion_width = 0.41
-perimeter_extrusion_width = 0.42
-external_perimeter_extrusion_width = 0.42
-infill_extrusion_width = 0.4
-solid_infill_extrusion_width = 0.4
-top_infill_extrusion_width = 0.4
-support_material_extrusion_width = 0.38
-
-# Common print preset
-[print:*common predator 0.4 nozzle coarse*]
-inherits = *common predator 0.4 nozzle*
-extrusion_width = 0.44
-first_layer_extrusion_width = 0.42
-perimeter_extrusion_width = 0.5
-external_perimeter_extrusion_width = 0.5
-infill_extrusion_width = 0.5
-solid_infill_extrusion_width = 0.5
-top_infill_extrusion_width = 0.4
-support_material_extrusion_width = 0.38
-
-# Common print preset
-[print:*common predator 0.6 nozzle detailed*]
-inherits = *common predator 0.6 nozzle*
-extrusion_width = 0.64
-first_layer_extrusion_width = 0.62
-perimeter_extrusion_width = 0.64
-external_perimeter_extrusion_width = 0.64
-infill_extrusion_width = 0.6
-solid_infill_extrusion_width = 0.6
-top_infill_extrusion_width = 0.6
-support_material_extrusion_width = 0.56
-
-# Common print preset
-[print:*common predator 0.6 nozzle coarse*]
-inherits = *common predator 0.6 nozzle*
-extrusion_width = 0.67
-first_layer_extrusion_width = 0.64
-perimeter_extrusion_width = 0.7
-external_perimeter_extrusion_width = 0.7
-infill_extrusion_width = 0.7
-solid_infill_extrusion_width = 0.7
-top_infill_extrusion_width = 0.6
-support_material_extrusion_width = 0.56
-
-# Common print preset
-[print:*common predator 0.8 nozzle detailed*]
-inherits = *common predator 0.8 nozzle*
-extrusion_width = 0.84
-first_layer_extrusion_width = 0.82
-perimeter_extrusion_width = 0.84
-external_perimeter_extrusion_width = 0.84
-infill_extrusion_width = 0.8
-solid_infill_extrusion_width = 0.8
-top_infill_extrusion_width = 0.8
-support_material_extrusion_width = 0.72
-
-# Common print preset
-[print:*common predator 0.8 nozzle coarse*]
-inherits = *common predator 0.8 nozzle*
-extrusion_width = 0.87
-first_layer_extrusion_width = 0.84
-perimeter_extrusion_width = 0.9
-external_perimeter_extrusion_width = 0.9
-infill_extrusion_width = 0.9
-solid_infill_extrusion_width = 0.9
-top_infill_extrusion_width = 0.8
-support_material_extrusion_width = 0.72
-
-#########################################
-####### end common print presets ########
-#########################################
-
-#########################################
-########## begin print presets ##########
-#########################################
-
-[print:0.08mm 0.4 nozzle DETAILED QUALITY @PREDATOR]
-inherits = *common predator 0.4 nozzle detailed*; *common predator quality*
-layer_height = 0.08
-max_print_speed = 50
-perimeters = 3
-fill_pattern = grid
-
-[print:0.16mm 0.4 nozzle DETAILED QUALITY @PREDATOR]
-inherits = *common predator 0.4 nozzle detailed*; *common predator quality*
-layer_height = 0.16
-max_print_speed = 60
-perimeters = 3
-fill_pattern = grid
-
-[print:0.16mm 0.4 nozzle COARSE QUALITY @PREDATOR]
-inherits = *common predator 0.4 nozzle coarse*; *common predator quality*
-layer_height = 0.16
-max_print_speed = 60
-perimeters = 3
-fill_pattern = grid
-
-[print:0.24mm 0.4 nozzle DETAILED QUALITY @PREDATOR]
-inherits = *common predator 0.4 nozzle detailed*; *common predator quality*
-layer_height = 0.24
-max_print_speed = 70
-perimeters = 3
-fill_pattern = grid
-
-[print:0.24mm 0.4 nozzle COARSE QUALITY @PREDATOR]
-inherits = *common predator 0.4 nozzle coarse*; *common predator quality*
-layer_height = 0.24
-max_print_speed = 70
-perimeters = 3
-fill_pattern = grid
-
-[print:0.32mm 0.4 nozzle DETAILED QUALITY @PREDATOR]
-inherits = *common predator 0.4 nozzle detailed*; *common predator quality*
-layer_height = 0.32
-max_print_speed = 70
-perimeters = 3
-fill_pattern = grid
-
-[print:0.32mm 0.4 nozzle COARSE QUALITY @PREDATOR]
-inherits = *common predator 0.4 nozzle coarse*; *common predator quality*
-layer_height = 0.32
-max_print_speed = 70
-perimeters = 3
-fill_pattern = grid
-
-[print:0.16mm 0.6 nozzle DETAILED QUALITY @PREDATOR]
-inherits = *common predator 0.6 nozzle detailed*; *common predator quality*
-layer_height = 0.16
-max_print_speed = 70
-perimeters = 2
-fill_pattern = gyroid
-
-[print:0.16mm 0.6 nozzle DETAILED SPEED @PREDATOR]
-inherits = *common predator 0.6 nozzle detailed*; *common predator speed*
-layer_height = 0.16
-max_print_speed = 80
-perimeters = 2
-fill_pattern = gyroid
-
-[print:0.16mm 0.6 nozzle COARSE QUALITY @PREDATOR]
-inherits = *common predator 0.6 nozzle coarse*; *common predator quality*
-layer_height = 0.16
-max_print_speed = 70
-perimeters = 2
-fill_pattern = gyroid
-
-[print:0.16mm 0.6 nozzle COARSE SPEED @PREDATOR]
-inherits = *common predator 0.6 nozzle coarse*; *common predator speed*
-layer_height = 0.16
-max_print_speed = 80
-perimeters = 2
-fill_pattern = gyroid
-
-[print:0.24mm 0.6 nozzle DETAILED QUALITY @PREDATOR]
-inherits = *common predator 0.6 nozzle detailed*; *common predator quality*
-layer_height = 0.24
-max_print_speed = 70
-perimeters = 2
-fill_pattern = gyroid
-
-[print:0.24mm 0.6 nozzle DETAILED SPEED @PREDATOR]
-inherits = *common predator 0.6 nozzle detailed*; *common predator speed*
-layer_height = 0.24
-max_print_speed = 80
-perimeters = 2
-fill_pattern = gyroid
-
-[print:0.24mm 0.6 nozzle COARSE QUALITY @PREDATOR]
-inherits = *common predator 0.6 nozzle coarse*; *common predator quality*
-layer_height = 0.24
-max_print_speed = 70
-perimeters = 2
-fill_pattern = gyroid
-
-[print:0.24mm 0.6 nozzle COARSE SPEED @PREDATOR]
-inherits = *common predator 0.6 nozzle coarse*; *common predator speed*
-layer_height = 0.24
-max_print_speed = 80
-perimeters = 2
-fill_pattern = gyroid
-
-[print:0.32mm 0.6 nozzle DETAILED QUALITY @PREDATOR]
-inherits = *common predator 0.6 nozzle detailed*; *common predator quality*
-layer_height = 0.32
-max_print_speed = 70
-perimeters = 2
-fill_pattern = gyroid
-
-[print:0.32mm 0.6 nozzle DETAILED SPEED @PREDATOR]
-inherits = *common predator 0.6 nozzle detailed*; *common predator speed*
-layer_height = 0.32
-max_print_speed = 80
-perimeters = 2
-fill_pattern = gyroid
-
-[print:0.32mm 0.6 nozzle COARSE QUALITY @PREDATOR]
-inherits = *common predator 0.6 nozzle coarse*; *common predator quality*
-layer_height = 0.32
-max_print_speed = 70
-perimeters = 2
-fill_pattern = gyroid
-
-[print:0.32mm 0.6 nozzle COARSE SPEED @PREDATOR]
-inherits = *common predator 0.6 nozzle coarse*; *common predator speed*
-layer_height = 0.32
-max_print_speed = 80
-perimeters = 2
-fill_pattern = gyroid
-
-[print:0.4mm 0.6 nozzle DETAILED QUALITY @PREDATOR]
-inherits = *common predator 0.6 nozzle detailed*; *common predator quality*
-layer_height = 0.4
-max_print_speed = 70
-perimeters = 2
-fill_pattern = gyroid
-
-[print:0.4mm 0.6 nozzle DETAILED SPEED @PREDATOR]
-inherits = *common predator 0.6 nozzle detailed*; *common predator speed*
-layer_height = 0.4
-max_print_speed = 80
-perimeters = 2
-fill_pattern = gyroid
-
-[print:0.4mm 0.6 nozzle COARSE QUALITY @PREDATOR]
-inherits = *common predator 0.6 nozzle coarse*; *common predator quality*
-layer_height = 0.4
-max_print_speed = 70
-perimeters = 2
-fill_pattern = gyroid
-
-[print:0.4mm 0.6 nozzle COARSE SPEED @PREDATOR]
-inherits = *common predator 0.6 nozzle coarse*; *common predator speed*
-layer_height = 0.4
-max_print_speed = 80
-perimeters = 2
-fill_pattern = gyroid
-
-[print:0.24mm 0.8 nozzle DETAILED QUALITY @PREDATOR]
-inherits = *common predator 0.8 nozzle detailed*; *common predator quality*
-layer_height = 0.24
-max_print_speed = 80
-perimeters = 2
-fill_pattern = gyroid
-
-[print:0.24mm 0.8 nozzle DETAILED SPEED @PREDATOR]
-inherits = *common predator 0.8 nozzle detailed*; *common predator speed*
-layer_height = 0.24
-max_print_speed = 90
-perimeters = 2
-fill_pattern = gyroid
-
-[print:0.24mm 0.8 nozzle COARSE QUALITY @PREDATOR]
-inherits = *common predator 0.8 nozzle coarse*; *common predator quality*
-layer_height = 0.24
-max_print_speed = 80
-perimeters = 2
-fill_pattern = gyroid
-
-[print:0.24mm 0.8 nozzle COARSE SPEED @PREDATOR]
-inherits = *common predator 0.8 nozzle coarse*; *common predator speed*
-layer_height = 0.24
-max_print_speed = 90
-perimeters = 2
-fill_pattern = gyroid
-
-[print:0.32mm 0.8 nozzle DETAILED QUALITY @PREDATOR]
-inherits = *common predator 0.8 nozzle detailed*; *common predator quality*
-layer_height = 0.32
-max_print_speed = 80
-perimeters = 2
-fill_pattern = gyroid
-
-[print:0.32mm 0.8 nozzle DETAILED SPEED @PREDATOR]
-inherits = *common predator 0.8 nozzle detailed*; *common predator speed*
-layer_height = 0.32
-max_print_speed = 90
-perimeters = 2
-fill_pattern = gyroid
-
-[print:0.32mm 0.8 nozzle COARSE QUALITY @PREDATOR]
-inherits = *common predator 0.8 nozzle coarse*; *common predator quality*
-layer_height = 0.32
-max_print_speed = 80
-perimeters = 2
-fill_pattern = gyroid
-
-[print:0.32mm 0.8 nozzle COARSE SPEED @PREDATOR]
-inherits = *common predator 0.8 nozzle coarse*; *common predator speed*
-layer_height = 0.32
-max_print_speed = 90
-perimeters = 2
-fill_pattern = gyroid
-
-[print:0.4mm 0.8 nozzle DETAILED QUALITY @PREDATOR]
-inherits = *common predator 0.8 nozzle detailed*; *common predator quality*
-layer_height = 0.4
-max_print_speed = 80
-perimeters = 2
-fill_pattern = gyroid
-
-[print:0.4mm 0.8 nozzle DETAILED SPEED @PREDATOR]
-inherits = *common predator 0.8 nozzle detailed*; *common predator speed*
-layer_height = 0.4
-max_print_speed = 90
-perimeters = 2
-fill_pattern = gyroid
-
-[print:0.4mm 0.8 nozzle COARSE QUALITY @PREDATOR]
-inherits = *common predator 0.8 nozzle coarse*; *common predator quality*
-layer_height = 0.4
-max_print_speed = 80
-perimeters = 2
-fill_pattern = gyroid
-
-[print:0.4mm 0.8 nozzle COARSE SPEED @PREDATOR]
-inherits = *common predator 0.8 nozzle coarse*; *common predator speed*
-layer_height = 0.4
-max_print_speed = 90
-perimeters = 2
-fill_pattern = gyroid
-
-[print:0.48mm 0.8 nozzle DETAILED QUALITY @PREDATOR]
-inherits = *common predator 0.8 nozzle detailed*; *common predator quality*
-layer_height = 0.48
-max_print_speed = 80
-perimeters = 2
-fill_pattern = gyroid
-
-[print:0.48mm 0.8 nozzle DETAILED SPEED @PREDATOR]
-inherits = *common predator 0.8 nozzle detailed*; *common predator speed*
-layer_height = 0.48
-max_print_speed = 90
-perimeters = 2
-fill_pattern = gyroid
-
-[print:0.48mm 0.8 nozzle COARSE QUALITY @PREDATOR]
-inherits = *common predator 0.8 nozzle coarse*; *common predator quality*
-layer_height = 0.48
-max_print_speed = 80
-perimeters = 2
-fill_pattern = gyroid
-
-[print:0.48mm 0.8 nozzle COARSE SPEED @PREDATOR]
-inherits = *common predator 0.8 nozzle coarse*; *common predator speed*
-layer_height = 0.48
-max_print_speed = 90
-perimeters = 2
-fill_pattern = gyroid
-
-#########################################
-########### end print presets ###########
-#########################################
-
-#########################################
-######## begin filament presets #########
-#########################################
-
-# Common filament preset
-[filament:*common predator*]
-cooling = 0
-compatible_printers =
-extrusion_multiplier = 1
-filament_cost = 0
-filament_density = 0
-filament_diameter = 1.75
-filament_notes = ""
-filament_settings_id = ""
-filament_soluble = 0
-min_print_speed = 15
-slowdown_below_layer_time = 20
-compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_ANYCUBIC.*/ and printer_notes=~/.*PRINTER_MODEL_PREDATOR.*/
-
-[filament:*PLA predator*]
-inherits = *common predator*
-bed_temperature = 60
-fan_below_layer_time = 100
-filament_colour = #FF3232
-filament_max_volumetric_speed = 10
-filament_type = PLA
-filament_density = 1.24
-filament_cost = 20
-first_layer_bed_temperature = 60
-first_layer_temperature = 200
-fan_always_on = 1
-cooling = 1
-max_fan_speed = 100
-min_fan_speed = 100
-bridge_fan_speed = 100
-disable_fan_first_layers = 1
-temperature = 200
-
-[filament:*PET predator*]
-inherits = *common predator*
-bed_temperature = 70
-cooling = 1
-disable_fan_first_layers = 3
-fan_below_layer_time = 20
-filament_colour = #FF8000
-filament_max_volumetric_speed = 8
-filament_type = PETG
-filament_density = 1.27
-filament_cost = 30
-first_layer_bed_temperature =70
-first_layer_temperature = 240
-fan_always_on = 1
-max_fan_speed = 50
-min_fan_speed = 20
-bridge_fan_speed = 100
-temperature = 240
-
-[filament:*ABS predator*]
-inherits = *common predator*
-bed_temperature = 100
-cooling = 0
-disable_fan_first_layers = 3
-fan_below_layer_time = 20
-filament_colour = #3A80CA
-filament_max_volumetric_speed = 10
-filament_type = ABS
-filament_density = 1.04
-filament_cost = 20
-first_layer_bed_temperature = 100
-first_layer_temperature = 245
-fan_always_on = 0
-max_fan_speed = 0
-min_fan_speed = 0
-bridge_fan_speed = 30
-top_fan_speed = 0
-temperature = 245
-
-[filament:Generic PLA @PREDATOR]
-inherits = *PLA predator*
-filament_vendor = Generic
-
-[filament:Generic PETG @PREDATOR]
-inherits = *PET predator*
-filament_vendor = Generic
-
-[filament:Generic ABS @PREDATOR]
-inherits = *ABS predator*
-filament_vendor = Generic
-
-#########################################
-######### end filament presets ##########
-#########################################
-
-#########################################
-######### begin printer presets #########
-#########################################
-
-# Anycubic predator common printer preset
-[printer:*common predator*]
-printer_vendor = Anycubic
-printer_model = Predator
-printer_technology = FFF
-printer_variant = 0.4
-thumbnails = 16x16,220x124
-bed_shape = 188.779x16.516,186.621x32.9063,183.043x49.0462,178.072x64.8128,171.745x80.0862,164.112x94.75,155.229x108.693,145.165x121.808,133.997x133.997,121.808x145.165,108.693x155.229,94.75x164.112,80.0862x171.745,64.8128x178.072,49.0462x183.043,32.9063x186.621,16.516x188.779,1.16035e-14x189.5,-16.516x188.779,-32.9063x186.621,-49.0462x183.043,-64.8128x178.072,-80.0862x171.745,-94.75x164.112,-108.693x155.229,-121.808x145.165,-133.997x133.997,-145.165x121.808,-155.229x108.693,-164.112x94.75,-171.745x80.0862,-178.072x64.8128,-183.043x49.0462,-186.621x32.9063,-188.779x16.516,-189.5x2.32071e-14,-188.779x-16.516,-186.621x-32.9063,-183.043x-49.0462,-178.072x-64.8128,-171.745x-80.0862,-164.112x-94.75,-155.229x-108.693,-145.165x-121.808,-133.997x-133.997,-121.808x-145.165,-108.693x-155.229,-94.75x-164.112,-80.0862x-171.745,-64.8128x-178.072,-49.0462x-183.043,-32.9063x-186.621,-16.516x-188.779,-3.48106e-14x-189.5,16.516x-188.779,32.9063x-186.621,49.0462x-183.043,64.8128x-178.072,80.0862x-171.745,94.75x-164.112,108.693x-155.229,121.808x-145.165,133.997x-133.997,145.165x-121.808,155.229x-108.693,164.112x-94.75,171.745x-80.0862,178.072x-64.8128,183.043x-49.0462,186.621x-32.9063,188.779x-16.516,189.5x-4.64141e-14
-max_print_height = 445
-z_offset = 0
-single_extruder_multi_material = 0
-gcode_flavor = reprap
-silent_mode = 0
-remaining_times = 0
-use_relative_e_distances = 0
-use_firmware_retraction = 0
-use_volumetric_e = 0
-variable_layer_height = 1
-start_gcode = ; start_gcode | start\n\n; v11 2020-11-14_11-27 tillverka\n\n; set metric values\n\nG21\n\n; use absolute positioning\n\nG90\n\n; set extruder to absolute mode\n\nM82\n\n; start with fan off\n\nM107\n\n; set temps\n\nM104 S[first_layer_temperature]\nM140 S[first_layer_bed_temperature]\n\n; home xy\n\nG28 X0 Y0\n\n; home z\n\nG28 Z0\n\n; move the head down to Z 94mm\n\nG1 Z94.0 F2394\n\n; set and wait for temps\n\nM109 S[first_layer_temperature]\nM190 S[first_layer_bed_temperature]\n\n; zero the extruded length\n\nG92 E0\n\n; extrude 3mm of feed stock\n\nG1 F200 E3\n\n; zero the extruded length again\n\nG92 E0\n\n; set speed\n\nG1 F{travel_speed}\n\n; print preskirt\n\nG92 E0\nG1 E3.94000 F2520.00000\n\nG1 X125.464 Y-139.310\nG1 Z0.329 F3994.000\n\nG1 F994.000\n\nG1 X125.464 Y-139.310 E4.19679\nG1 X130.218 Y-134.876 E4.70359\nG1 X132.569 Y-132.567 E4.96053\nG1 X137.099 Y-127.877 E5.46890\nG1 X139.325 Y-125.447 E5.72585\nG1 X141.507 Y-122.981 E5.98254\nG1 X145.685 Y-118.002 E6.48934\nG1 X149.741 Y-112.810 E7.00296\nG1 X153.561 Y-107.552 E7.50975\nG1 X155.440 Y-104.819 E7.76827\nG1 X158.980 Y-99.367 E8.27506\nG1 X160.702 Y-96.558 E8.53201\nG1 X163.962 Y-90.911 E9.04038\nG1 X165.535 Y-88.015 E9.29732\nG1 X168.496 Y-82.205 E9.80570\nG1 X169.915 Y-79.231 E10.06264\nG1 X171.280 Y-76.235 E10.31934\nG1 X173.819 Y-70.251 E10.82613\nG1 X176.180 Y-64.101 E11.33975\nG1 X178.297 Y-57.955 E11.84654\nG1 X179.294 Y-54.793 E12.10507\nG1 X181.085 Y-48.544 E12.61186\nG1 X181.911 Y-45.354 E12.86880\nG1 X183.378 Y-39.001 E13.37718\nG1 X184.035 Y-35.771 E13.63412\nG1 X185.168 Y-29.350 E14.14250\nG1 X185.655 Y-26.091 E14.39944\nG1 X186.084 Y-22.826 E14.65614\nG1 X186.764 Y-16.362 E15.16293\nG1 X187.223 Y-9.790 E15.67655\nG1 X187.450 Y-3.294 E16.18334\nG1 X187.479 Y0.002 E16.44028\nG1 X187.450 Y3.294 E16.69698\nG1 X187.223 Y9.810 E17.20529\nG1 X187.021 Y13.100 E17.46229\nG1 X186.454 Y19.575 E17.96909\nG1 X186.079 Y22.870 E18.22761\nG1 X185.174 Y29.307 E18.73440\nG1 X184.031 Y35.794 E19.24802\nG1 X182.679 Y42.152 E19.75481\nG1 X181.910 Y45.357 E20.01176\nG1 X180.223 Y51.655 E20.52013\nG1 X179.287 Y54.815 E20.77708\nG1 X177.272 Y61.017 E21.28545\nG1 X176.172 Y64.123 E21.54239\nG1 X175.019 Y67.207 E21.79909\nG1 X172.584 Y73.234 E22.30588\nG1 X169.905 Y79.252 E22.81950\nG1 X167.055 Y85.094 E23.32629\nG1 X165.524 Y88.035 E23.58482\nG1 X162.373 Y93.721 E24.09161\nG1 X160.700 Y96.560 E24.34855\nG1 X157.245 Y102.090 E24.85693\nG1 X155.427 Y104.838 E25.11387\nG1 X151.687 Y110.180 E25.62225\nG1 X149.727 Y112.829 E25.87919\nG1 X147.722 Y115.441 E26.13588\nG1 X143.631 Y120.493 E26.64268\nG1 X139.310 Y125.464 E27.15629\nG1 X134.876 Y130.218 E27.66309\nG1 X132.567 Y132.569 E27.92003\nG1 X127.877 Y137.099 E28.42840\nG1 X125.447 Y139.325 E28.68535\nG1 X122.981 Y141.507 E28.94204\nG1 X118.002 Y145.685 E29.44883\nG1 X112.810 Y149.741 E29.96245\nG1 X107.552 Y153.561 E30.46924\nG1 X104.819 Y155.440 E30.72777\nG1 X99.367 Y158.980 E31.23456\nG1 X96.558 Y160.702 E31.49151\nG1 X90.911 Y163.962 E31.99988\nG1 X88.015 Y165.535 E32.25682\nG1 X82.205 Y168.496 E32.76520\nG1 X79.231 Y169.915 E33.02214\nG1 X76.235 Y171.280 E33.27884\nG1 X70.251 Y173.819 E33.78563\nG1 X64.101 Y176.180 E34.29925\nG1 X57.955 Y178.297 E34.80604\nG1 X54.793 Y179.294 E35.06457\nG1 X48.544 Y181.085 E35.57136\nG1 X45.354 Y181.911 E35.82830\nG1 X39.001 Y183.378 E36.33668\nG1 X35.771 Y184.035 E36.59362\nG1 X29.350 Y185.168 E37.10200\nG1 X26.091 Y185.655 E37.35894\nG1 X22.826 Y186.084 E37.61563\nG1 X16.362 Y186.764 E38.12242\nG1 X9.790 Y187.223 E38.63605\nG1 X3.294 Y187.450 E39.14283\nG1 X-0.002 Y187.479 E39.39978\nG1 X-3.294 Y187.450 E39.65648\nG1 X-9.810 Y187.223 E40.16479\nG1 X-13.100 Y187.021 E40.42179\nG1 X-19.575 Y186.454 E40.92858\nG1 X-22.870 Y186.079 E41.18711\nG1 X-29.307 Y185.174 E41.69390\nG1 X-35.794 Y184.031 E42.20752\nG1 X-42.152 Y182.679 E42.71431\nG1 X-45.357 Y181.910 E42.97126\nG1 X-51.655 Y180.223 E43.47963\nG1 X-54.815 Y179.287 E43.73657\nG1 X-61.017 Y177.272 E44.24495\nG1 X-64.123 Y176.172 E44.50189\nG1 X-67.207 Y175.019 E44.75859\nG1 X-73.234 Y172.584 E45.26538\nG1 X-79.252 Y169.905 E45.77900\nG1 X-85.094 Y167.055 E46.28579\nG1 X-88.035 Y165.524 E46.54432\nG1 X-93.721 Y162.373 E47.05111\nG1 X-96.560 Y160.700 E47.30805\nG1 X-102.090 Y157.245 E47.81643\nG1 X-104.838 Y155.427 E48.07337\nG1 X-110.180 Y151.687 E48.58174\nG1 X-112.829 Y149.727 E48.83869\nG1 X-115.441 Y147.722 E49.09538\nG1 X-120.493 Y143.631 E49.60218\nG1 X-125.464 Y139.310 E50.11579\nG1 X-130.218 Y134.876 E50.62259\nG1 X-132.569 Y132.567 E50.87953\nG1 X-137.099 Y127.877 E51.38790\nG1 X-139.325 Y125.447 E51.64485\nG1 X-141.507 Y122.981 E51.90154\nG1 X-145.685 Y118.002 E52.40833\nG1 X-149.741 Y112.810 E52.92195\nG1 X-153.561 Y107.552 E53.42874\nG1 X-155.440 Y104.819 E53.68727\nG1 X-158.980 Y99.367 E54.19406\nG1 X-160.702 Y96.558 E54.45101\nG1 X-163.962 Y90.911 E54.95938\nG1 X-165.535 Y88.015 E55.21632\nG1 X-168.496 Y82.205 E55.72470\nG1 X-169.915 Y79.231 E55.98164\nG1 X-171.280 Y76.235 E56.23834\nG1 X-173.819 Y70.251 E56.74513\nG1 X-176.180 Y64.101 E57.25875\nG1 X-178.297 Y57.955 E57.76554\nG1 X-179.294 Y54.793 E58.02407\nG1 X-181.085 Y48.544 E58.53086\nG1 X-181.911 Y45.354 E58.78780\nG1 X-183.378 Y39.001 E59.29618\nG1 X-184.035 Y35.771 E59.55312\nG1 X-185.168 Y29.350 E60.06149\nG1 X-185.655 Y26.091 E60.31844\nG1 X-186.084 Y22.826 E60.57513\nG1 X-186.764 Y16.362 E61.08192\nG1 X-187.223 Y9.790 E61.59554\nG1 X-187.450 Y3.294 E62.10233\nG1 X-187.479 Y-0.002 E62.35928\nG1 X-187.450 Y-3.294 E62.61598\nG1 X-187.223 Y-9.810 E63.12429\nG1 X-187.021 Y-13.100 E63.38129\nG1 X-186.454 Y-19.575 E63.88808\nG1 X-186.079 Y-22.870 E64.14661\nG1 X-185.174 Y-29.307 E64.65340\nG1 X-184.031 Y-35.794 E65.16702\nG1 X-182.679 Y-42.152 E65.67381\nG1 X-181.910 Y-45.357 E65.93076\nG1 X-180.223 Y-51.655 E66.43913\nG1 X-179.287 Y-54.815 E66.69607\nG1 X-177.272 Y-61.017 E67.20445\nG1 X-176.172 Y-64.123 E67.46139\nG1 X-175.019 Y-67.207 E67.71809\nG1 X-172.584 Y-73.234 E68.22488\nG1 X-169.905 Y-79.252 E68.73850\nG1 X-167.055 Y-85.094 E69.24529\nG1 X-165.524 Y-88.035 E69.50382\nG1 X-162.373 Y-93.721 E70.01061\nG1 X-160.700 Y-96.560 E70.26755\nG1 X-157.245 Y-102.090 E70.77593\nG1 X-155.427 Y-104.838 E71.03287\nG1 X-151.687 Y-110.180 E71.54124\nG1 X-149.727 Y-112.829 E71.79819\nG1 X-147.722 Y-115.441 E72.05488\nG1 X-143.631 Y-120.493 E72.56167\nG1 X-139.310 Y-125.464 E73.07529\nG1 X-134.876 Y-130.218 E73.58209\nG1 X-132.567 Y-132.569 E73.83903\nG1 X-127.877 Y-137.099 E74.34740\nG1 X-125.447 Y-139.325 E74.60435\nG1 X-122.981 Y-141.507 E74.86104\nG1 X-118.002 Y-145.685 E75.36783\nG1 X-112.810 Y-149.741 E75.88145\nG1 X-107.552 Y-153.561 E76.38824\nG1 X-104.819 Y-155.440 E76.64677\nG1 X-99.367 Y-158.980 E77.15356\nG1 X-96.558 Y-160.702 E77.41051\nG1 X-90.911 Y-163.962 E77.91888\nG1 X-88.015 Y-165.535 E78.17582\nG1 X-82.205 Y-168.496 E78.68420\nG1 X-79.231 Y-169.915 E78.94114\nG1 X-76.235 Y-171.280 E79.19784\nG1 X-70.251 Y-173.819 E79.70463\nG1 X-64.101 Y-176.180 E80.21825\nG1 X-57.955 Y-178.297 E80.72504\nG1 X-54.793 Y-179.294 E80.98356\nG1 X-48.544 Y-181.085 E81.49036\nG1 X-45.354 Y-181.911 E81.74730\nG1 X-39.001 Y-183.378 E82.25568\nG1 X-35.771 Y-184.035 E82.51262\nG1 X-29.350 Y-185.168 E83.02099\nG1 X-26.091 Y-185.655 E83.27794\nG1 X-22.826 Y-186.084 E83.53463\nG1 X-16.362 Y-186.764 E84.04142\nG1 X-9.790 Y-187.223 E84.55504\nG1 X-3.294 Y-187.450 E85.06183\nG1 X0.006 Y-187.479 E85.31908\nG1 X6.521 Y-187.366 E85.82715\nG1 X9.810 Y-187.223 E86.08379\nG1 X13.100 Y-187.021 E86.34079\nG1 X19.575 Y-186.454 E86.84758\nG1 X22.870 Y-186.079 E87.10611\nG1 X29.307 Y-185.174 E87.61290\nG1 X35.794 Y-184.031 E88.12652\nG1 X42.152 Y-182.679 E88.63331\nG1 X45.357 Y-181.910 E88.89025\nG1 X51.655 Y-180.223 E89.39863\nG1 X54.815 Y-179.287 E89.65557\nG1 X61.017 Y-177.272 E90.16395\nG1 X64.123 Y-176.172 E90.42089\nG1 X67.207 Y-175.019 E90.67759\nG1 X73.234 Y-172.584 E91.18438\nG1 X79.252 Y-169.905 E91.69800\nG1 X85.094 Y-167.055 E92.20479\nG1 X88.035 Y-165.524 E92.46332\nG1 X93.721 Y-162.373 E92.97011\nG1 X96.560 Y-160.700 E93.22705\nG1 X102.090 Y-157.245 E93.73543\nG1 X104.838 Y-155.427 E93.99237\nG1 X110.180 Y-151.687 E94.50074\nG1 X112.829 Y-149.727 E94.75768\nG1 X115.441 Y-147.722 E95.01438\nG1 X120.493 Y-143.631 E95.52117\nG1 X122.911 Y-141.529 E95.77098\n\n; end preskirt\n; start_gcode | end
-end_gcode = ; end_gcode | start\n\n; v11 2020-11-14_11-27 tillverka\n\n; use relative positioning\n\nG91\n\n; retract the filament a bit before lifting the nozzle to release some of the pressure\n\nG1 E-1 F300\n\n; home\n\nG28\n\n; use absolute positioning\n\nG90\n\n; cooldown\n\nM104 S0\nM140 S0\n\n; end_gcode | end\n
-before_layer_gcode =
-layer_gcode =
-toolchange_gcode =
-between_objects_gcode =
-retract_length = 4
-retract_lift = 0.3
-retract_lift_above = 0
-retract_lift_below = 449
-retract_speed = 30
-deretract_speed = 0
-retract_restart_extra = 0
-retract_before_travel = 2
-retract_layer_change = 1
-wipe = 1
-retract_before_wipe = 70%
-retract_length_toolchange = 10
-retract_restart_extra_toolchange = 0
-extruder_colour = #1193FF
-machine_max_acceleration_e = 3000
-machine_max_acceleration_extruding = 1000
-machine_max_acceleration_retracting = 1000
-machine_max_acceleration_x = 1500
-machine_max_acceleration_y = 1500
-machine_max_acceleration_z = 1500
-machine_max_feedrate_e = 60
-machine_max_feedrate_x = 200
-machine_max_feedrate_y = 200
-machine_max_feedrate_z = 200
-machine_max_jerk_e = 5
-machine_max_jerk_x = 5
-machine_max_jerk_y = 5
-machine_max_jerk_z = 5
-machine_min_extruding_rate = 0
-machine_min_travel_rate = 0
-printer_settings_id =
-printer_notes = Do not remove the following keywords! These keywords are used in the "compatible printer" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_VENDOR_ANYCUBIC\nPRINTER_MODEL_PREDATOR\nPRINTER_HAS_BOWDEN\n
-default_filament_profile = Generic PLA @PREDATOR
-
-[printer:Anycubic Predator 0.4 nozzle]
-inherits = *common predator*
-printer_model = PREDATOR
-printer_variant = 0.4
-nozzle_diameter = 0.4
-min_layer_height = 0.08
-max_layer_height = 0.32
-default_print_profile = 0.16mm 0.4 nozzle DETAILED QUALITY @PREDATOR
-
-[printer:Anycubic Predator 0.6 nozzle]
-inherits = *common predator*
-printer_model = PREDATOR
-printer_variant = 0.6
-nozzle_diameter = 0.6
-min_layer_height = 0.12
-max_layer_height = 0.4
-default_print_profile = 0.24mm 0.8 nozzle DETAILED QUALITY @PREDATOR
-
-[printer:Anycubic Predator 0.8 nozzle]
-inherits = *common predator*
-printer_model = PREDATOR
-printer_variant = 0.8
-nozzle_diameter = 0.8
-min_layer_height = 0.16
-max_layer_height = 0.48
-default_print_profile = 0.24mm 0.8 nozzle DETAILED QUALITY @PREDATOR
-
-#########################################
-########## end printer presets ##########
-#########################################
-======= # Print profiles for the Anycubic printers. [vendor] @@ -3795,4 +1898,3 @@ default_print_profile = 0.24mm 0.8 nozzle DETAILED QUALITY @PREDATOR ######################################### ########## end printer presets ########## ######################################### ->>>>>>> master diff --git a/resources/profiles/Artillery.idx b/resources/profiles/Artillery.idx index b66511192..181f667e5 100644 --- a/resources/profiles/Artillery.idx +++ b/resources/profiles/Artillery.idx @@ -1,11 +1,7 @@ -<<<<<<< HEAD -min_slic3r_version = 2.3.1-beta
-======= min_slic3r_version = 2.4.1-alpha0
0.0.5 Added Artillery Hornet
min_slic3r_version = 2.3.1-beta
0.0.4 Fixed first layer height in 0.28mm profile.
->>>>>>> master 0.0.3 Fixed Genius bed size.
0.0.2 Updated start g-code.
0.0.1 Initial Artillery bundle
diff --git a/resources/profiles/Artillery.ini b/resources/profiles/Artillery.ini index 8827c890a..734c584ef 100644 --- a/resources/profiles/Artillery.ini +++ b/resources/profiles/Artillery.ini @@ -1,16 +1,10 @@ ############### # AUTHOR: Szabolcs Hornyak / design85@gmail.com # https://szabolcs.eu/2020/12/29/prusaslicer-sw-x1-genius/ -<<<<<<< HEAD -# Tested with PrusaSlicer 2.2, 2.3 -############### - -======= ############### ## Artillery Hornet printer profile is based on PR https://github.com/slic3r/slic3r-profiles/pull/14 created by https://github.com/newbeetle ->>>>>>> master # Print profiles for the Artillery printers. [vendor] @@ -18,11 +12,7 @@ name = Artillery # Configuration version of this file. Config file will only be installed, if the config_version differs. # This means, the server may force the PrusaSlicer configuration to be downgraded. -<<<<<<< HEAD -config_version = 0.0.3 -======= config_version = 0.0.5 ->>>>>>> master # Where to get the updates from? config_update_url = https://files.prusa3d.com/wp-content/uploads/repository/PrusaSlicer-settings-master/live/Artillery/ # changelog_url = https://files.prusa3d.com/?latest=slicer-profiles&lng=%1% @@ -36,11 +26,7 @@ config_update_url = https://files.prusa3d.com/wp-content/uploads/repository/Prus ############# [printer_model:X1] -<<<<<<< HEAD -name = Sidewinder X1 -======= name = Artillery Sidewinder X1 ->>>>>>> master variants = 0.4 technology = FFF bed_model = bed-x1.stl @@ -48,19 +34,13 @@ bed_texture = bed-x1.png default_materials = Generic PLA @Artillery; Generic ABS @Artillery; Generic PETG @Artillery; Generic TPU @Artillery [printer_model:Genius] -<<<<<<< HEAD -name = Genius -======= name = Artillery Genius ->>>>>>> master variants = 0.4 technology = FFF bed_model = bed-genius.stl bed_texture = bed-genius.png default_materials = Generic PLA @Artillery; Generic ABS @Artillery; Generic PETG @Artillery; Generic TPU @Artillery -<<<<<<< HEAD -======= [printer_model:Hornet] name = Artillery Hornet variants = 0.4 @@ -69,7 +49,6 @@ bed_model = bed-hornet.stl bed_texture = bed-hornet.png default_materials = Generic PLA @Artillery; Generic ABS @Artillery; Generic PETG @Artillery; Generic TPU @Artillery ->>>>>>> master # Common printer preset [printer:*common*] before_layer_gcode = ;BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0 @@ -83,10 +62,7 @@ extruder_colour = #FFFF00 extruder_offset = 0x0 gcode_flavor = marlin layer_gcode = ;AFTER_LAYER_CHANGE\n;[layer_z] -<<<<<<< HEAD -======= machine_limits_usage = emit_to_gcode ->>>>>>> master machine_max_acceleration_e = 5000,5000 machine_max_acceleration_extruding = 1250,1250 machine_max_acceleration_retracting = 1250,1250 @@ -140,10 +116,6 @@ start_gcode = ; Initial setups\nG90 ; use absolute coordinates\nM83 ; extruder r inherits = *common* start_gcode = ; Initial setups\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM900 K0.12 ; K factor\nM900 W[extrusion_width] H[layer_height] D[filament_diameter]\nM200 D0 ; disable volumetric e\nM220 S100 ; reset speed factor to 100%\nM221 S100 ; reset extrusion rate to 100%\n\n; Set the heating\nM190 S[first_layer_bed_temperature] ; wait for bed to heat up\nM104 S[first_layer_temperature] ; start nozzle heating but don't wait\n\n; Home\nG1 Z3 F3000 ; move z up little to prevent scratching of surface\nG28 ; home all axes\nG1 X3 Y3 F5000 ; move to corner of the bed to avoid ooze over centre\n\n; Wait for final heating\nM109 S[first_layer_temperature] ; wait for the nozzle to heat up\nM190 S[first_layer_bed_temperature] ; wait for the bed to heat up\n\n;Auto bed Leveling\n@BEDLEVELVISUALIZER\nG29 ; ABL T\nM420 S1 Z3 ; reload and fade mesh bed leveling until it reach 3mm Z\n\n; Return to prime position, Prime line routine\nG92 E0 ; Reset Extruder\nG1 Z3 F3000 ; move z up little to prevent scratching of surface\nG1 X10 Y.5 Z0.25 F5000.0 ; Move to start position\nG1 X100 Y.5 Z0.25 F1500.0 E15 ; Draw the first line\nG1 X100 Y.2 Z0.25 F5000.0 ; Move to side a little\nG1 X10 Y.2 Z0.25 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nM221 S{if layer_height<0.075}100{else}95{endif} -<<<<<<< HEAD -[printer:Sidewinder X1] -inherits = *common_STOCK_FW* -======= [printer:*bowden*] inherits = *common_STOCK_FW* retract_length = 5 @@ -161,57 +133,39 @@ default_print_profile = 0.20mm NORMAL @Artillery [printer:Artillery Sidewinder X1] inherits = *common_STOCK_FW* renamed_from = "Sidewinder X1" ->>>>>>> master printer_model = X1 printer_variant = 0.4 bed_shape = 0x0,300x0,300x300,0x300 max_print_height = 400 printer_notes = Don't remove the following keywords! These keywords are used in the "compatible printer" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_VENDOR_Artillery\nPRINTER_MODEL_X1 -<<<<<<< HEAD -[printer:Sidewinder X1 BL-TOUCH] -inherits = *common_UPD_FW* -======= [printer:Artillery Sidewinder X1 BL-TOUCH] inherits = *common_UPD_FW* renamed_from = "Sidewinder X1 BL-TOUCH" ->>>>>>> master printer_model = X1 printer_variant = 0.4 bed_shape = 0x0,300x0,300x300,0x300 max_print_height = 400 printer_notes = Don't remove the following keywords! These keywords are used in the "compatible printer" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_VENDOR_Artillery\nPRINTER_MODEL_X1 -<<<<<<< HEAD -[printer:Genius] -inherits = *common_STOCK_FW* -======= [printer:Artillery Genius] inherits = *common_STOCK_FW* renamed_from = "Genius" ->>>>>>> master printer_model = Genius printer_variant = 0.4 bed_shape = 0x0,220x0,220x220,0x220 max_print_height = 250 printer_notes = Don't remove the following keywords! These keywords are used in the "compatible printer" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_VENDOR_Artillery\nPRINTER_MODEL_Genius -<<<<<<< HEAD -[printer:Genius BL-TOUCH] -inherits = *common_UPD_FW* -======= [printer:Artillery Genius BL-TOUCH] inherits = *common_UPD_FW* renamed_from = "Genius BL-TOUCH" ->>>>>>> master printer_model = Genius printer_variant = 0.4 bed_shape = 0x0,220x0,220x220,0x220 max_print_height = 250 printer_notes = Don't remove the following keywords! These keywords are used in the "compatible printer" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_VENDOR_Artillery\nPRINTER_MODEL_Genius -<<<<<<< HEAD -======= [printer:Artillery Hornet] inherits = *bowden* printer_model = Hornet @@ -221,7 +175,6 @@ max_print_height = 250 machine_limits_usage = time_estimate_only printer_notes = Don't remove the following keywords! These keywords are used in the "compatible printer" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_VENDOR_Artillery\nPRINTER_MODEL_Hornet\nPRINTER_HAS_Bowden ->>>>>>> master ########### ## PRINT ## ########### @@ -384,10 +337,7 @@ top_solid_layers = 4 [print:*0.28mm*] inherits = *common* layer_height = 0.28 -<<<<<<< HEAD -======= first_layer_height = 0.36 ->>>>>>> master top_infill_extrusion_width = 0.45 first_layer_extrusion_width = 0.75 bottom_solid_layers = 3 @@ -395,21 +345,6 @@ top_solid_layers = 4 [print:0.08mm SUPERDETAIL @Artillery] inherits = *0.08mm* -<<<<<<< HEAD -compatible_printers_condition = printer_model=~/(X1|Genius).*/ and nozzle_diameter[0]==0.4 - -[print:0.10mm HIGHDETAIL @Artillery] -inherits = *0.10mm* -compatible_printers_condition = printer_model=~/(X1|Genius).*/ and nozzle_diameter[0]==0.4 - -[print:0.12mm DETAIL @Artillery] -inherits = *0.12mm* -compatible_printers_condition = printer_model=~/(X1|Genius).*/ and nozzle_diameter[0]==0.4 - -[print:0.16mm OPTIMAL @Artillery] -inherits = *0.16mm* -compatible_printers_condition = printer_model=~/(X1|Genius).*/ and nozzle_diameter[0]==0.4 -======= compatible_printers_condition = printer_model=~/(X1|Genius|Hornet).*/ and nozzle_diameter[0]==0.4 [print:0.10mm HIGHDETAIL @Artillery] @@ -423,7 +358,6 @@ compatible_printers_condition = printer_model=~/(X1|Genius|Hornet).*/ and nozzle [print:0.16mm OPTIMAL @Artillery] inherits = *0.16mm* compatible_printers_condition = printer_model=~/(X1|Genius|Hornet).*/ and nozzle_diameter[0]==0.4 ->>>>>>> master [print:0.20mm SLOW @Artillery] inherits = *0.20mm* @@ -437,19 +371,11 @@ solid_infill_speed = 50 top_solid_infill_speed = 25 first_layer_speed = 15 travel_speed = 100 -<<<<<<< HEAD -compatible_printers_condition = printer_model=~/(X1|Genius).*/ and nozzle_diameter[0]==0.4 - -[print:0.20mm NORMAL @Artillery] -inherits = *0.20mm* -compatible_printers_condition = printer_model=~/(X1|Genius).*/ and nozzle_diameter[0]==0.4 -======= compatible_printers_condition = printer_model=~/(X1|Genius|Hornet).*/ and nozzle_diameter[0]==0.4 [print:0.20mm NORMAL @Artillery] inherits = *0.20mm* compatible_printers_condition = printer_model=~/(X1|Genius|Hornet).*/ and nozzle_diameter[0]==0.4 ->>>>>>> master [print:0.20mm SPEED @Artillery] inherits = *0.20mm* @@ -464,17 +390,6 @@ perimeters = 2 solid_infill_speed = 150 top_solid_infill_speed = 50 travel_speed = 170 -<<<<<<< HEAD -compatible_printers_condition = printer_model=~/(X1|Genius).*/ and nozzle_diameter[0]==0.4 - -[print:0.24mm DRAFT @Artillery] -inherits = *0.24mm* -compatible_printers_condition = printer_model=~/(X1|Genius).*/ and nozzle_diameter[0]==0.4 - -[print:0.28mm SUPERDRAFT @Artillery] -inherits = *0.28mm* -compatible_printers_condition = printer_model=~/(X1|Genius).*/ and nozzle_diameter[0]==0.4 -======= compatible_printers_condition = printer_model=~/(X1|Genius|Hornet).*/ and nozzle_diameter[0]==0.4 [print:0.24mm DRAFT @Artillery] @@ -484,7 +399,6 @@ compatible_printers_condition = printer_model=~/(X1|Genius|Hornet).*/ and nozzle [print:0.28mm SUPERDRAFT @Artillery] inherits = *0.28mm* compatible_printers_condition = printer_model=~/(X1|Genius|Hornet).*/ and nozzle_diameter[0]==0.4 ->>>>>>> master ############### ## FILAMENTS ## diff --git a/resources/profiles/Creality.idx b/resources/profiles/Creality.idx index 909b2b92a..f8abfb40a 100644 --- a/resources/profiles/Creality.idx +++ b/resources/profiles/Creality.idx @@ -1,11 +1,8 @@ -<<<<<<< HEAD -======= min_slic3r_version = 2.4.0-rc 0.1.3 Ender-3 S1 improvements. 0.1.2 Added alpha Ender 3 S1 profiles. min_slic3r_version = 2.4.0-beta4 0.1.1 Added Ender 2 Pro ->>>>>>> master min_slic3r_version = 2.3.2-alpha0 0.1.0 Added Ender-7, Sermoon D1, CR-10 SMART min_slic3r_version = 2.3.1-beta diff --git a/resources/profiles/Creality.ini b/resources/profiles/Creality.ini index b50e4294c..381efbe2f 100644 --- a/resources/profiles/Creality.ini +++ b/resources/profiles/Creality.ini @@ -5,11 +5,7 @@ name = Creality # Configuration version of this file. Config file will only be installed, if the config_version differs. # This means, the server may force the PrusaSlicer configuration to be downgraded. -<<<<<<< HEAD -config_version = 0.1.0 -======= config_version = 0.1.3 ->>>>>>> master # Where to get the updates from? config_update_url = https://files.prusa3d.com/wp-content/uploads/repository/PrusaSlicer-settings-master/live/Creality/ # changelog_url = https://files.prusa3d.com/?latest=slicer-profiles&lng=%1% @@ -45,8 +41,6 @@ bed_model = ender3v2_bed.stl bed_texture = ender3v2.svg default_materials = Generic PLA @CREALITY; Generic PETG @CREALITY; Generic ABS @CREALITY; Creality PLA @CREALITY; Prusament PLA @CREALITY; Prusament PETG @CREALITY; AzureFilm PLA @CREALITY; Devil Design PLA @CREALITY; Devil Design PLA Matt @CREALITY; Devil Design PLA Galaxy @CREALITY; Extrudr PLA NX2 @CREALITY; Real Filament PLA @CREALITY; Velleman PLA @CREALITY; 3DJAKE ecoPLA @CREALITY; 3DJAKE ecoPLA Matt @CREALITY; 3DJAKE ecoPLA Tough @CREALITY; 123-3D Jupiter PLA @CREALITY -<<<<<<< HEAD -======= [printer_model:ENDER3S1] name = Creality Ender-3 S1 variants = 0.4 @@ -56,7 +50,6 @@ bed_model = ender3v2_bed.stl bed_texture = ender3v2.svg default_materials = Generic PLA @CREALITY; Generic PETG @CREALITY; Generic ABS @CREALITY; Creality PLA @CREALITY; Prusament PLA @CREALITY; Prusament PETG @CREALITY; AzureFilm PLA @CREALITY; Devil Design PLA @CREALITY; Devil Design PLA Matt @CREALITY; Devil Design PLA Galaxy @CREALITY; Extrudr PLA NX2 @CREALITY; Real Filament PLA @CREALITY; Velleman PLA @CREALITY; 3DJAKE ecoPLA @CREALITY; 3DJAKE ecoPLA Matt @CREALITY; 3DJAKE ecoPLA Tough @CREALITY; 123-3D Jupiter PLA @CREALITY ->>>>>>> master [printer_model:ENDER3MAX] name = Creality Ender-3 Max variants = 0.4 @@ -120,8 +113,6 @@ bed_model = ender2_bed.stl bed_texture = ender2.svg default_materials = Generic PLA @CREALITY; Generic PETG @CREALITY; Generic ABS @CREALITY; Creality PLA @CREALITY; Prusament PLA @CREALITY; Prusament PETG @CREALITY; AzureFilm PLA @CREALITY; Devil Design PLA @CREALITY; Devil Design PLA Matt @CREALITY; Devil Design PLA Galaxy @CREALITY; Extrudr PLA NX2 @CREALITY; Real Filament PLA @CREALITY; Velleman PLA @CREALITY; 3DJAKE ecoPLA @CREALITY; 3DJAKE ecoPLA Matt @CREALITY; 3DJAKE ecoPLA Tough @CREALITY; 123-3D Jupiter PLA @CREALITY -<<<<<<< HEAD -======= [printer_model:ENDER2PRO] name = Creality Ender-2 Pro variants = 0.4 @@ -131,7 +122,6 @@ bed_model = ender2pro_bed.stl bed_texture = ender2pro.svg default_materials = Generic PLA @CREALITY; Generic PETG @CREALITY; Generic ABS @CREALITY; Creality PLA @CREALITY; Prusament PLA @CREALITY; Prusament PETG @CREALITY; AzureFilm PLA @CREALITY; Devil Design PLA @CREALITY; Devil Design PLA Matt @CREALITY; Devil Design PLA Galaxy @CREALITY; Extrudr PLA NX2 @CREALITY; Real Filament PLA @CREALITY; Velleman PLA @CREALITY; 3DJAKE ecoPLA @CREALITY; 3DJAKE ecoPLA Matt @CREALITY; 3DJAKE ecoPLA Tough @CREALITY; 123-3D Jupiter PLA @CREALITY ->>>>>>> master [printer_model:CR5PRO] name = Creality CR-5 Pro variants = 0.4 @@ -381,11 +371,7 @@ notes = overhangs = 0 only_retract_when_crossing_perimeters = 0 ooze_prevention = 0 -<<<<<<< HEAD -output_filename_format = {input_filename_base}_{print_time}_{layer_height}mm_{temperature[0]}C_{filament_type[0]}_{printer_model}.gcode -======= output_filename_format = {input_filename_base}_{print_time}_{digits(layer_height,1,2)}mm_{temperature[0]}C_{filament_type[0]}_{printer_model}.gcode ->>>>>>> master perimeters = 2 perimeter_extruder = 1 perimeter_extrusion_width = 0.45 @@ -923,39 +909,6 @@ start_gcode = G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM140 # Intended for printers with vendor official firmware verified to support M25 [printer:*pauseprint*] pause_print_gcode = M25 ; pause print -<<<<<<< HEAD - -# Intended for printers where the Z-axis lowers the print bed during printing, like the Ender-5 series -[printer:*descendingz*] -end_gcode = {if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+2, max_print_height)} F600{endif} ; Move print bed down\nG1 X50 Y50 F{travel_speed*60} ; move print head out of the way\n{if max_layer_z < max_print_height-10}G1 Z{z_offset+max_print_height-10} F600{endif} ; Move print bed close to the bottom\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors - -# Intended for printers with dual extruders and a single hotend/nozzle, like the CR-X series -[printer:*dualextruder*] -single_extruder_multi_material = 1 -cooling_tube_length = 5 -cooling_tube_retraction = 91.5 -extra_loading_move = -2 -parking_pos_retraction = 92 -deretract_speed = 40,40 -extruder_colour = #FCE94F;#729FCF -extruder_offset = 0x0,0x0 -max_layer_height = 0.28,0.28 -min_layer_height = 0.08,0.08 -nozzle_diameter = 0.4,0.4 -retract_before_travel = 2,2 -retract_before_wipe = 70%,70% -retract_layer_change = 1,1 -retract_length = 5,5 -retract_length_toolchange = 1,1 -retract_lift = 0,0 -retract_lift_above = 0,0 -retract_lift_below = 0,0 -retract_restart_extra = 0,0 -retract_restart_extra_toolchange = 0,0 -retract_speed = 60,60 -wipe = 1,1 - -======= # Intended for printers where the Z-axis lowers the print bed during printing, like the Ender-5 series [printer:*descendingz*] @@ -994,7 +947,6 @@ retract_restart_extra_toolchange = 0,0 retract_speed = 60,60 wipe = 1,1 ->>>>>>> master [printer:Creality Ender-3] inherits = *common* renamed_from = "Creality ENDER-3" @@ -1016,8 +968,6 @@ max_print_height = 250 printer_model = ENDER3V2 printer_notes = Don't remove the following keywords! These keywords are used in the "compatible printer" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_VENDOR_CREALITY\nPRINTER_MODEL_ENDER3V2\nPRINTER_HAS_BOWDEN -<<<<<<< HEAD -======= [printer:Creality Ender-3 S1] inherits = *common*; *spriteextruder* bed_shape = 5x0,215x0,215x220,5x220 @@ -1025,7 +975,6 @@ max_print_height = 270 printer_model = ENDER3S1 printer_notes = Don't remove the following keywords! These keywords are used in the "compatible printer" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_VENDOR_CREALITY\nPRINTER_MODEL_ENDER3S1 ->>>>>>> master [printer:Creality Ender-3 Max] inherits = *common* retract_length = 6 @@ -1085,8 +1034,6 @@ max_print_height = 200 printer_model = ENDER2 printer_notes = Don't remove the following keywords! These keywords are used in the "compatible printer" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_VENDOR_CREALITY\nPRINTER_MODEL_ENDER2\nPRINTER_HAS_BOWDEN -<<<<<<< HEAD -======= [printer:Creality Ender-2 Pro] inherits = *common* renamed_from = "Creality ENDER-2 Pro" @@ -1095,7 +1042,6 @@ max_print_height = 180 printer_model = ENDER2PRO printer_notes = Don't remove the following keywords! These keywords are used in the "compatible printer" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_VENDOR_CREALITY\nPRINTER_MODEL_ENDER2PRO\nPRINTER_HAS_BOWDEN ->>>>>>> master [printer:Creality CR-5 Pro] inherits = *common*; *slowabl*; *descendingz* retract_length = 6 diff --git a/resources/profiles/INAT.idx b/resources/profiles/INAT.idx index 224b76170..a756b34b5 100644 --- a/resources/profiles/INAT.idx +++ b/resources/profiles/INAT.idx @@ -1,9 +1,4 @@ min_slic3r_version = 2.3.1-beta -<<<<<<< HEAD -0.0.1 Initial version -0.0.2 Improved start gcode, changed filename format -======= 0.0.3 Set default filament profile. 0.0.2 Improved start gcode, changed filename format 0.0.1 Initial version ->>>>>>> master diff --git a/resources/profiles/INAT.ini b/resources/profiles/INAT.ini index 588728947..3c1a753b5 100644 --- a/resources/profiles/INAT.ini +++ b/resources/profiles/INAT.ini @@ -3,11 +3,7 @@ [vendor] # Vendor name will be shown by the Config Wizard. name = INAT -<<<<<<< HEAD -config_version = 0.0.2 -======= config_version = 0.0.3 ->>>>>>> master config_update_url = https://files.prusa3d.com/wp-content/uploads/repository/PrusaSlicer-settings-master/live/INAT/ ### @@ -19,20 +15,14 @@ name = INAT Proton X Rail variants = 0.4 technology = FFF family = Proton -<<<<<<< HEAD -======= default_materials = PLA @PROTON_X ->>>>>>> master [printer_model:PROTON_X_ROD] name = INAT Proton X Rod variants = 0.4 technology = FFF family = Proton -<<<<<<< HEAD -======= default_materials = PLA @PROTON_X ->>>>>>> master ### diff --git a/resources/profiles/PrusaResearch.idx b/resources/profiles/PrusaResearch.idx index c7633c257..f90ba8279 100644 --- a/resources/profiles/PrusaResearch.idx +++ b/resources/profiles/PrusaResearch.idx @@ -1,8 +1,3 @@ -<<<<<<< HEAD -min_slic3r_version = 2.3.2-alpha0 -1.3.0 Added SL1S SPEED profiles. -min_slic3r_version = 2.3.0-rc1 -======= min_slic3r_version = 2.4.0-rc 1.4.2 Added SLA material profiles. 1.4.1 Updated firmware version. @@ -39,7 +34,6 @@ min_slic3r_version = 2.3.0-rc1 1.2.10 Added multiple profiles for Filatech filaments. Updated SLA print settings (pad wall slope angle). 1.2.9 Added material profiles for Prusament Resin. 1.2.8 Added multiple add:north and Extrudr filament profiles. ->>>>>>> master 1.2.7 Updated "Prusament PC Blend Carbon Fiber" profile for Prusa MINI. 1.2.6 Added filament profile for "Prusament PC Blend Carbon Fiber". 1.2.5 Updated firmware version. Added filament profiles. Various improvements. @@ -56,10 +50,7 @@ min_slic3r_version = 2.3.0-alpha4 1.2.0-alpha1 Renamed MK3S and MINI printer profiles. Updated end g-code (MINI). Added new SLA materials and filament profiles. 1.2.0-alpha0 Added filament spool weights min_slic3r_version = 2.2.0-alpha3 -<<<<<<< HEAD -======= 1.1.15 Updated firmware version. ->>>>>>> master 1.1.14 Updated firmware version. 1.1.13 Updated firmware version. Updated end g-code in MMU2 printer profiles. 1.1.12 Added Prusament PVB filament profile. Added 0.8mm nozzle profiles. diff --git a/resources/profiles/PrusaResearch.ini b/resources/profiles/PrusaResearch.ini index 720fbfb4b..71a86dde8 100644 --- a/resources/profiles/PrusaResearch.ini +++ b/resources/profiles/PrusaResearch.ini @@ -5,11 +5,7 @@ name = Prusa Research
# Configuration version of this file. Config file will only be installed, if the config_version differs.
# This means, the server may force the PrusaSlicer configuration to be downgraded.
-<<<<<<< HEAD
-config_version = 1.3.0
-=======
config_version = 1.4.2
->>>>>>> master
# Where to get the updates from?
config_update_url = https://files.prusa3d.com/wp-content/uploads/repository/PrusaSlicer-settings-master/live/PrusaResearch/
changelog_url = https://files.prusa3d.com/?latest=slicer-profiles&lng=%1%
@@ -106,11 +102,7 @@ technology = FFF family = MK2
bed_model = mk2_bed.stl
bed_texture = mk2.svg
-<<<<<<< HEAD
-default_materials = Generic PLA; Generic ABS; Generic PETG; Prusament PLA; Prusament PETG; Prusament ASA; Prusament PC Blend @MK2; Prusament PC Blend Carbon Fiber @MK2; Prusament PVB
-=======
default_materials = Generic PLA; Generic ABS; Generic PETG; Prusament PLA; Prusament PETG; Prusament ASA; Prusament PC Blend; Prusament PC Blend Carbon Fiber; Prusament PVB
->>>>>>> master
[printer_model:MK2SMM]
name = Original Prusa i3 MK2S MMU1
@@ -119,11 +111,7 @@ technology = FFF family = MK2
bed_model = mk2_bed.stl
bed_texture = mk2.svg
-<<<<<<< HEAD
-default_materials = Generic PLA; Generic ABS; Generic PETG @MMU1; Prusament PLA; Prusament PETG @MMU1; Prusament ASA; Prusament PC Blend @MK2; Prusament PC Blend Carbon Fiber @MK2; Prusament PVB
-=======
default_materials = Generic PLA; Generic ABS; Generic PETG @MMU1; Prusament PLA; Prusament PETG @MMU1; Prusament ASA; Prusament PC Blend; Prusament PC Blend Carbon Fiber; Prusament PVB
->>>>>>> master
[printer_model:SL1]
name = Original Prusa SL1
@@ -143,15 +131,6 @@ bed_model = sl1s_bed.stl bed_texture = sl1s.svg
default_materials = Prusa Orange Tough @0.05 SL1S; Prusament Resin Tough Prusa Orange @0.05 SL1S
-[printer_model:SL1S]
-name = Original Prusa SL1S SPEED
-variants = default
-technology = SLA
-family = SL1
-bed_model = sl1s_bed.stl
-bed_texture = sl1s.svg
-default_materials = Prusa Orange Tough @0.05 SL1S
-
# All presets starting with asterisk, for example *common*, are intermediate and they will
# not make it into the user interface.
@@ -415,34 +394,8 @@ default_acceleration = 1000 top_solid_min_thickness = 1.2
bottom_solid_min_thickness = 0.8
single_extruder_multi_material_priming = 0
-<<<<<<< HEAD
-
-[print:*0.6nozzleMK3*]
-inherits = *0.6nozzle*
-external_perimeter_extrusion_width = 0.65
-extrusion_width = 0.65
-infill_extrusion_width = 0.65
-bridge_flow_ratio = 0.95
-bridge_speed = 25
-
-[print:*0.6nozzleMINI*]
-inherits = *0.6nozzleMK3*
-infill_extrusion_width = 0.68
-solid_infill_extrusion_width = 0.68
-fill_pattern = gyroid
-fill_density = 15%
-travel_speed = 150
-perimeter_acceleration = 800
-infill_acceleration = 1000
-bridge_acceleration = 1000
-first_layer_acceleration = 1000
-default_acceleration = 1250
-support_material_speed = 40
-support_material_interface_speed = 100%
-=======
thick_bridges = 1
overhangs = 0
->>>>>>> master
[print:*soluble_support*]
overhangs = 1
@@ -489,45 +442,6 @@ support_material_speed = 30 top_solid_infill_speed = 20
top_solid_layers = 15
-<<<<<<< HEAD
-[print:0.05mm ULTRADETAIL]
-inherits = *0.05mm*
-compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK2.*/ and nozzle_diameter[0]==0.4 and num_extruders==1
-infill_extrusion_width = 0.5
-
-# MK3 #
-[print:0.05mm ULTRADETAIL @MK3]
-inherits = *0.05mm*; *MK3*
-fill_pattern = gyroid
-fill_density = 15%
-compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.4 and ! single_extruder_multi_material
-top_infill_extrusion_width = 0.4
-
-# MK2 #
-[print:0.05mm ULTRADETAIL @0.25 nozzle]
-inherits = *0.05mm*; *0.25nozzle*
-compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK2.*/ and nozzle_diameter[0]==0.25 and num_extruders==1
-fill_density = 20%
-infill_speed = 20
-max_print_speed = 100
-perimeter_speed = 20
-small_perimeter_speed = 15
-solid_infill_speed = 20
-support_material_speed = 20
-
-# MK3 #
-[print:0.05mm ULTRADETAIL @0.25 nozzle MK3]
-inherits = *0.05mm*; *0.25nozzle*; *MK3*
-compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.25 and num_extruders==1
-fill_pattern = grid
-fill_density = 20%
-
-# XXXXXXXXXXXXXXXXXXXX
-# XXX--- 0.07mm ---XXX
-# XXXXXXXXXXXXXXXXXXXX
-
-=======
->>>>>>> master
[print:*0.07mm*]
inherits = *0.05mm*
layer_height = 0.07
@@ -536,44 +450,10 @@ bridge_flow_ratio = 1 fill_density = 15%
infill_speed = 40
solid_infill_speed = 40
-<<<<<<< HEAD
-support_material_extrusion_width = 0.33
-support_material_spacing = 1.5
-layer_height = 0.07
-perimeter_acceleration = 300
-perimeter_speed = 30
-perimeters = 3
-=======
->>>>>>> master
support_material_speed = 40
top_solid_infill_speed = 30
top_solid_layers = 11
-<<<<<<< HEAD
-# MK3 #
-[print:0.07mm ULTRADETAIL @MK3]
-inherits = *0.07mm*; *MK3*
-fill_pattern = gyroid
-compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.4 and ! single_extruder_multi_material
-top_infill_extrusion_width = 0.4
-
-[print:0.07mm ULTRADETAIL @0.25 nozzle MK3]
-inherits = *0.07mm*; *0.25nozzle*; *MK3*
-compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.25 and num_extruders==1
-infill_speed = 30
-solid_infill_speed = 30
-support_material_speed = 30
-top_solid_infill_speed = 20
-fill_pattern = grid
-fill_density = 20%
-
-# XXXXXXXXXXXXXXXXXXXX
-# XXX--- 0.10mm ---XXX
-# XXXXXXXXXXXXXXXXXXXX
-
-# MK2 #
-=======
->>>>>>> master
[print:*0.10mm*]
inherits = *common*
bottom_solid_layers = 7
@@ -586,16 +466,9 @@ top_solid_layers = 9 support_material_contact_distance = 0.17
raft_contact_distance = 0.15
-<<<<<<< HEAD
-# MK2 #
-[print:0.10mm DETAIL]
-inherits = *0.10mm*
-compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK2.*/ and nozzle_diameter[0]==0.4 and num_extruders==1
-=======
[print:*0.15mm*]
inherits = *common*
bottom_solid_layers = 5
->>>>>>> master
external_perimeter_speed = 40
infill_acceleration = 2000
infill_speed = 60
@@ -603,56 +476,10 @@ layer_height = 0.15 perimeter_acceleration = 800
perimeter_speed = 50
solid_infill_speed = 50
-<<<<<<< HEAD
-perimeters = 3
-
-# MK3 #
-[print:0.10mm DETAIL @MK3]
-inherits = *0.10mm*; *MK3*
-bridge_speed = 30
-compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.4
-external_perimeter_speed = 25
-infill_acceleration = 1000
-infill_speed = 80
-max_print_speed = 200
-perimeter_speed = 45
-solid_infill_speed = 80
-top_infill_extrusion_width = 0.4
-top_solid_infill_speed = 40
-fill_pattern = gyroid
-fill_density = 15%
-perimeters = 3
-
-# MK2 #
-[print:0.10mm DETAIL @0.25 nozzle]
-inherits = *0.10mm*; *0.25nozzle*
-bridge_acceleration = 600
-compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK2.*/ and nozzle_diameter[0]==0.25
-external_perimeter_speed = 20
-infill_acceleration = 1000
-infill_speed = 40
-perimeter_acceleration = 600
-perimeter_speed = 25
-small_perimeter_speed = 15
-solid_infill_speed = 40
-top_solid_infill_speed = 30
-
-# MK3 #
-[print:0.10mm DETAIL @0.25 nozzle MK3]
-inherits = *0.10mm*; *0.25nozzleMK3*; *MK3*
-compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.25
-fill_pattern = grid
-fill_density = 20%
-
-# XXXXXXXXXXXXXXXXXXXX
-# XXX--- 0.15mm ---XXX
-# XXXXXXXXXXXXXXXXXXXX
-=======
top_infill_extrusion_width = 0.4
top_solid_layers = 7
bridge_flow_ratio = 1
bridge_speed = 25
->>>>>>> master
[print:*0.20mm*]
inherits = *common*
@@ -668,16 +495,9 @@ solid_infill_speed = 50 top_infill_extrusion_width = 0.4
top_solid_layers = 6
-<<<<<<< HEAD
-# MK2 #
-[print:0.15mm 100mms]
-inherits = *0.15mm*
-renamed_from = "0.15mm 100mms Linear Advance"
-=======
[print:*0.25mm*]
inherits = *common*
bottom_solid_layers = 4
->>>>>>> master
bridge_flow_ratio = 0.95
external_perimeter_speed = 40
perimeter_acceleration = 800
@@ -685,59 +505,6 @@ layer_height = 0.25 perimeter_speed = 50
top_solid_layers = 4
-<<<<<<< HEAD
-# MK2 #
-[print:0.15mm OPTIMAL]
-inherits = *0.15mm*
-compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK2[^\.].*/ and nozzle_diameter[0]==0.4
-top_infill_extrusion_width = 0.45
-
-# MK2 #
-[print:0.15mm OPTIMAL @0.25 nozzle]
-inherits = *0.15mm*; *0.25nozzle*
-bridge_acceleration = 600
-bridge_flow_ratio = 0.7
-compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK2.*/ and nozzle_diameter[0]==0.25
-external_perimeter_speed = 20
-infill_acceleration = 1000
-infill_speed = 40
-perimeter_acceleration = 600
-perimeter_speed = 25
-small_perimeter_speed = 15
-solid_infill_speed = 40
-top_solid_infill_speed = 30
-
-# MK2 #
-[print:0.15mm OPTIMAL @0.6 nozzle]
-inherits = *0.15mm*; *0.6nozzle*
-compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK2.*/ and nozzle_diameter[0]==0.6
-
-# MK3 #
-[print:0.15mm QUALITY @MK3]
-inherits = *0.15mm*; *MK3*
-bridge_speed = 30
-compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.4
-external_perimeter_speed = 25
-infill_acceleration = 1000
-infill_speed = 80
-max_print_speed = 200
-perimeter_speed = 45
-solid_infill_speed = 80
-top_solid_infill_speed = 40
-fill_pattern = gyroid
-fill_density = 15%
-
-[print:0.15mm SPEED @MK3]
-inherits = *0.15mm*; *MK3*
-bridge_speed = 30
-compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.4
-external_perimeter_speed = 35
-infill_acceleration = 1000
-infill_speed = 200
-max_print_speed = 200
-perimeter_speed = 60
-solid_infill_speed = 200
-=======
[print:*0.30mm*]
inherits = *common*
bottom_solid_layers = 4
@@ -767,72 +534,9 @@ perimeter_extrusion_width = 0.65 perimeter_speed = 50
solid_infill_extrusion_width = 0.65
solid_infill_speed = 60
->>>>>>> master
top_solid_infill_speed = 50
top_solid_layers = 4
-<<<<<<< HEAD
-# MK3 MMU #
-[print:0.15mm SOLUBLE FULL @MK3]
-inherits = 0.15mm SPEED @MK3; *soluble_support*
-compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.4 and num_extruders>1
-notes = Set your soluble extruder in Multiple Extruders > Support material/raft/skirt extruder & Support material/raft interface extruder
-support_material_extruder = 5
-support_material_interface_extruder = 5
-perimeter_speed = 40
-solid_infill_speed = 40
-infill_speed = 80
-top_infill_extrusion_width = 0.45
-top_solid_infill_speed = 30
-support_material_speed = 45
-
-# MK3 MMU #
-[print:0.15mm SOLUBLE INTERFACE @MK3]
-inherits = 0.15mm SOLUBLE FULL @MK3
-notes = Set your soluble extruder in Multiple Extruders > Support material/raft interface extruder
-support_material_extruder = 0
-support_material_interface_layers = 3
-support_material_with_sheath = 0
-
-# MK2 MMU #
-[print:0.15mm OPTIMAL SOLUBLE FULL]
-inherits = *0.15mm*; *soluble_support*
-compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK2[^\.].*/ and nozzle_diameter[0]==0.4 and num_extruders>1
-external_perimeter_speed = 25
-notes = Set your soluble extruder in Multiple Extruders > Support material/raft/skirt extruder & Support material/raft interface extruder
-perimeter_speed = 40
-solid_infill_speed = 40
-top_infill_extrusion_width = 0.45
-top_solid_infill_speed = 30
-
-# MK2 MMU #
-[print:0.15mm OPTIMAL SOLUBLE INTERFACE]
-inherits = 0.15mm OPTIMAL SOLUBLE FULL
-notes = Set your soluble extruder in Multiple Extruders > Support material/raft interface extruder
-support_material_extruder = 0
-support_material_interface_layers = 3
-support_material_with_sheath = 0
-support_material_xy_spacing = 80%
-
-# MK3 #
-[print:0.15mm QUALITY @0.25 nozzle MK3]
-inherits = *0.15mm*; *0.25nozzleMK3*; *MK3*
-compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.25
-fill_pattern = grid
-fill_density = 20%
-
-# MK3 #
-[print:0.15mm DETAIL @0.6 nozzle MK3]
-inherits = *0.15mm*; *0.6nozzleMK3*; *MK306*
-compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.6
-external_perimeter_speed = 35
-infill_acceleration = 1000
-infill_speed = 70
-max_print_speed = 100
-perimeter_speed = 45
-solid_infill_speed = 70
-top_solid_infill_speed = 45
-=======
[print:*0.40mm*]
inherits = *common*
bottom_solid_layers = 3
@@ -851,7 +555,6 @@ top_solid_infill_speed = 40 top_solid_layers = 4
## MK2 family ##
->>>>>>> master
## MK2 - 0.4mm nozzle
[print:0.05mm ULTRADETAIL]
@@ -887,14 +590,8 @@ inherits = *0.15mm* compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK2[^\.].*/ and nozzle_diameter[0]==0.4
top_infill_extrusion_width = 0.45
-<<<<<<< HEAD
-# MK2 #
-[print:0.20mm 100mms]
-=======
[print:0.20mm 100mms Linear Advance]
->>>>>>> master
inherits = *0.20mm*
-renamed_from = "0.20mm 100mms Linear Advance"
compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK2[^\.].*/ and nozzle_diameter[0]==0.4
external_perimeter_speed = 50
infill_speed = 100
@@ -905,25 +602,6 @@ solid_infill_speed = 100 support_material_speed = 60
top_solid_infill_speed = 70
-<<<<<<< HEAD
-# MK3 #
-[print:0.20mm QUALITY @MK3]
-inherits = *0.20mm*; *MK3*
-bridge_speed = 30
-compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.4
-external_perimeter_speed = 25
-infill_acceleration = 1000
-infill_speed = 80
-max_print_speed = 200
-perimeter_speed = 45
-solid_infill_speed = 80
-top_solid_infill_speed = 40
-fill_pattern = gyroid
-fill_density = 15%
-
-[print:0.20mm SPEED @MK3]
-inherits = *0.20mm*; *MK3*
-=======
[print:0.20mm NORMAL]
inherits = *0.20mm*
compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK2[^\.].*/ and nozzle_diameter[0]==0.4
@@ -931,7 +609,6 @@ compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and [print:0.35mm FAST]
inherits = *0.35mm*
bridge_flow_ratio = 0.95
->>>>>>> master
bridge_speed = 30
compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK2[^\.].*/ and nozzle_diameter[0]==0.4
first_layer_extrusion_width = 0.42
@@ -945,18 +622,11 @@ top_solid_infill_speed = 40 thick_bridges = 1
overhangs = 0
-<<<<<<< HEAD
-# MK3 MMU #
-[print:0.20mm SOLUBLE FULL @MK3]
-inherits = 0.20mm SPEED @MK3; *soluble_support*
-compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.4 and num_extruders>1
-=======
## MMU1 specific
[print:0.15mm OPTIMAL SOLUBLE FULL]
inherits = *0.15mm*; *soluble_support*
compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK2[^\.].*/ and nozzle_diameter[0]==0.4 and num_extruders>1
external_perimeter_speed = 25
->>>>>>> master
notes = Set your soluble extruder in Multiple Extruders > Support material/raft/skirt extruder & Support material/raft interface extruder
perimeter_speed = 40
solid_infill_speed = 40
@@ -965,34 +635,14 @@ top_solid_infill_speed = 30 bridge_flow_ratio = 0.8
bridge_speed = 30
-<<<<<<< HEAD
-# MK3 MMU #
-[print:0.20mm SOLUBLE INTERFACE @MK3]
-inherits = 0.20mm SOLUBLE FULL @MK3
-=======
[print:0.15mm OPTIMAL SOLUBLE INTERFACE]
inherits = 0.15mm OPTIMAL SOLUBLE FULL
->>>>>>> master
notes = Set your soluble extruder in Multiple Extruders > Support material/raft interface extruder
support_material_extruder = 0
support_material_interface_layers = 3
support_material_with_sheath = 0
support_material_xy_spacing = 80%
-<<<<<<< HEAD
-# MK2 #
-[print:0.20mm NORMAL]
-inherits = *0.20mm*
-compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK2[^\.].*/ and nozzle_diameter[0]==0.4
-
-# MK2 #
-[print:0.20mm NORMAL @0.6 nozzle]
-inherits = *0.20mm*; *0.6nozzle*
-compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK2.*/ and nozzle_diameter[0]==0.6
-
-# MK2 MMU #
-=======
->>>>>>> master
[print:0.20mm NORMAL SOLUBLE FULL]
inherits = *0.20mm*; *soluble_support*
compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK2[^\.].*/ and nozzle_diameter[0]==0.4 and num_extruders>1
@@ -1012,21 +662,7 @@ support_material_interface_layers = 3 support_material_with_sheath = 0
support_material_xy_spacing = 80%
-<<<<<<< HEAD
-# MK3 #
-[print:0.20mm DETAIL @0.6 nozzle MK3]
-inherits = *0.20mm*; *0.6nozzleMK3*; *MK306*
-compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.6
-external_perimeter_speed = 35
-infill_acceleration = 1000
-infill_speed = 70
-max_print_speed = 100
-perimeter_speed = 45
-solid_infill_speed = 70
-top_solid_infill_speed = 45
-=======
## MK2 - 0.25mm nozzle
->>>>>>> master
[print:0.05mm ULTRADETAIL @0.25 nozzle]
inherits = *0.05mm*; *0.25nozzle*
@@ -1056,55 +692,6 @@ top_solid_infill_speed = 30 support_material_contact_distance = 0.07
raft_contact_distance = 0.07
-<<<<<<< HEAD
-[print:*0.25mm*]
-inherits = *common*
-bottom_solid_layers = 4
-bridge_flow_ratio = 0.95
-external_perimeter_speed = 40
-perimeter_acceleration = 800
-layer_height = 0.25
-perimeter_speed = 50
-top_solid_layers = 4
-
-# XXXXXXXXXXXXXXXXXXXX
-# XXX--- 0.30mm ---XXX
-# XXXXXXXXXXXXXXXXXXXX
-
-[print:*0.30mm*]
-inherits = *common*
-bottom_solid_layers = 4
-bridge_flow_ratio = 0.95
-external_perimeter_speed = 40
-infill_acceleration = 2000
-infill_speed = 60
-layer_height = 0.3
-perimeter_acceleration = 800
-perimeter_speed = 50
-solid_infill_speed = 50
-top_infill_extrusion_width = 0.4
-top_solid_layers = 4
-
-[print:0.30mm QUALITY @0.6 nozzle MK3]
-inherits = *0.30mm*; *0.6nozzleMK3*; *MK306*
-compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.6
-external_perimeter_speed = 35
-infill_acceleration = 1000
-infill_speed = 70
-max_print_speed = 100
-perimeter_speed = 45
-solid_infill_speed = 70
-top_solid_infill_speed = 45
-
-[print:0.30mm SOLUBLE FULL @0.6 nozzle MK3]
-inherits = 0.30mm QUALITY @0.6 nozzle MK3; *soluble_support*
-compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.6 and num_extruders>1
-notes = Set your soluble extruder in Multiple Extruders > Support material/raft/skirt extruder & Support material/raft interface extruder
-support_material_extruder = 5
-support_material_interface_extruder = 5
-support_material_speed = 40
-perimeter_speed = 40
-=======
[print:0.15mm OPTIMAL @0.25 nozzle]
inherits = *0.15mm*; *0.25nozzle*
bridge_acceleration = 600
@@ -1116,45 +703,10 @@ infill_speed = 40 perimeter_acceleration = 600
perimeter_speed = 25
small_perimeter_speed = 15
->>>>>>> master
solid_infill_speed = 40
top_solid_infill_speed = 30
-<<<<<<< HEAD
-support_material_xy_spacing = 80%
-
-[print:0.30mm SOLUBLE INTERFACE @0.6 nozzle MK3]
-inherits = 0.30mm SOLUBLE FULL @0.6 nozzle MK3
-notes = Set your soluble extruder in Multiple Extruders > Support material/raft interface extruder
-support_material_extruder = 0
-support_material_interface_layers = 3
-support_material_with_sheath = 0
-
-[print:0.30mm DRAFT @MK3]
-inherits = *0.30mm*; *MK3*
-bottom_solid_layers = 3
-bridge_speed = 30
-compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.4
-external_perimeter_speed = 35
-infill_acceleration = 1000
-infill_speed = 85
-max_print_speed = 200
-perimeter_speed = 50
-small_perimeter_speed = 30
-solid_infill_speed = 80
-top_solid_infill_speed = 40
-support_material_speed = 45
-external_perimeter_extrusion_width = 0.6
-extrusion_width = 0.5
-first_layer_extrusion_width = 0.42
-infill_extrusion_width = 0.5
-perimeter_extrusion_width = 0.5
-solid_infill_extrusion_width = 0.5
-top_infill_extrusion_width = 0.45
-support_material_extrusion_width = 0.38
-=======
support_material_contact_distance = 0.08
raft_contact_distance = 0.07
->>>>>>> master
## MK2 - 0.6mm nozzle
@@ -1162,23 +714,9 @@ raft_contact_distance = 0.07 inherits = *0.15mm*; *0.6nozzle*
compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK2.*/ and nozzle_diameter[0]==0.6
-<<<<<<< HEAD
-# MK2 #
-[print:0.35mm FAST]
-inherits = *0.35mm*
-bridge_flow_ratio = 0.95
-compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK2[^\.].*/ and nozzle_diameter[0]==0.4
-first_layer_extrusion_width = 0.42
-perimeter_extrusion_width = 0.43
-solid_infill_extrusion_width = 0.7
-top_infill_extrusion_width = 0.45
-support_material_extrusion_width = 0.37
-top_solid_infill_speed = 40
-=======
[print:0.20mm NORMAL @0.6 nozzle]
inherits = *0.20mm*; *0.6nozzle*
compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK2.*/ and nozzle_diameter[0]==0.6
->>>>>>> master
[print:0.35mm FAST @0.6 nozzle]
inherits = *0.35mm*; *0.6nozzle*
@@ -1205,77 +743,15 @@ support_material_interface_layers = 3 support_material_with_sheath = 0
support_material_xy_spacing = 150%
-<<<<<<< HEAD
-# MK3 #
-[print:0.35mm SPEED @0.6 nozzle MK3]
-inherits = *0.35mm*; *0.6nozzleMK3*; *MK306*
-compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.6
-external_perimeter_speed = 35
-infill_acceleration = 1000
-infill_speed = 70
-max_print_speed = 100
-perimeter_speed = 45
-solid_infill_speed = 70
-top_solid_infill_speed = 45
-external_perimeter_extrusion_width = 0.68
-perimeter_extrusion_width = 0.68
-infill_extrusion_width = 0.68
-solid_infill_extrusion_width = 0.68
-
-# XXXXXXXXXXXXXXXXXXXX
-# XXX--- 0.40mm ---XXX
-# XXXXXXXXXXXXXXXXXXXX
-
-[print:*0.40mm*]
-inherits = *common*
-bottom_solid_layers = 3
-external_perimeter_extrusion_width = 0.6
-external_perimeter_speed = 40
-first_layer_extrusion_width = 0.65
-infill_acceleration = 2000
-infill_speed = 60
-layer_height = 0.4
-perimeter_acceleration = 800
-perimeter_extrusion_width = 0.65
-perimeter_speed = 50
-solid_infill_extrusion_width = 0.65
-solid_infill_speed = 60
-top_solid_infill_speed = 40
-top_solid_layers = 4
-
-# MK3 #
-[print:0.40mm DRAFT @0.6 nozzle MK3]
-inherits = *0.40mm*; *0.6nozzleMK3*; *MK306*
-compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.6
-external_perimeter_speed = 35
-infill_acceleration = 1000
-infill_speed = 70
-max_print_speed = 100
-perimeter_speed = 45
-solid_infill_speed = 70
-top_solid_infill_speed = 45
-external_perimeter_extrusion_width = 0.68
-perimeter_extrusion_width = 0.68
-infill_extrusion_width = 0.68
-solid_infill_extrusion_width = 0.68
-=======
## MK2.5
->>>>>>> master
[print:0.10mm DETAIL @MK2.5]
inherits = 0.10mm DETAIL
compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK2.5.*/ and nozzle_diameter[0]==0.4 and num_extruders>1
single_extruder_multi_material_priming = 0
-<<<<<<< HEAD
-# MK2.5 #
-[print:0.15mm 100mms @MK2.5]
-inherits = 0.15mm 100mms
-renamed_from = "0.15mm 100mms Linear Advance @MK2.5"
-=======
[print:0.15mm 100mms Linear Advance @MK2.5]
inherits = 0.15mm 100mms Linear Advance
->>>>>>> master
compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK2.5.*/ and nozzle_diameter[0]==0.4
single_extruder_multi_material_priming = 0
@@ -1314,23 +790,6 @@ support_material_extruder = 0 support_material_interface_extruder = 5
compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK2.5.*/ and nozzle_diameter[0]==0.4 and num_extruders>1
-<<<<<<< HEAD
-# MK2.5 #
-[print:0.20mm 100mms @MK2.5]
-inherits = 0.20mm 100mms
-renamed_from = "0.20mm 100mms Linear Advance @MK2.5"
-compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK2.5.*/ and nozzle_diameter[0]==0.4
-single_extruder_multi_material_priming = 0
-
-# MK2.5 #
-[print:0.20mm NORMAL @MK2.5]
-inherits = 0.20mm NORMAL
-compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK2.5.*/ and nozzle_diameter[0]==0.4
-single_extruder_multi_material_priming = 0
-
-# MK2.5 MMU2 #
-=======
->>>>>>> master
[print:0.20mm NORMAL SOLUBLE FULL @MK2.5]
inherits = 0.20mm NORMAL SOLUBLE FULL
support_material_extruder = 5
@@ -1372,53 +831,18 @@ support_material_xy_spacing = 80% ## MK3 - 0.4mm nozzle
-<<<<<<< HEAD
-## MINI print profiles
-
-# 0.4mm nozzle
-
-[print:0.05mm ULTRADETAIL @MINI]
-inherits = *0.05mm*; *MINI*
-=======
[print:0.05mm ULTRADETAIL @MK3]
inherits = *0.05mm*; *MK3*
->>>>>>> master
fill_pattern = gyroid
fill_density = 15%
compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.4 and ! single_extruder_multi_material
top_infill_extrusion_width = 0.4
-<<<<<<< HEAD
-small_perimeter_speed = 15
-perimeter_extrusion_width = 0.4
-external_perimeter_extrusion_width = 0.4
-support_material_xy_spacing = 60%
-support_material_speed = 30
-support_material_extrusion_width = 0.35
-
-[print:0.07mm ULTRADETAIL @MINI]
-inherits = *0.07mm*; *MINI*
-=======
[print:0.07mm ULTRADETAIL @MK3]
inherits = *0.07mm*; *MK3*
->>>>>>> master
fill_pattern = gyroid
compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.4 and ! single_extruder_multi_material
top_infill_extrusion_width = 0.4
-<<<<<<< HEAD
-small_perimeter_speed = 15
-perimeter_extrusion_width = 0.4
-external_perimeter_extrusion_width = 0.4
-support_material_xy_spacing = 60%
-support_material_extrusion_width = 0.35
-
-[print:0.10mm DETAIL @MINI]
-inherits = *0.10mm*; *MINI*
-bridge_speed = 30
-compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.4
-perimeter_speed = 40
-external_perimeter_speed = 30
-=======
[print:0.10mm DETAIL @MK3]
inherits = *0.10mm*; *MK3*
@@ -1426,7 +850,6 @@ compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and external_perimeter_speed = 25
infill_acceleration = 1000
bridge_acceleration = 800
->>>>>>> master
infill_speed = 80
max_print_speed = 200
perimeter_speed = 45
@@ -1437,21 +860,12 @@ fill_pattern = gyroid fill_density = 15%
perimeters = 3
-<<<<<<< HEAD
-[print:0.15mm QUALITY @MINI]
-inherits = *0.15mm*; *MINI*
-bridge_speed = 30
-compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.4
-perimeter_speed = 40
-external_perimeter_speed = 30
-=======
[print:0.15mm QUALITY @MK3]
inherits = *0.15mm*; *MK3*
bridge_speed = 25
compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.4
external_perimeter_speed = 25
infill_acceleration = 1000
->>>>>>> master
infill_speed = 80
max_print_speed = 200
perimeter_speed = 45
@@ -1460,26 +874,6 @@ top_solid_infill_speed = 40 fill_pattern = gyroid
fill_density = 15%
-<<<<<<< HEAD
-[print:0.15mm SPEED @MINI]
-inherits = *0.15mm*; *MINI*
-bridge_speed = 30
-compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.4
-perimeter_speed = 50
-external_perimeter_speed = 40
-infill_speed = 140
-solid_infill_speed = 140
-top_solid_infill_speed = 40
-bridge_flow_ratio = 0.85
-support_material_xy_spacing = 60%
-
-[print:0.20mm QUALITY @MINI]
-inherits = *0.20mm*; *MINI*
-bridge_speed = 30
-compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.4
-perimeter_speed = 40
-external_perimeter_speed = 30
-=======
[print:0.15mm SPEED @MK3]
inherits = *0.15mm*; *MK3*
bridge_speed = 25
@@ -1497,7 +891,6 @@ inherits = *0.20mm*; *MK3* compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.4
external_perimeter_speed = 25
infill_acceleration = 1000
->>>>>>> master
infill_speed = 80
max_print_speed = 200
perimeter_speed = 45
@@ -1506,12 +899,6 @@ top_solid_infill_speed = 40 fill_pattern = gyroid
fill_density = 15%
-<<<<<<< HEAD
-[print:0.20mm SPEED @MINI]
-inherits = *0.20mm*; *MINI*
-bridge_speed = 30
-compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.4
-=======
[print:0.20mm SPEED @MK3]
inherits = *0.20mm*; *MK3*
compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.4
@@ -1532,7 +919,6 @@ external_perimeter_speed = 35 infill_acceleration = 1000
infill_speed = 85
max_print_speed = 200
->>>>>>> master
perimeter_speed = 50
small_perimeter_speed = 30
solid_infill_speed = 80
@@ -1549,10 +935,6 @@ support_material_extrusion_width = 0.38 support_material_contact_distance = 0.2
raft_contact_distance = 0.2
-<<<<<<< HEAD
-[print:0.25mm DRAFT @MINI]
-inherits = *0.25mm*; *MINI*
-=======
## MK3 - MMU2 specific
[print:0.15mm SOLUBLE FULL @MK3]
inherits = 0.15mm SPEED @MK3; *soluble_support*
@@ -1567,7 +949,6 @@ top_infill_extrusion_width = 0.45 top_solid_infill_speed = 30
support_material_speed = 45
bridge_flow_ratio = 0.8
->>>>>>> master
bridge_speed = 30
[print:0.15mm SOLUBLE INTERFACE @MK3]
@@ -1577,18 +958,6 @@ support_material_extruder = 0 support_material_interface_layers = 3
support_material_with_sheath = 0
-<<<<<<< HEAD
-[print:0.05mm ULTRADETAIL @0.25 nozzle MINI]
-inherits = *0.05mm*; *0.25nozzle*; *MINI*
-compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.25
-fill_pattern = grid
-fill_density = 20%
-support_material_speed = 30
-
-[print:0.07mm ULTRADETAIL @0.25 nozzle MINI]
-inherits = *0.07mm*; *0.25nozzle*; *MINI*
-compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.25
-=======
[print:0.20mm SOLUBLE FULL @MK3]
inherits = 0.20mm SPEED @MK3; *soluble_support*
compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.4 and num_extruders>1
@@ -1624,7 +993,6 @@ raft_contact_distance = 0.07 [print:0.07mm ULTRADETAIL @0.25 nozzle MK3]
inherits = *0.07mm*; *0.25nozzle*; *MK3*
compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.25 and num_extruders==1
->>>>>>> master
infill_speed = 30
solid_infill_speed = 30
support_material_speed = 30
@@ -1634,29 +1002,17 @@ fill_density = 20% support_material_contact_distance = 0.07
raft_contact_distance = 0.07
-<<<<<<< HEAD
-[print:0.10mm DETAIL @0.25 nozzle MINI]
-inherits = *0.10mm*; *0.25nozzleMINI*; *MINI*
-compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.25
-=======
[print:0.10mm DETAIL @0.25 nozzle MK3]
inherits = *0.10mm*; *0.25nozzleMK3*; *MK3*
compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.25
->>>>>>> master
fill_pattern = grid
fill_density = 20%
support_material_contact_distance = 0.07
raft_contact_distance = 0.07
-<<<<<<< HEAD
-[print:0.15mm QUALITY @0.25 nozzle MINI]
-inherits = *0.15mm*; *0.25nozzleMINI*; *MINI*
-compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.25
-=======
[print:0.15mm QUALITY @0.25 nozzle MK3]
inherits = *0.15mm*; *0.25nozzleMK3*; *MK3*
compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.25
->>>>>>> master
fill_pattern = grid
fill_density = 20%
support_material_contact_distance = 0.08
@@ -1664,15 +1020,9 @@ raft_contact_distance = 0.07 ## MK3 - 0.6mm nozzle
-<<<<<<< HEAD
-[print:0.15mm DETAIL @0.6 nozzle MINI]
-inherits = *0.15mm*; *0.6nozzleMINI*
-compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.6
-=======
[print:0.15mm DETAIL @0.6 nozzle MK3]
inherits = *0.15mm*; *0.6nozzleMK3*; *MK306*
compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.6
->>>>>>> master
external_perimeter_speed = 35
infill_acceleration = 1000
infill_speed = 70
@@ -1684,15 +1034,9 @@ support_material_contact_distance = 0.22 raft_contact_distance = 0.2
bridge_flow_ratio = 1
-<<<<<<< HEAD
-[print:0.20mm DETAIL @0.6 nozzle MINI]
-inherits = *0.20mm*; *0.6nozzleMINI*
-compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.6
-=======
[print:0.20mm DETAIL @0.6 nozzle MK3]
inherits = *0.20mm*; *0.6nozzleMK3*; *MK306*
compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.6
->>>>>>> master
external_perimeter_speed = 35
infill_acceleration = 1000
infill_speed = 70
@@ -1826,28 +1170,6 @@ perimeter_extrusion_width = 1 # MINI - 0.4mm nozzle
-<<<<<<< HEAD
-[filament:*PET*]
-inherits = *common*
-bed_temperature = 90
-bridge_fan_speed = 50
-disable_fan_first_layers = 3
-full_fan_speed_layer = 5
-fan_always_on = 1
-fan_below_layer_time = 20
-filament_colour = #FF8000
-filament_max_volumetric_speed = 8
-filament_type = PETG
-first_layer_bed_temperature = 85
-first_layer_temperature = 230
-max_fan_speed = 50
-min_fan_speed = 30
-start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.6}0.12{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.8}0.06{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/}0.2{elsif nozzle_diameter[0]==0.8}0.02{elsif nozzle_diameter[0]==0.6}0.04{else}0.08{endif} ; Filament gcode LA 1.5\n{if printer_notes=~/.*PRINTER_MODEL_MINI.*/};{elsif printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}M900 K200{elsif nozzle_diameter[0]==0.6}M900 K24{elsif nozzle_diameter[0]==0.8};{else}M900 K45{endif} ; Filament gcode LA 1.0"
-temperature = 240
-filament_retract_length = 1
-filament_retract_lift = 0.2
-compatible_printers_condition = printer_model!="MK2SMM" and printer_model!="MINI" and ! (printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK(2.5|3).*/ and single_extruder_multi_material)
-=======
[print:0.05mm ULTRADETAIL @MINI]
inherits = *0.05mm*; *MINI*
fill_pattern = gyroid
@@ -1861,7 +1183,6 @@ support_material_xy_spacing = 60% support_material_speed = 30
support_material_extrusion_width = 0.35
bridge_acceleration = 300
->>>>>>> master
[print:0.07mm ULTRADETAIL @MINI]
inherits = *0.07mm*; *MINI*
@@ -3469,38 +2790,6 @@ bed_temperature = 55 [filament:Filatech PLA]
inherits = *PLA*
-<<<<<<< HEAD
-filament_vendor = ColorFabb
-compatible_printers_condition = nozzle_diameter[0]>0.35 and ! (printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK(2.5|3).*/ and single_extruder_multi_material)
-extrusion_multiplier = 1.2
-filament_cost = 80.65
-filament_density = 3.9
-filament_spool_weight = 236
-filament_colour = #804040
-filament_max_volumetric_speed = 9
-
-[filament:ColorFabb steelFill]
-inherits = *PLA*
-filament_vendor = ColorFabb
-compatible_printers_condition = nozzle_diameter[0]>0.35 and ! (printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK(2.5|3).*/ and single_extruder_multi_material)
-extrusion_multiplier = 1.2
-filament_cost = 80.65
-filament_density = 3.13
-filament_spool_weight = 236
-filament_colour = #808080
-filament_max_volumetric_speed = 8
-
-[filament:ColorFabb copperFill]
-inherits = *PLA*
-filament_vendor = ColorFabb
-compatible_printers_condition = nozzle_diameter[0]>0.35 and ! (printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK(2.5|3).*/ and single_extruder_multi_material)
-extrusion_multiplier = 1.2
-filament_cost = 80.65
-filament_density = 3.9
-filament_spool_weight = 236
-filament_colour = #82603E
-filament_max_volumetric_speed = 9
-=======
filament_vendor = Filatech
filament_cost =
filament_density = 1.25
@@ -3522,7 +2811,6 @@ temperature = 240 bed_temperature = 90
cooling = 0
compatible_printers_condition = ! (printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK(2.5|3).*/ and single_extruder_multi_material)
->>>>>>> master
[filament:Filatech HIPS]
inherits = Prusa HIPS
@@ -3561,44 +2849,6 @@ first_layer_bed_temperature = 105 bed_temperature = 110
compatible_printers_condition = printer_notes=~/.*PRINTER_MODEL_MK(2|2.5).*/ and ! (printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK(2.5|3).*/ and single_extruder_multi_material)
-<<<<<<< HEAD
-[filament:ColorFabb PLA-PHA]
-inherits = *PLA*
-filament_vendor = ColorFabb
-filament_cost = 54.84
-filament_density = 1.24
-filament_spool_weight = 236
-
-[filament:ColorFabb woodFill]
-inherits = *PLA*
-filament_vendor = ColorFabb
-compatible_printers_condition = nozzle_diameter[0]>0.35 and ! (printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK(2.5|3).*/ and single_extruder_multi_material)
-extrusion_multiplier = 1.1
-filament_cost = 78.63
-filament_density = 1.15
-filament_spool_weight = 236
-filament_colour = #dfc287
-filament_max_volumetric_speed = 9
-first_layer_temperature = 200
-start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.6}0.12{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.8}0.06{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/}0.2{elsif nozzle_diameter[0]==0.8}0.01{elsif nozzle_diameter[0]==0.6}0.02{else}0.04{endif} ; Filament gcode LA 1.5\n{if printer_notes=~/.*PRINTER_MODEL_MINI.*/};{elsif printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}M900 K200{elsif nozzle_diameter[0]==0.6}M900 K12{elsif nozzle_diameter[0]==0.8};{else}M900 K20{endif} ; Filament gcode LA 1.0"
-temperature = 200
-filament_retract_lift = 0.2
-
-[filament:ColorFabb corkFill]
-inherits = *PLA*
-filament_vendor = ColorFabb
-compatible_printers_condition = nozzle_diameter[0]>0.35 and ! (printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK(2.5|3).*/ and single_extruder_multi_material)
-extrusion_multiplier = 1.1
-filament_cost = 78.63
-filament_density = 1.18
-filament_spool_weight = 236
-filament_colour = #634d33
-filament_max_volumetric_speed = 6
-first_layer_temperature = 220
-start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.6}0.12{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.8}0.06{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/}0.2{elsif nozzle_diameter[0]==0.8}0.01{elsif nozzle_diameter[0]==0.6}0.02{else}0.04{endif} ; Filament gcode LA 1.5\n{if printer_notes=~/.*PRINTER_MODEL_MINI.*/};{elsif printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}M900 K200{elsif nozzle_diameter[0]==0.6}M900 K12{elsif nozzle_diameter[0]==0.8};{else}M900 K20{endif} ; Filament gcode LA 1.0"
-temperature = 220
-filament_retract_lift = 0.2
-=======
[filament:Filatech PA @MINI]
inherits = Filatech PA
first_layer_bed_temperature = 100
@@ -3630,7 +2880,6 @@ fan_always_on = 0 cooling = 1
extrusion_multiplier = 0.95
disable_fan_first_layers = 6
->>>>>>> master
[filament:Filatech PC-ABS @MK2]
inherits = Filatech PC-ABS
@@ -3640,13 +2889,8 @@ compatible_printers_condition = printer_notes=~/.*PRINTER_MODEL_MK(2|2.5).*/ and [filament:Filatech PETG]
inherits = *PET*
-<<<<<<< HEAD
-filament_vendor = ColorFabb
-filament_cost = 62.90
-=======
filament_vendor = Filatech
filament_cost =
->>>>>>> master
filament_density = 1.27
first_layer_temperature = 240
first_layer_bed_temperature = 75
@@ -3655,27 +2899,8 @@ bed_temperature = 80 extrusion_multiplier = 0.95
fan_always_on = 0
-<<<<<<< HEAD
-[filament:ColorFabb XT-CF20]
-inherits = *PET*
-filament_vendor = ColorFabb
-extrusion_multiplier = 1.05
-filament_cost = 80.65
-filament_density = 1.35
-filament_spool_weight = 236
-filament_colour = #804040
-filament_max_volumetric_speed = 2
-first_layer_bed_temperature = 90
-first_layer_temperature = 260
-start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.6}0.12{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.8}0.06{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/}0.2{elsif nozzle_diameter[0]==0.8}0.01{elsif nozzle_diameter[0]==0.6}0.04{else}0.06{endif} ; Filament gcode LA 1.5\n{if printer_notes=~/.*PRINTER_MODEL_MINI.*/};{elsif printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}M900 K200{elsif nozzle_diameter[0]==0.6}M900 K18{elsif nozzle_diameter[0]==0.8};{else}M900 K30{endif} ; Filament gcode LA 1.0"
-temperature = 260
-filament_retract_length = nil
-filament_retract_lift = 0.4
-compatible_printers_condition = nozzle_diameter[0]>=0.4 and printer_model!="MK2SMM" and printer_model!="MINI" and ! (printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK(2.5|3).*/ and single_extruder_multi_material)
-=======
[filament:Filatech PETG @MINI]
inherits = Filatech PETG; *PETMINI*
->>>>>>> master
[filament:Filatech Wood-PLA]
inherits = Filatech PLA
@@ -3726,22 +2951,8 @@ filament_retract_before_travel = 2 filament_retract_layer_change = 0
compatible_printers_condition = printer_model!="MINI" and printer_model!="MK2SMM" and ! (printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK(2.5|3).*/ and single_extruder_multi_material)
-<<<<<<< HEAD
-[filament:Kimya PETG Carbon]
-inherits = *PET*
-filament_vendor = Kimya
-extrusion_multiplier = 1.05
-filament_cost = 150.02
-filament_density = 1.317
-filament_colour = #804040
-filament_max_volumetric_speed = 6
-first_layer_bed_temperature = 85
-first_layer_temperature = 240
-temperature = 240
-=======
[filament:Ultrafuse PRO1 @MINI]
inherits = Ultrafuse PRO1
->>>>>>> master
filament_retract_length = nil
filament_retract_speed = nil
filament_retract_before_travel = nil
@@ -3750,16 +2961,6 @@ compatible_printers_condition = printer_model=="MINI" [filament:Ultrafuse ABS]
inherits = *ABSC*
-<<<<<<< HEAD
-filament_vendor = Kimya
-filament_cost = 140.34
-filament_density = 1.032
-filament_colour = #804040
-filament_max_volumetric_speed = 6
-first_layer_temperature = 260
-temperature = 260
-compatible_printers_condition = nozzle_diameter[0]>=0.4 and printer_model!="MINI" and ! (printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK(2.5|3).*/ and single_extruder_multi_material)
-=======
filament_vendor = BASF
filament_cost =
filament_density = 1.04
@@ -3774,7 +2975,6 @@ filament_retract_speed = 40 filament_retract_before_travel = 2
filament_wipe = 0
filament_retract_layer_change = 0
->>>>>>> master
[filament:Ultrafuse ABS @MINI]
inherits = Ultrafuse ABS; *ABSMINI*
@@ -3817,12 +3017,6 @@ filament_max_volumetric_speed = 8 [filament:PrimaSelect PVA+]
inherits = *PLA*
-<<<<<<< HEAD
-filament_vendor = Fillamentum
-filament_cost = 35.48
-filament_density = 1.24
-filament_spool_weight = 230
-=======
filament_vendor = PrimaSelect
filament_cost = 122.1
filament_density = 1.23
@@ -3836,7 +3030,6 @@ filament_type = PVA first_layer_temperature = 195
start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.6}0.12{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.8}0.06{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/}0.2{elsif nozzle_diameter[0]==0.8}0.01{elsif nozzle_diameter[0]==0.6}0.02{else}0.04{endif} ; Filament gcode LA 1.5\n{if printer_notes=~/.*PRINTER_MODEL_MINI.*/};{elsif printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}M900 K200{elsif nozzle_diameter[0]==0.6}M900 K12{elsif nozzle_diameter[0]==0.8};{else}M900 K20{endif} ; Filament gcode LA 1.0"
temperature = 195
->>>>>>> master
[filament:Prusa ABS]
inherits = *ABSC*
@@ -3878,12 +3071,6 @@ min_fan_speed = 20 max_fan_speed = 20
bridge_fan_speed = 50
min_print_speed = 15
-<<<<<<< HEAD
-slowdown_below_layer_time = 15
-first_layer_temperature = 260
-temperature = 260
-filament_type = ASA
-=======
slowdown_below_layer_time = 20
disable_fan_first_layers = 3
filament_cooling_final_speed = 2
@@ -3894,7 +3081,6 @@ filament_soluble = 1 filament_colour = #FFFFD7
filament_ramming_parameters = "130 120 2.74194 2.96774 3.25806 3.77419 4.83871 6.3871 8.09677 9.64516 10.7419 11.2903| 0.05 2.66451 0.45 3.05805 0.95 4.05807 1.45 7.13871 1.95 10.2806 2.45 11.4194 2.95 11.342 3.45 11.4065 3.95 7.6 4.45 7.6 4.95 7.6"
start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.6}0.12{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.8}0.06{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/}0.2{elsif nozzle_diameter[0]==0.8}0.01{elsif nozzle_diameter[0]==0.6}0.03{else}0.04{endif} ; Filament gcode LA 1.5\n{if printer_notes=~/.*PRINTER_MODEL_MINI.*/};{elsif printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}M900 K200{elsif nozzle_diameter[0]==0.6}M900 K12{elsif nozzle_diameter[0]==0.8};{else}M900 K20{endif} ; Filament gcode LA 1.0"
->>>>>>> master
[filament:Prusament ASA @MMU2]
inherits = *ABS MMU2*
@@ -3924,11 +3110,7 @@ start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_MODEL_MINI.*/ and no [filament:Prusament PC Blend @MMU2]
inherits = *ABS MMU2*
filament_vendor = Prusa Polymers
-<<<<<<< HEAD
-filament_cost = 62.36
-=======
filament_cost = 62.36
->>>>>>> master
filament_density = 1.22
filament_spool_weight = 201
fan_always_on = 0
@@ -3954,52 +3136,6 @@ filament_type = PC filament_colour = #DEE0E6
start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.6}0.12{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.8}0.06{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/}0.2{elsif nozzle_diameter[0]==0.8}0.02{elsif nozzle_diameter[0]==0.6}0.04{else}0.07{endif} ; Filament gcode LA 1.5\n{if printer_notes=~/.*PRINTER_MODEL_MINI.*/};{elsif printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}M900 K200{elsif nozzle_diameter[0]==0.6}M900 K22{elsif nozzle_diameter[0]==0.8};{else}M900 K40{endif} ; Filament gcode LA 1.0"
-<<<<<<< HEAD
-[filament:Prusament PC Blend @MK2]
-inherits = Prusament PC Blend
-first_layer_bed_temperature = 105
-bed_temperature = 110
-disable_fan_first_layers = 6
-compatible_printers_condition = nozzle_diameter[0]!=0.8 and printer_notes=~/.*PRINTER_MODEL_MK(2|2.5).*/ and ! (printer_notes=~/.*PRINTER_MODEL_MK2.5.*/ and single_extruder_multi_material)
-
-[filament:Prusament PC Blend Carbon Fiber]
-inherits = Prusament PC Blend
-filament_cost = 90.73
-filament_density = 1.16
-extrusion_multiplier = 1.04
-first_layer_temperature = 285
-temperature = 285
-disable_fan_first_layers = 4
-fan_below_layer_time = 10
-filament_colour = #BBBBBB
-filament_retract_length = nil
-filament_retract_lift = nil
-compatible_printers_condition = printer_notes!~/.*PRINTER_MODEL_MK(2|2.5).*/ and nozzle_diameter[0]>=0.4 and nozzle_diameter[0]!=0.8 and printer_model!="MINI" and ! single_extruder_multi_material
-
-[filament:Prusament PC Blend Carbon Fiber @MK2]
-inherits = Prusament PC Blend Carbon Fiber
-first_layer_bed_temperature = 105
-bed_temperature = 110
-disable_fan_first_layers = 6
-compatible_printers_condition = nozzle_diameter[0]>=0.4 and nozzle_diameter[0]!=0.8 and printer_notes=~/.*PRINTER_MODEL_MK(2|2.5).*/ and ! (printer_notes=~/.*PRINTER_MODEL_MK2.5.*/ and single_extruder_multi_material)
-start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.6}0.12{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.8}0.06{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/}0.2{elsif nozzle_diameter[0]==0.8}0.02{elsif nozzle_diameter[0]==0.6}0.04{else}0.07{endif} ; Filament gcode LA 1.5\n{if printer_notes=~/.*PRINTER_MODEL_MINI.*/};{elsif printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}M900 K200{elsif nozzle_diameter[0]==0.6}M900 K24{elsif nozzle_diameter[0]==0.8};{else}M900 K45{endif} ; Filament gcode LA 1.0"
-
-[filament:Fillamentum CPE]
-inherits = *PET*
-filament_vendor = Fillamentum
-filament_cost = 56.45
-filament_density = 1.25
-filament_spool_weight = 230
-filament_type = CPE
-first_layer_bed_temperature = 90
-first_layer_temperature = 275
-min_fan_speed = 30
-max_fan_speed = 50
-disable_fan_first_layers = 3
-full_fan_speed_layer = 5
-temperature = 275
-start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.6}0.12{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.8}0.06{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/}0.2{elsif nozzle_diameter[0]==0.8}0.02{elsif nozzle_diameter[0]==0.6}0.04{else}0.08{endif} ; Filament gcode LA 1.5\n{if printer_notes=~/.*PRINTER_MODEL_MINI.*/};{elsif printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}M900 K200{elsif nozzle_diameter[0]==0.6}M900 K24{elsif nozzle_diameter[0]==0.8};{else}M900 K45{endif} ; Filament gcode LA 1.0"
-=======
[filament:Prusament PC Blend Carbon Fiber @MMU2]
inherits = Prusament PC Blend @MMU2
filament_cost = 90.73
@@ -4197,7 +3333,6 @@ inherits = *PET MMU2* renamed_from = "Plasty Mladec PETG @MMU2"
filament_vendor = Filament PM
filament_spool_weight = 230
->>>>>>> master
[filament:Prusa PETG @MMU2]
inherits = *PET MMU2*
@@ -4244,14 +3379,9 @@ filament_spool_weight = 230 inherits = *PLA*
filament_vendor = Made for Prusa
filament_cost = 27.82
-<<<<<<< HEAD
-filament_density = 1.01
-filament_spool_weight = 265
-=======
filament_density = 1.24
filament_spool_weight = 230
compatible_printers_condition = nozzle_diameter[0]!=0.8 and ! (printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK(2.5|3).*/ and single_extruder_multi_material)
->>>>>>> master
[filament:Fiberlogy PLA]
inherits = *PLA*
@@ -4287,46 +3417,12 @@ filament_cost = 25.4 filament_density = 1.27
filament_spool_weight = 245
-<<<<<<< HEAD
-[filament:Extrudr PLA NX1]
-inherits = *PLA*
-filament_vendor = Extrudr
-filament_cost = 22.76
-filament_density = 1.24
-filament_notes = "https://www.extrudr.com/en/products/catalogue/?material=97"
-temperature = 205
-bed_temperature = 60
-first_layer_temperature = 205
-first_layer_bed_temperature = 60
-full_fan_speed_layer = 3
-max_fan_speed = 90
-min_fan_speed = 30
-slowdown_below_layer_time = 20
-filament_spool_weight = 0
-
-[filament:Extrudr PLA NX2]
-inherits = Extrudr PLA NX1
-filament_vendor = Extrudr
-filament_cost = 23.63
-filament_density = 1.3
-filament_notes = "https://www.extrudr.com/en/products/catalogue/?material=128"
-filament_spool_weight = 0
-
-[filament:Plasty Mladec PETG]
-inherits = *PET*
-filament_vendor = Plasty Mladec
-filament_cost = 27.82
-filament_density = 1.27
-filament_spool_weight = 230
-compatible_printers_condition = nozzle_diameter[0]!=0.6 and printer_model!="MK2SMM" and printer_model!="MINI" and ! (printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK(2.5|3).*/ and single_extruder_multi_material)
-=======
[filament:Esun PLA]
inherits = *PLA*
filament_vendor = Esun
filament_cost = 25.4
filament_density = 1.24
filament_spool_weight = 265
->>>>>>> master
[filament:Das Filament PLA]
inherits = *PLA*
@@ -4520,20 +3616,6 @@ bridge_fan_speed = 30 cooling = 1
disable_fan_first_layers = 3
fan_always_on = 1
-<<<<<<< HEAD
-filament_max_volumetric_speed = 2.5
-extrusion_multiplier = 1.1
-first_layer_temperature = 230
-first_layer_bed_temperature = 50
-temperature = 230
-bed_temperature = 50
-bridge_fan_speed = 100
-max_fan_speed = 50
-min_fan_speed = 50
-filament_retract_before_travel = 3
-filament_cost = 84.68
-filament_density = 1.22
-=======
fan_below_layer_time = 20
min_print_speed = 15
slowdown_below_layer_time = 10
@@ -4544,7 +3626,6 @@ filament_type = NYLON max_fan_speed = 20
min_fan_speed = 20
start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.6}0.12{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.8}0.06{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/}0.2{elsif nozzle_diameter[0]==0.8}0.01{elsif nozzle_diameter[0]==0.6}0.04{else}0.05{endif} ; Filament gcode LA 1.5\n{if printer_notes=~/.*PRINTER_MODEL_MINI.*/};{elsif printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}M900 K200{elsif nozzle_diameter[0]==0.6}M900 K18{elsif nozzle_diameter[0]==0.8};{else}M900 K30{endif} ; Filament gcode LA 1.0"
->>>>>>> master
filament_retract_length = 2
filament_retract_speed = 40
filament_retract_lift = nil
@@ -4607,11 +3688,6 @@ start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_MODEL_MINI.*/ and no [filament:Verbatim PLA]
inherits = *PLA*
-<<<<<<< HEAD
-filament_vendor = PrimaSelect
-filament_cost = 122.1
-filament_density = 1.23
-=======
filament_vendor = Verbatim
filament_cost = 42.99
filament_density = 1.24
@@ -4625,7 +3701,6 @@ filament_density = 1.14 filament_spool_weight = 235
bed_temperature = 60
bridge_fan_speed = 100
->>>>>>> master
cooling = 0
disable_fan_first_layers = 1
extrusion_multiplier = 1
@@ -4640,74 +3715,13 @@ first_layer_temperature = 215 max_fan_speed = 100
min_fan_speed = 100
start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.6}0.12{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.8}0.06{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/}0.2{elsif nozzle_diameter[0]==0.8}0.01{elsif nozzle_diameter[0]==0.6}0.02{else}0.04{endif} ; Filament gcode LA 1.5\n{if printer_notes=~/.*PRINTER_MODEL_MINI.*/};{elsif printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}M900 K200{elsif nozzle_diameter[0]==0.6}M900 K12{elsif nozzle_diameter[0]==0.8};{else}M900 K20{endif} ; Filament gcode LA 1.0"
-<<<<<<< HEAD
-temperature = 195
-
-[filament:Prusa ABS]
-inherits = *ABSC*
-filament_vendor = Made for Prusa
-filament_cost = 27.82
-filament_density = 1.08
-filament_spool_weight = 230
-compatible_printers_condition = nozzle_diameter[0]!=0.8 and printer_model!="MINI" and ! (printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK(2.5|3).*/ and single_extruder_multi_material)
-=======
temperature = 210
->>>>>>> master
[filament:Verbatim BVOH @MMU2]
inherits = Verbatim BVOH
filament_vendor = Verbatim
compatible_printers_condition = nozzle_diameter[0]!=0.8 and printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK(2.5|3).*/ and single_extruder_multi_material
-<<<<<<< HEAD
-filament_cooling_final_speed = 50
-filament_cooling_initial_speed = 10
-filament_cooling_moves = 5
-filament_ramming_parameters = "120 110 5.32258 5.45161 5.67742 6 6.48387 7.12903 7.90323 8.70968 9.3871 9.83871 10.0968 10.2258| 0.05 5.30967 0.45 5.50967 0.95 6.1871 1.45 7.39677 1.95 9.05484 2.45 10 2.95 10.3098 3.45 13.0839 3.95 7.6 4.45 7.6 4.95 7.6";
-filament_loading_speed_start = 19
-filament_load_time = 15
-filament_unload_time = 12
-filament_loading_speed = 14
-filament_unloading_speed = 20
-
-[filament:Generic ABS @MMU2]
-inherits = *ABS MMU2*
-filament_vendor = Generic
-
-[filament:Generic HIPS @MMU2]
-inherits = *ABS MMU2*
-filament_vendor = Generic
-filament_cost = 27.3
-filament_density = 1.04
-fan_always_on = 1
-first_layer_temperature = 230
-first_layer_bed_temperature = 100
-temperature = 230
-bed_temperature = 110
-cooling = 1
-min_fan_speed = 20
-max_fan_speed = 20
-bridge_fan_speed = 50
-min_print_speed = 15
-slowdown_below_layer_time = 20
-disable_fan_first_layers = 3
-filament_cooling_final_speed = 2
-filament_cooling_initial_speed = 3
-filament_cooling_moves = 1
-filament_type = HIPS
-filament_soluble = 1
-filament_colour = #FFFFD7
-filament_ramming_parameters = "130 120 2.74194 2.96774 3.25806 3.77419 4.83871 6.3871 8.09677 9.64516 10.7419 11.2903| 0.05 2.66451 0.45 3.05805 0.95 4.05807 1.45 7.13871 1.95 10.2806 2.45 11.4194 2.95 11.342 3.45 11.4065 3.95 7.6 4.45 7.6 4.95 7.6"
-start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.6}0.12{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.8}0.06{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/}0.2{elsif nozzle_diameter[0]==0.8}0.01{elsif nozzle_diameter[0]==0.6}0.03{else}0.04{endif} ; Filament gcode LA 1.5\n{if printer_notes=~/.*PRINTER_MODEL_MINI.*/};{elsif printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}M900 K200{elsif nozzle_diameter[0]==0.6}M900 K12{elsif nozzle_diameter[0]==0.8};{else}M900 K20{endif} ; Filament gcode LA 1.0"
-
-[filament:Prusament ASA @MMU2]
-inherits = *ABS MMU2*
-filament_vendor = Prusa Polymers
-filament_cost = 42.69
-filament_density = 1.07
-filament_spool_weight = 201
-=======
temperature = 195
->>>>>>> master
fan_always_on = 1
first_layer_temperature = 200
filament_cooling_final_speed = 1
@@ -4723,14 +3737,6 @@ filament_unloading_speed = 20 filament_unloading_speed_start = 100
filament_loading_speed_start = 19
-<<<<<<< HEAD
-[filament:Prusament PC Blend @MMU2]
-inherits = *ABS MMU2*
-filament_vendor = Prusa Polymers
-filament_cost = 62.36
-filament_density = 1.22
-filament_spool_weight = 201
-=======
[filament:PrimaSelect PVA+ @MMU2]
inherits = *common*
filament_vendor = PrimaSelect
@@ -4739,7 +3745,6 @@ bed_temperature = 60 bridge_fan_speed = 100
cooling = 0
disable_fan_first_layers = 1
->>>>>>> master
fan_always_on = 0
fan_below_layer_time = 100
filament_colour = #FFFFD7
@@ -4767,47 +3772,8 @@ max_fan_speed = 100 min_fan_speed = 100
min_print_speed = 15
slowdown_below_layer_time = 20
-<<<<<<< HEAD
-disable_fan_first_layers = 4
-filament_cooling_final_speed = 2
-filament_cooling_initial_speed = 3
-filament_cooling_moves = 1
-filament_max_volumetric_speed = 8
-filament_retract_lift = 0.2
-filament_ramming_parameters = "130 120 2.70968 2.93548 3.32258 3.83871 4.58065 5.54839 6.51613 7.35484 7.93548 8.16129| 0.05 2.66451 0.45 3.05805 0.95 4.05807 1.45 5.97742 1.95 7.69999 2.45 8.1936 2.95 11.342 3.45 11.4065 3.95 7.6 4.45 7.6 4.95 7.6"
-filament_type = PC
-filament_colour = #DEE0E6
-start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.6}0.12{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.8}0.06{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/}0.2{elsif nozzle_diameter[0]==0.8}0.02{elsif nozzle_diameter[0]==0.6}0.04{else}0.07{endif} ; Filament gcode LA 1.5\n{if printer_notes=~/.*PRINTER_MODEL_MINI.*/};{elsif printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}M900 K200{elsif nozzle_diameter[0]==0.6}M900 K22{elsif nozzle_diameter[0]==0.8};{else}M900 K40{endif} ; Filament gcode LA 1.0"
-
-[filament:Prusament PC Blend Carbon Fiber @MMU2]
-inherits = Prusament PC Blend @MMU2
-filament_cost = 90.73
-filament_density = 1.16
-extrusion_multiplier = 1.04
-fan_below_layer_time = 10
-first_layer_temperature = 280
-temperature = 280
-disable_fan_first_layers = 4
-filament_retract_lift = nil
-filament_colour = #BBBBBB
-compatible_printers_condition = nozzle_diameter[0]>=0.4 and nozzle_diameter[0]!=0.8 and printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK(2.5|3).*/ and single_extruder_multi_material
-
-[filament:Prusa ABS @MMU2]
-inherits = *ABS MMU2*
-filament_vendor = Made for Prusa
-filament_cost = 27.82
-filament_spool_weight = 230
-
-[filament:Plasty Mladec ABS @MMU2]
-inherits = *ABS MMU2*
-filament_vendor = Plasty Mladec
-filament_density = 1.08
-filament_cost = 27.82
-filament_spool_weight = 230
-=======
start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.6}0.12{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.8}0.06{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/}0.2{elsif nozzle_diameter[0]==0.8}0.01{elsif nozzle_diameter[0]==0.6}0.02{else}0.04{endif} ; Filament gcode LA 1.5\n{if printer_notes=~/.*PRINTER_MODEL_MINI.*/};{elsif printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}M900 K200{elsif nozzle_diameter[0]==0.6}M900 K12{elsif nozzle_diameter[0]==0.8};{else}M900 K20{endif} ; Filament gcode LA 1.0"
temperature = 195
->>>>>>> master
[filament:Verbatim PP]
inherits = *common*
@@ -4834,20 +3800,9 @@ temperature = 220 ## Filaments MMU1
-<<<<<<< HEAD
-[filament:Prusa PETG]
-inherits = *PET*
-renamed_from = "Prusa PET"
-filament_vendor = Made for Prusa
-filament_cost = 27.82
-filament_density = 1.27
-filament_spool_weight = 230
-compatible_printers_condition = nozzle_diameter[0]!=0.6 and nozzle_diameter[0]!=0.8 and printer_model!="MK2SMM" and printer_model!="MINI" and ! (printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK(2.5|3).*/ and single_extruder_multi_material)
-=======
[filament:ColorFabb HT @MMU1]
inherits = ColorFabb HT; *PETMMU1*
start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}200{else}45{endif}; Filament gcode"
->>>>>>> master
[filament:ColorFabb XT @MMU1]
inherits = ColorFabb XT; *PETMMU1*
@@ -4856,46 +3811,6 @@ inherits = ColorFabb XT; *PETMMU1* inherits = ColorFabb XT-CF20; *PETMMU1*
start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}200{else}30{endif}; Filament gcode"
-<<<<<<< HEAD
-[filament:Prusament PETG]
-inherits = *PET*
-filament_vendor = Prusa Polymers
-first_layer_temperature = 240
-temperature = 250
-filament_cost = 36.29
-filament_density = 1.27
-filament_spool_weight = 201
-filament_type = PETG
-compatible_printers_condition = nozzle_diameter[0]!=0.8 and nozzle_diameter[0]!=0.6 and printer_model!="MK2SMM" and printer_model!="MINI" and ! (printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK(2.5|3).*/ and single_extruder_multi_material)
-
-[filament:Prusa PETG @0.6 nozzle]
-inherits = *PET06*
-renamed_from = "Prusa PET 0.6 nozzle"; "Prusa PETG 0.6 nozzle"
-filament_vendor = Made for Prusa
-filament_cost = 27.82
-filament_density = 1.27
-filament_spool_weight = 230
-
-[filament:Prusament PETG @0.6 nozzle]
-inherits = *PET06*
-filament_vendor = Prusa Polymers
-first_layer_temperature = 240
-temperature = 250
-filament_cost = 36.29
-filament_density = 1.27
-filament_spool_weight = 201
-filament_type = PETG
-
-[filament:Plasty Mladec PETG @0.6 nozzle]
-inherits = *PET06*
-filament_vendor = Plasty Mladec
-first_layer_temperature = 230
-temperature = 240
-filament_cost = 27.82
-filament_density = 1.27
-filament_spool_weight = 230
-filament_type = PETG
-=======
[filament:ColorFabb nGen @MMU1]
inherits = ColorFabb nGen; *PETMMU1*
@@ -4908,7 +3823,6 @@ inherits = Fillamentum CPE; *PETMMU1* [filament:Generic PETG @MMU1]
inherits = Generic PETG; *PETMMU1*
renamed_from = "Generic PET MMU1"; "Generic PETG MMU1"
->>>>>>> master
[filament:Devil Design PETG @MMU1]
inherits = Devil Design PETG; *PETMMU1*
@@ -4920,29 +3834,8 @@ renamed_from = "Plasty Mladec PETG @MMU1" [filament:Verbatim PETG @MMU1]
inherits = Verbatim PETG; *PETMMU1*
-<<<<<<< HEAD
-[filament:*PET MMU2*]
-inherits = Prusa PETG
-compatible_printers_condition = nozzle_diameter[0]!=0.8 and nozzle_diameter[0]!=0.6 and printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK(2.5|3).*/ and single_extruder_multi_material
-temperature = 230
-first_layer_temperature = 230
-filament_cooling_final_speed = 1
-filament_cooling_initial_speed = 2
-filament_cooling_moves = 1
-filament_load_time = 15
-filament_loading_speed = 14
-filament_ramming_parameters = "120 140 4.70968 4.74194 4.77419 4.80645 4.83871 4.87097 4.90323 5 5.25806 5.67742 6.29032 7.06452 7.83871 8.3871| 0.05 4.72901 0.45 4.73545 0.95 4.83226 1.45 4.88067 1.95 5.05483 2.45 5.93553 2.95 7.53556 3.45 8.6323 3.95 7.6 4.45 7.6 4.95 7.6"
-filament_unload_time = 12
-filament_unloading_speed = 20
-filament_unloading_speed_start = 120
-filament_loading_speed_start = 19
-filament_retract_length = 1
-filament_retract_lift = 0.2
-filament_max_volumetric_speed = 7
-=======
[filament:Fiberlogy PETG @MMU1]
inherits = Fiberlogy PETG; *PETMMU1*
->>>>>>> master
[filament:Prusa PETG @MMU1]
inherits = Prusa PETG; *PETMMU1*
@@ -4955,20 +3848,6 @@ inherits = Prusament PETG; *PETMMU1* inherits = Taulman T-Glase; *PETMMU1*
start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}200{else}30{endif}; Filament gcode"
-<<<<<<< HEAD
-[filament:Prusa PETG @MMU2]
-inherits = *PET MMU2*
-renamed_from = "Prusa PET MMU2"; "Prusa PETG MMU2"
-filament_vendor = Made for Prusa
-filament_cost = 27.82
-filament_spool_weight = 230
-
-[filament:Prusament PETG @MMU2]
-inherits = *PET MMU2*
-filament_type = PETG
-filament_vendor = Prusa Polymers
-filament_cost = 36.29
-=======
[filament:Fiberthree F3 PA Pure Pro @MMU1]
inherits = Fiberthree F3 PA Pure Pro
filament_max_volumetric_speed = 4
@@ -4993,7 +3872,6 @@ compatible_printers_condition = nozzle_diameter[0]>=0.4 and printer_model=="MK2S inherits = Fiberthree F3 PA-CF Pro @MMU1
filament_vendor = Fiberthree
filament_cost = 205.68
->>>>>>> master
filament_density = 1.27
fan_always_on = 1
max_fan_speed = 15
@@ -5027,54 +3905,25 @@ filament_retract_speed = nil filament_retract_lift = nil
compatible_printers_condition = printer_model=="MK2SMM"
-<<<<<<< HEAD
-[filament:Prusament PETG @MMU2 0.6 nozzle]
-inherits = *PET MMU2 06*
-filament_type = PETG
-filament_vendor = Prusa Polymers
-filament_cost = 36.29
-filament_density = 1.27
-filament_spool_weight = 201
-=======
## Filaments MINI
->>>>>>> master
[filament:Generic PETG @MINI]
inherits = Generic PETG; *PETMINI*
renamed_from = "Generic PET MINI"; "Generic PETG MINI"
compatible_printers_condition = printer_model=="MINI" and nozzle_diameter[0]!=0.8 and nozzle_diameter[0]!=0.6
-<<<<<<< HEAD
-[filament:Prusa PLA]
-inherits = *PLA*
-filament_vendor = Made for Prusa
-filament_cost = 27.82
-filament_density = 1.24
-filament_spool_weight = 230
-compatible_printers_condition = nozzle_diameter[0]!=0.8 and ! (printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK(2.5|3).*/ and single_extruder_multi_material)
-=======
[filament:Devil Design PETG @MINI]
inherits = Devil Design PETG; *PETMINI*
compatible_printers_condition = printer_model=="MINI" and nozzle_diameter[0]!=0.6
->>>>>>> master
[filament:Filament PM PETG @MINI]
inherits = Filament PM PETG; *PETMINI*
renamed_from = "Plasty Mladec PETG @MINI"
compatible_printers_condition = printer_model=="MINI" and nozzle_diameter[0]!=0.6
-<<<<<<< HEAD
-[filament:Plasty Mladec PLA]
-inherits = *PLA*
-filament_vendor = Plasty Mladec
-filament_cost = 27.82
-filament_density = 1.24
-filament_spool_weight = 230
-=======
[filament:Verbatim PETG @MINI]
inherits = Verbatim PETG; *PETMINI*
compatible_printers_condition = printer_model=="MINI" and nozzle_diameter[0]!=0.6
->>>>>>> master
[filament:Fiberlogy PETG @MINI]
inherits = Fiberlogy PETG; *PETMINI*
@@ -5084,14 +3933,6 @@ compatible_printers_condition = printer_model=="MINI" and nozzle_diameter[0]!=0. inherits = Generic ABS; *ABSMINI*
compatible_printers_condition = printer_model=="MINI" and nozzle_diameter[0]!=0.8
-<<<<<<< HEAD
-[filament:Hatchbox PLA]
-inherits = *PLA*
-filament_vendor = Hatchbox
-filament_cost = 25.4
-filament_density = 1.27
-filament_spool_weight = 245
-=======
[filament:Fiberthree F3 PA Pure Pro @MINI]
inherits = Fiberthree F3 PA Pure Pro
filament_max_volumetric_speed = 4
@@ -5101,7 +3942,6 @@ filament_retract_lift = nil filament_retract_before_travel = nil
filament_wipe = nil
compatible_printers_condition = printer_model=="MINI"
->>>>>>> master
[filament:Fiberthree F3 PA-CF Pro @MINI]
inherits = Fiberthree F3 PA-CF Pro
@@ -5132,40 +3972,11 @@ inherits = Kimya ABS Carbon @MINI filament_vendor = Kimya
filament_density = 1.037
-<<<<<<< HEAD
-[filament:Prusament PLA]
-inherits = *PLA*
-filament_vendor = Prusa Polymers
-temperature = 215
-filament_cost = 30.24
-filament_density = 1.24
-filament_spool_weight = 201
-filament_notes = "Affordable filament for everyday printing in premium quality manufactured in-house by Josef Prusa"
-compatible_printers_condition = nozzle_diameter[0]!=0.8 and ! (printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK(2.5|3).*/ and single_extruder_multi_material)
-
-[filament:Prusament PVB]
-inherits = *PLA*
-filament_vendor = Prusa Polymers
-temperature = 215
-bed_temperature = 75
-first_layer_bed_temperature = 75
-filament_cost = 60.48
-filament_density = 1.09
-filament_spool_weight = 201
-filament_max_volumetric_speed = 8
-filament_type = PVB
-filament_soluble = 1
-filament_colour = #FFFF6F
-compatible_printers_condition = nozzle_diameter[0]!=0.8 and ! (printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK(2.5|3).*/ and single_extruder_multi_material)
-slowdown_below_layer_time = 20
-start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.6}0.12{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.8}0.06{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/}0.2{elsif nozzle_diameter[0]==0.8}0.02{elsif nozzle_diameter[0]==0.6}0.05{else}0.08{endif} ; Filament gcode LA 1.5\n{if printer_notes=~/.*PRINTER_MODEL_MINI.*/};{elsif printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}M900 K200{elsif nozzle_diameter[0]==0.6}M900 K24{elsif nozzle_diameter[0]==0.8};{else}M900 K45{endif} ; Filament gcode LA 1.0"
-=======
[filament:Esun ABS @MINI]
inherits = Esun ABS; *ABSMINI*
[filament:Hatchbox ABS @MINI]
inherits = Hatchbox ABS; *ABSMINI*
->>>>>>> master
[filament:Filament PM ABS @MINI]
inherits = Filament PM ABS; *ABSMINI*
@@ -5174,34 +3985,6 @@ renamed_from = "Plasty Mladec ABS @MINI" [filament:Verbatim ABS @MINI]
inherits = Verbatim ABS; *ABSMINI*
-<<<<<<< HEAD
-[filament:Prusa PLA @MMU2]
-inherits = *PLA MMU2*
-filament_vendor = Made for Prusa
-filament_cost = 27.82
-filament_spool_weight = 230
-
-[filament:Prusament PLA @MMU2]
-inherits = *PLA MMU2*
-filament_vendor = Prusa Polymers
-filament_cost = 30.24
-filament_density = 1.24
-filament_spool_weight = 201
-
-[filament:Prusament PVB @MMU2]
-inherits = *PLA MMU2*
-filament_vendor = Prusa Polymers
-filament_cost = 60.48
-filament_density = 1.09
-filament_max_volumetric_speed = 8
-filament_soluble = 1
-filament_type = PVB
-filament_colour = #FFFF6F
-filament_spool_weight = 201
-slowdown_below_layer_time = 20
-filament_ramming_parameters = "120 110 1.74194 1.90323 2.16129 2.48387 2.83871 3.25806 3.83871 4.6129 5.41935 5.96774| 0.05 1.69677 0.45 1.96128 0.95 2.63872 1.45 3.46129 1.95 4.99031 2.45 6.12908 2.95 8.30974 3.45 11.4065 3.95 7.6 4.45 7.6 4.95 7.6"
-start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.6}0.12{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.8}0.06{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/}0.2{elsif nozzle_diameter[0]==0.8}0.02{elsif nozzle_diameter[0]==0.6}0.05{else}0.08{endif} ; Filament gcode LA 1.5\n{if printer_notes=~/.*PRINTER_MODEL_MINI.*/};{elsif printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}M900 K200{elsif nozzle_diameter[0]==0.6}M900 K24{elsif nozzle_diameter[0]==0.8};{else}M900 K45{endif} ; Filament gcode LA 1.0"
-=======
[filament:Prusament PETG @MINI]
inherits = Prusament PETG; *PETMINI*
compatible_printers_condition = printer_model=="MINI" and nozzle_diameter[0]!=0.8 and nozzle_diameter[0]!=0.6
@@ -5219,7 +4002,6 @@ inherits = Prusament PETG; *PETMINI06* [filament:Generic PETG @0.6 nozzle MINI]
inherits = Generic PETG; *PETMINI06*
renamed_from = "Generic PET 0.6 nozzle MINI"; "Generic PETG 0.6 nozzle MINI"
->>>>>>> master
[filament:Devil Design PETG @0.6 nozzle MINI]
inherits = Devil Design PETG; *PETMINI06*
@@ -5243,15 +4025,10 @@ compatible_printers_condition = printer_model=="MINI" and nozzle_diameter[0]!=0. [filament:Fillamentum Flexfill 98A @MINI]
inherits = SemiFlex; *FLEXMINI*
filament_vendor = Fillamentum
-<<<<<<< HEAD
-filament_cost = 35.48
-filament_density = 1.24
-=======
first_layer_temperature = 240
temperature = 240
filament_max_volumetric_speed = 1.35
filament_cost = 82.26
->>>>>>> master
filament_spool_weight = 230
max_fan_speed = 60
min_fan_speed = 60
@@ -5259,16 +4036,11 @@ min_fan_speed = 60 [filament:Generic FLEX @MINI]
inherits = SemiFlex; *FLEXMINI*
filament_vendor = Generic
-<<<<<<< HEAD
-filament_cost = 82.26
-filament_density = 1.22
-=======
fan_always_on = 0
bridge_fan_speed = 80
first_layer_temperature = 240
temperature = 240
filament_retract_length = 3
->>>>>>> master
filament_max_volumetric_speed = 1.35
compatible_printers_condition = printer_model=="MINI" and nozzle_diameter[0]!=0.8
@@ -5328,10 +4100,6 @@ filament_cost = 84.68 [filament:Fillamentum Flexfill 92A @MINI]
inherits = *FLEXMINI*
filament_vendor = Fillamentum
-<<<<<<< HEAD
-filament_cost = 82.26
-filament_density = 1.23
-=======
first_layer_temperature = 245
temperature = 245
filament_retract_length = 3
@@ -5341,7 +4109,6 @@ filament_retract_lift = 0 filament_retract_before_travel = 7
filament_wipe = 0
filament_density = 1.20
->>>>>>> master
filament_spool_weight = 230
filament_cost = 33.95
bridge_fan_speed = 70
@@ -5366,15 +4133,6 @@ full_fan_speed_layer = 5 [filament:ColorFabb nGen @MINI]
inherits = ColorFabb nGen; *PETMINI*
-<<<<<<< HEAD
-[filament:Fiberthree F3 PA Pure Pro]
-inherits = *common*
-filament_vendor = Fiberthree
-filament_cost = 200.84
-filament_density = 1.2
-bed_temperature = 70
-first_layer_bed_temperature = 75
-=======
[filament:E3D PC-ABS @MINI]
inherits = E3D PC-ABS; *ABSMINI*
filament_retract_length = nil
@@ -5394,25 +4152,14 @@ inherits = Polymaker PC-Max; *ABSMINI* filament_max_volumetric_speed = 7
bed_temperature = 100
first_layer_bed_temperature = 100
->>>>>>> master
first_layer_temperature = 270
temperature = 270
filament_retract_length = nil
filament_retract_before_travel = nil
filament_wipe = nil
-<<<<<<< HEAD
-[filament:Fiberthree F3 PA-CF Pro]
-inherits = *common*
-filament_vendor = Fiberthree
-filament_cost = 208.1
-filament_density = 1.25
-bed_temperature = 70
-first_layer_bed_temperature = 75
-=======
[filament:Prusament PC Blend @MINI]
inherits = Prusament PC Blend; *ABSMINI*
->>>>>>> master
first_layer_temperature = 275
first_layer_bed_temperature = 100
temperature = 275
@@ -5426,15 +4173,6 @@ filament_retract_before_travel = nil filament_wipe = nil
compatible_printers_condition = printer_model=="MINI" and nozzle_diameter[0]!=0.8
-<<<<<<< HEAD
-[filament:Fiberthree F3 PA-GF Pro]
-inherits = Fiberthree F3 PA-CF Pro
-filament_vendor = Fiberthree
-filament_cost = 205.68
-filament_density = 1.27
-fan_always_on = 1
-max_fan_speed = 15
-=======
[filament:Prusament PC Blend Carbon Fiber @MINI]
inherits = Prusament PC Blend @MINI
filament_cost = 90.73
@@ -5459,7 +4197,6 @@ inherits = Generic HIPS; *ABSMINI* inherits = ColorFabb HT; *PETMINI*
bed_temperature = 100
first_layer_bed_temperature = 100
->>>>>>> master
min_fan_speed = 15
[filament:ColorFabb XT @MINI]
@@ -5473,74 +4210,12 @@ first_layer_bed_temperature = 90 first_layer_temperature = 260
temperature = 260
-<<<<<<< HEAD
-[filament:Verbatim BVOH]
-inherits = *common*
-filament_vendor = Verbatim
-filament_cost = 193.58
-filament_density = 1.14
-filament_spool_weight = 235
-bed_temperature = 60
-bridge_fan_speed = 100
-cooling = 0
-disable_fan_first_layers = 1
-extrusion_multiplier = 1
-fan_always_on = 0
-fan_below_layer_time = 100
-filament_colour = #FFFFD7
-filament_max_volumetric_speed = 4
-filament_soluble = 1
-filament_type = PVA
-first_layer_bed_temperature = 60
-first_layer_temperature = 215
-max_fan_speed = 100
-min_fan_speed = 100
-start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.6}0.12{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.8}0.06{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/}0.2{elsif nozzle_diameter[0]==0.8}0.01{elsif nozzle_diameter[0]==0.6}0.02{else}0.04{endif} ; Filament gcode LA 1.5\n{if printer_notes=~/.*PRINTER_MODEL_MINI.*/};{elsif printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}M900 K200{elsif nozzle_diameter[0]==0.6}M900 K12{elsif nozzle_diameter[0]==0.8};{else}M900 K20{endif} ; Filament gcode LA 1.0"
-temperature = 210
-=======
[filament:Taulman T-Glase @MINI]
inherits = Taulman T-Glase; *PETMINI*
->>>>>>> master
[filament:E3D Edge @MINI]
inherits = E3D Edge; *PETMINI*
-<<<<<<< HEAD
-[filament:PrimaSelect PVA+ @MMU2]
-inherits = *common*
-filament_vendor = PrimaSelect
-compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK(2.5|3).*/ and single_extruder_multi_material
-bed_temperature = 60
-bridge_fan_speed = 100
-cooling = 0
-disable_fan_first_layers = 1
-fan_always_on = 0
-fan_below_layer_time = 100
-filament_colour = #FFFFD7
-filament_cooling_final_speed = 2
-filament_cooling_initial_speed = 4
-filament_cooling_moves = 2
-filament_cost = 122.1
-filament_density = 1.24
-filament_diameter = 1.75
-filament_load_time = 15
-filament_loading_speed = 14
-filament_loading_speed_start = 19
-filament_max_volumetric_speed = 3.8
-filament_minimal_purge_on_wipe_tower = 15
-filament_ramming_parameters = "120 110 3.83871 3.90323 3.96774 4.03226 4.09677 4.19355 4.3871 4.83871 5.67742 6.93548 8.54839 10.3226 11.9677 13.2581 14.129 14.5806| 0.05 3.8258 0.45 3.89676 0.95 4.05807 1.45 4.23548 1.95 5.18386 2.45 7.80651 2.95 11.5356 3.45 13.9872 3.95 14.7613 4.45 7.6 4.95 7.6"
-filament_soluble = 1
-filament_toolchange_delay = 0
-filament_type = PVA
-filament_unload_time = 12
-filament_unloading_speed = 20
-filament_unloading_speed_start = 100
-first_layer_bed_temperature = 60
-first_layer_temperature = 200
-max_fan_speed = 100
-min_fan_speed = 100
-min_print_speed = 15
-=======
[filament:Prusa PETG @MINI]
inherits = Prusa PETG; *PETMINI*
renamed_from = "Prusa PET MINI"; "Prusa PETG MINI"
@@ -5557,7 +4232,6 @@ inherits = Generic PLA first_layer_temperature = 220
temperature = 220
filament_max_volumetric_speed = 15
->>>>>>> master
slowdown_below_layer_time = 20
compatible_printers_condition = nozzle_diameter[0]==0.8 and ! (printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK(2.5|3).*/ and single_extruder_multi_material)
@@ -5600,32 +4274,6 @@ temperature = 265 filament_max_volumetric_speed = 15
compatible_printers_condition = nozzle_diameter[0]==0.8 and printer_model!="MINI" and ! (printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK(2.5|3).*/ and single_extruder_multi_material)
-<<<<<<< HEAD
-[filament:ColorFabb XT @MMU1]
-inherits = *PETMMU1*
-filament_vendor = ColorFabb
-filament_type = PETG
-filament_cost = 62.90
-filament_density = 1.27
-filament_spool_weight = 236
-first_layer_bed_temperature = 90
-first_layer_temperature = 260
-temperature = 270
-
-[filament:ColorFabb XT-CF20 @MMU1]
-inherits = *PETMMU1*
-filament_vendor = ColorFabb
-compatible_printers_condition = nozzle_diameter[0]>=0.4 and printer_model=="MK2SMM"
-extrusion_multiplier = 1.05
-filament_cost = 80.65
-filament_density = 1.35
-filament_spool_weight = 236
-filament_colour = #804040
-filament_max_volumetric_speed = 2
-first_layer_bed_temperature = 90
-first_layer_temperature = 260
-start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}200{else}30{endif}; Filament gcode"
-=======
[filament:Generic FLEX @0.8 nozzle]
inherits = Generic FLEX
filament_max_volumetric_speed = 4.3
@@ -5649,7 +4297,6 @@ compatible_printers_condition = nozzle_diameter[0]==0.8 and ! (printer_notes=~/. [filament:Prusament PETG @0.8 nozzle]
inherits = Prusament PETG
first_layer_temperature = 250
->>>>>>> master
temperature = 260
filament_max_volumetric_speed = 20
filament_retract_lift = 0.2
@@ -5670,28 +4317,11 @@ filament_max_volumetric_speed = 13 filament_retract_lift = 0.25
compatible_printers_condition = printer_notes!~/.*PRINTER_MODEL_MK(2|2.5).*/ and nozzle_diameter[0]==0.8 and printer_model!="MINI" and ! single_extruder_multi_material
-<<<<<<< HEAD
-[filament:Fillamentum CPE @MMU1]
-inherits = *PETMMU1*
-filament_vendor = Fillamentum
-filament_cost = 56.45
-filament_density = 1.25
-filament_spool_weight = 230
-filament_type = CPE
-first_layer_bed_temperature = 90
-first_layer_temperature = 275
-min_fan_speed = 30
-max_fan_speed = 50
-disable_fan_first_layers = 3
-full_fan_speed_layer = 5
-temperature = 275
-=======
[filament:Prusament PC Blend Carbon Fiber @0.8 nozzle]
inherits = Prusament PC Blend Carbon Fiber
filament_max_volumetric_speed = 13
filament_retract_lift = 0.25
compatible_printers_condition = printer_notes!~/.*PRINTER_MODEL_MK(2|2.5).*/ and nozzle_diameter[0]==0.8 and printer_model!="MINI" and ! single_extruder_multi_material
->>>>>>> master
[filament:Prusament PC Blend @0.8 nozzle MK2]
inherits = Prusament PC Blend @MK2
@@ -5719,37 +4349,19 @@ compatible_printers_condition = nozzle_diameter[0]==0.8 and printer_notes=~/.*PR slowdown_below_layer_time = 20
filament_max_volumetric_speed = 14
-<<<<<<< HEAD
-[filament:Prusa PETG @MMU1]
-inherits = *PETMMU1*
-renamed_from = "Prusa PET MMU1"; "Prusa PETG MMU1"
-filament_vendor = Made for Prusa
-filament_cost = 27.82
-filament_density = 1.27
-filament_spool_weight = 230
-=======
[filament:Prusament PC Blend @MMU2 0.8 nozzle]
inherits = Prusament PC Blend @MMU2
compatible_printers_condition = nozzle_diameter[0]==0.8 and printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK(2.5|3).*/ and single_extruder_multi_material
filament_max_volumetric_speed = 12
->>>>>>> master
[filament:Generic PETG @MMU2 0.8 nozzle]
inherits = Generic PETG @MMU2
compatible_printers_condition = nozzle_diameter[0]==0.8 and printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK(2.5|3).*/ and single_extruder_multi_material
filament_max_volumetric_speed = 18
first_layer_temperature = 240
-<<<<<<< HEAD
-temperature = 250
-filament_cost = 36.29
-filament_density = 1.27
-filament_spool_weight = 201
-filament_type = PETG
-=======
temperature = 240
slowdown_below_layer_time = 20
filament_ramming_parameters = "120 140 5.51613 5.6129 5.70968 5.77419 5.77419 5.74194 5.80645 5.93548 6.06452 6.19355 6.3871 6.74194 7.25806 7.87097 8.54839 9.22581 10 10.8387| 0.05 5.5032 0.45 5.63868 0.95 5.8 1.45 5.7839 1.95 6.02257 2.45 6.25811 2.95 7.08395 3.45 8.43875 3.95 9.92258 4.45 11.3419 4.95 7.6"
->>>>>>> master
[filament:Prusament PETG @MMU2 0.8 nozzle]
inherits = Prusament PETG @MMU2
@@ -5760,74 +4372,6 @@ temperature = 240 slowdown_below_layer_time = 20
filament_ramming_parameters = "120 140 5.51613 5.6129 5.70968 5.77419 5.77419 5.74194 5.80645 5.93548 6.06452 6.19355 6.3871 6.74194 7.25806 7.87097 8.54839 9.22581 10 10.8387| 0.05 5.5032 0.45 5.63868 0.95 5.8 1.45 5.7839 1.95 6.02257 2.45 6.25811 2.95 7.08395 3.45 8.43875 3.95 9.92258 4.45 11.3419 4.95 7.6"
-<<<<<<< HEAD
-[filament:Fiberthree F3 PA Pure Pro @MMU1]
-inherits = *common*
-filament_vendor = Fiberthree
-filament_cost = 200.84
-filament_density = 1.2
-bed_temperature = 70
-first_layer_bed_temperature = 75
-first_layer_temperature = 270
-temperature = 270
-bridge_fan_speed = 30
-cooling = 1
-disable_fan_first_layers = 3
-fan_always_on = 1
-fan_below_layer_time = 20
-min_print_speed = 15
-slowdown_below_layer_time = 10
-filament_colour = #DEE0E6
-filament_max_volumetric_speed = 4
-filament_soluble = 0
-filament_type = NYLON
-max_fan_speed = 20
-min_fan_speed = 20
-start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.6}0.12{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.8}0.06{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/}0.2{elsif nozzle_diameter[0]==0.8}0.01{elsif nozzle_diameter[0]==0.6}0.04{else}0.05{endif} ; Filament gcode LA 1.5\n{if printer_notes=~/.*PRINTER_MODEL_MINI.*/};{elsif printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}M900 K200{elsif nozzle_diameter[0]==0.6}M900 K18{elsif nozzle_diameter[0]==0.8};{else}M900 K30{endif} ; Filament gcode LA 1.0"
-compatible_printers_condition = printer_model=="MK2SMM"
-
-[filament:Fiberthree F3 PA-CF Pro @MMU1]
-inherits = *common*
-filament_vendor = Fiberthree
-filament_cost = 208.1
-filament_density = 1.25
-bed_temperature = 70
-first_layer_bed_temperature = 75
-first_layer_temperature = 275
-temperature = 275
-bridge_fan_speed = 30
-cooling = 1
-disable_fan_first_layers = 3
-fan_always_on = 0
-fan_below_layer_time = 20
-min_print_speed = 15
-slowdown_below_layer_time = 10
-filament_colour = #DEE0E6
-filament_max_volumetric_speed = 4
-filament_soluble = 0
-filament_type = NYLON
-max_fan_speed = 0
-min_fan_speed = 0
-start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.6}0.12{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.8}0.06{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/}0.2{elsif nozzle_diameter[0]==0.8}0.01{elsif nozzle_diameter[0]==0.6}0.04{else}0.05{endif} ; Filament gcode LA 1.5\n{if printer_notes=~/.*PRINTER_MODEL_MINI.*/};{elsif printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}M900 K200{elsif nozzle_diameter[0]==0.6}M900 K18{elsif nozzle_diameter[0]==0.8};{else}M900 K30{endif} ; Filament gcode LA 1.0"
-compatible_printers_condition = nozzle_diameter[0]>=0.4 and printer_model=="MK2SMM"
-
-[filament:Fiberthree F3 PA-GF Pro @MMU1]
-inherits = Fiberthree F3 PA-CF Pro @MMU1
-filament_vendor = Fiberthree
-filament_cost = 205.68
-filament_density = 1.27
-fan_always_on = 1
-max_fan_speed = 15
-min_fan_speed = 15
-
-[filament:SemiFlex or Flexfill 98A @MMU1]
-inherits = *FLEX*
-filament_vendor = Generic
-filament_cost = 82.26
-filament_density = 1.22
-filament_max_volumetric_speed = 1.35
-filament_retract_length = nil
-=======
[filament:Generic PLA @MMU2 0.8 nozzle]
inherits = Generic PLA @MMU2
compatible_printers_condition = nozzle_diameter[0]==0.8 and printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK(2.5|3).*/ and single_extruder_multi_material
@@ -5861,7 +4405,6 @@ temperature = 265 filament_max_volumetric_speed = 13
filament_retract_length = 3.2
filament_wipe = nil
->>>>>>> master
filament_retract_speed = nil
filament_deretract_speed = nil
filament_retract_lift = nil
@@ -5989,85 +4532,10 @@ layer_height = 0.035 [sla_print:0.05 Normal]
inherits = *common*
-<<<<<<< HEAD
-filament_vendor = Fiberthree
-filament_cost = 200.84
-filament_density = 1.2
-bed_temperature = 70
-first_layer_bed_temperature = 75
-first_layer_temperature = 270
-temperature = 270
-bridge_fan_speed = 30
-cooling = 1
-disable_fan_first_layers = 3
-fan_always_on = 1
-fan_below_layer_time = 20
-min_print_speed = 15
-slowdown_below_layer_time = 10
-filament_colour = #DEE0E6
-filament_max_volumetric_speed = 4
-filament_soluble = 0
-filament_type = NYLON
-max_fan_speed = 20
-min_fan_speed = 20
-start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.6}0.12{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.8}0.06{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/}0.2{elsif nozzle_diameter[0]==0.8}0.01{elsif nozzle_diameter[0]==0.6}0.04{else}0.05{endif} ; Filament gcode LA 1.5\n{if printer_notes=~/.*PRINTER_MODEL_MINI.*/};{elsif printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}M900 K200{elsif nozzle_diameter[0]==0.6}M900 K18{elsif nozzle_diameter[0]==0.8};{else}M900 K30{endif} ; Filament gcode LA 1.0"
-compatible_printers_condition = printer_model=="MINI"
-=======
layer_height = 0.05
->>>>>>> master
[sla_print:0.1 Fast]
inherits = *common*
-<<<<<<< HEAD
-filament_vendor = Fiberthree
-filament_cost = 208.1
-filament_density = 1.25
-bed_temperature = 70
-first_layer_bed_temperature = 75
-first_layer_temperature = 275
-temperature = 275
-bridge_fan_speed = 30
-cooling = 1
-disable_fan_first_layers = 3
-fan_always_on = 0
-fan_below_layer_time = 20
-min_print_speed = 15
-slowdown_below_layer_time = 10
-filament_colour = #DEE0E6
-filament_max_volumetric_speed = 4
-filament_soluble = 0
-filament_type = NYLON
-max_fan_speed = 0
-min_fan_speed = 0
-start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.6}0.12{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.8}0.06{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/}0.2{elsif nozzle_diameter[0]==0.8}0.01{elsif nozzle_diameter[0]==0.6}0.04{else}0.05{endif} ; Filament gcode LA 1.5\n{if printer_notes=~/.*PRINTER_MODEL_MINI.*/};{elsif printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}M900 K200{elsif nozzle_diameter[0]==0.6}M900 K18{elsif nozzle_diameter[0]==0.8};{else}M900 K30{endif} ; Filament gcode LA 1.0"
-compatible_printers_condition = nozzle_diameter[0]>=0.4 and printer_model=="MINI"
-
-[filament:Fiberthree F3 PA-GF Pro @MINI]
-inherits = Fiberthree F3 PA-CF Pro @MINI
-filament_vendor = Fiberthree
-filament_cost = 205.68
-filament_density = 1.27
-fan_always_on = 1
-max_fan_speed = 15
-min_fan_speed = 15
-
-[filament:Kimya ABS Carbon @MINI]
-inherits = *ABSMINI*
-filament_vendor = Kimya
-filament_cost = 140.4
-filament_density = 1.032
-filament_colour = #804040
-filament_max_volumetric_speed = 6
-first_layer_temperature = 260
-temperature = 260
-fan_always_on = 0
-cooling = 1
-min_fan_speed = 15
-max_fan_speed = 15
-disable_fan_first_layers = 4
-fan_below_layer_time = 30
-compatible_printers_condition = nozzle_diameter[0]>=0.4 and printer_model=="MINI"
-=======
layer_height = 0.1
support_head_front_diameter = 0.5
support_head_penetration = 0.5
@@ -6079,33 +4547,16 @@ support_pillar_diameter = 1.3 inherits = *SL1S*
layer_height = 0.025
support_head_width = 3
->>>>>>> master
[sla_print:0.05 Normal @SL1S]
inherits = *SL1S*
layer_height = 0.05
-<<<<<<< HEAD
-[filament:Esun ABS @MINI]
-inherits = Generic ABS; *ABSMINI*
-filament_vendor = Esun
-filament_cost = 27.82
-filament_density = 1.01
-filament_spool_weight = 265
-fan_always_on = 0
-cooling = 1
-min_fan_speed = 15
-max_fan_speed = 15
-disable_fan_first_layers = 4
-fan_below_layer_time = 30
-bridge_fan_speed = 25
-=======
[sla_print:0.1 Fast @SL1S]
inherits = *SL1S*
layer_height = 0.1
support_head_front_diameter = 0.6
support_head_penetration = 0.6
->>>>>>> master
########### Materials
@@ -6125,46 +4576,6 @@ exposure_time = 10 initial_exposure_time = 35
initial_layer_height = 0.025
-<<<<<<< HEAD
-[filament:Prusament PETG @MINI]
-inherits = Prusament PETG; *PETMINI*
-filament_vendor = Prusa Polymers
-first_layer_temperature = 240
-temperature = 250
-filament_density = 1.27
-filament_spool_weight = 201
-filament_cost = 36.29
-compatible_printers_condition = printer_model=="MINI" and nozzle_diameter[0]!=0.8 and nozzle_diameter[0]!=0.6
-
-[filament:Kimya PETG Carbon @MINI]
-inherits = *PETMINI*
-filament_vendor = Kimya
-extrusion_multiplier = 1.05
-filament_cost = 150.02
-filament_density = 1.317
-filament_colour = #804040
-filament_max_volumetric_speed = 6
-first_layer_bed_temperature = 85
-first_layer_temperature = 240
-temperature = 240
-filament_retract_length = nil
-filament_retract_lift = 0.3
-compatible_printers_condition = nozzle_diameter[0]>=0.4 and printer_model=="MINI"
-
-[filament:Prusament PETG @0.6 nozzle MINI]
-inherits = Prusament PETG; *PETMINI06*
-first_layer_temperature = 240
-temperature = 250
-filament_density = 1.27
-filament_spool_weight = 201
-filament_cost = 36.29
-
-[filament:Generic PETG @0.6 nozzle MINI]
-inherits = Generic PETG; *PETMINI06*
-renamed_from = "Generic PET 0.6 nozzle MINI"; "Generic PETG 0.6 nozzle MINI"
-filament_cost = 27.82
-filament_density = 1.27
-=======
[sla_material:*common 0.035*]
inherits = *common*
compatible_prints_condition = layer_height == 0.035
@@ -6189,7 +4600,6 @@ compatible_printers_condition = printer_model=="SL1S" exposure_time = 1.3
initial_exposure_time = 25
initial_layer_height = 0.025
->>>>>>> master
[sla_material:*0.05_sl1s*]
inherits = *common*
@@ -6197,14 +4607,6 @@ compatible_printers_condition = printer_model=="SL1S" exposure_time = 1.7
initial_exposure_time = 25
-<<<<<<< HEAD
-[filament:Plasty Mladec PETG @0.6 nozzle MINI]
-inherits = Generic PETG; *PETMINI06*
-filament_vendor = Plasty Mladec
-filament_cost = 27.82
-filament_density = 1.27
-filament_spool_weight = 230
-=======
[sla_material:*0.1_sl1s*]
inherits = *common*
compatible_prints_condition = layer_height == 0.1
@@ -6212,7 +4614,6 @@ compatible_printers_condition = printer_model=="SL1S" exposure_time = 2.6
initial_exposure_time = 25
initial_layer_height = 0.1
->>>>>>> master
########### Materials 0.025
@@ -6224,37 +4625,6 @@ material_type = Tough material_vendor = 3DM
material_colour = #FF8040
-<<<<<<< HEAD
-[filament:Prusament ASA @MINI]
-inherits = Prusament ASA; *ABSMINI*
-first_layer_temperature = 260
-first_layer_bed_temperature = 100
-temperature = 260
-bed_temperature = 100
-fan_always_on = 1
-cooling = 1
-min_fan_speed = 20
-max_fan_speed = 20
-bridge_fan_speed = 30
-min_print_speed = 15
-slowdown_below_layer_time = 15
-disable_fan_first_layers = 4
-filament_type = ASA
-filament_colour = #FFF2EC
-filament_cost = 42.69
-filament_density = 1.07
-filament_spool_weight = 201
-compatible_printers_condition = printer_model=="MINI" and nozzle_diameter[0]!=0.8
-
-[filament:Fillamentum Flexfill 98A @MINI]
-inherits = SemiFlex or Flexfill 98A; *FLEXMINI*
-filament_vendor = Fillamentum
-first_layer_temperature = 240
-temperature = 240
-filament_max_volumetric_speed = 1.35
-filament_cost = 82.26
-filament_spool_weight = 230
-=======
[sla_material:3DM-Vulcan Gold @0.025]
inherits = *common 0.025*
exposure_time = 12
@@ -6270,7 +4640,6 @@ initial_exposure_time = 30 material_type = Tough
material_vendor = 3DM
material_colour = #F8F8F8
->>>>>>> master
[sla_material:3DM-HR Red Wine @0.025]
inherits = *common 0.025*
@@ -6296,192 +4665,6 @@ material_type = Casting material_vendor = BlueCast
material_colour = #007EFD
-<<<<<<< HEAD
-[filament:Filatech FilaFlex40 @MINI]
-inherits = *FLEXMINI*
-filament_vendor = Filatech
-filament_max_volumetric_speed = 1.8
-fan_always_on = 1
-first_layer_temperature = 240
-first_layer_bed_temperature = 55
-temperature = 240
-bed_temperature = 55
-filament_retract_length = 4
-filament_retract_before_travel = 5
-bridge_fan_speed = 80
-max_fan_speed = 50
-min_fan_speed = 50
-min_print_speed = 15
-slowdown_below_layer_time = 10
-cooling = 1
-filament_cost = 84.68
-
-[filament:Fillamentum Flexfill 92A @MINI]
-inherits = *FLEXMINI*
-filament_vendor = Fillamentum
-first_layer_temperature = 245
-temperature = 245
-filament_retract_length = 3
-filament_retract_speed = 40
-filament_deretract_speed = 15
-filament_retract_lift = 0
-filament_retract_before_travel = 7
-filament_wipe = 0
-filament_density = 1.20
-filament_spool_weight = 230
-filament_cost = 33.95
-bridge_fan_speed = 70
-fan_always_on = 1
-cooling = 0
-max_fan_speed = 50
-min_fan_speed = 50
-filament_max_volumetric_speed = 1.2
-compatible_printers_condition = nozzle_diameter[0]>0.35 and printer_model=="MINI"
-disable_fan_first_layers = 4
-extrusion_multiplier = 1.15
-start_filament_gcode = "M900 K0 ; Filament gcode"
-
-[filament:Fillamentum CPE @MINI]
-inherits = Fillamentum CPE; *PETMINI*
-first_layer_temperature = 265
-first_layer_bed_temperature = 90
-temperature = 265
-filament_type = CPE
-filament_cost = 56.45
-filament_density = 1.25
-filament_spool_weight = 230
-disable_fan_first_layers = 3
-full_fan_speed_layer = 5
-min_fan_speed = 30
-
-[filament:ColorFabb nGen @MINI]
-inherits = ColorFabb nGen; *PETMINI*
-filament_cost = 52.46
-filament_density = 1.2
-filament_spool_weight = 236
-filament_type = NGEN
-first_layer_temperature = 240
-bridge_fan_speed = 40
-fan_always_on = 0
-fan_below_layer_time = 10
-max_fan_speed = 35
-min_fan_speed = 20
-
-[filament:E3D PC-ABS @MINI]
-inherits = E3D PC-ABS; *ABSMINI*
-filament_density = 1.05
-filament_cost = 28.80
-filament_type = PC
-first_layer_temperature = 270
-temperature = 270
-
-[filament:Fillamentum ABS @MINI]
-inherits = Fillamentum ABS; *ABSMINI*
-filament_cost = 32.4
-filament_density = 1.04
-filament_spool_weight = 230
-fan_always_on = 0
-cooling = 1
-min_fan_speed = 15
-max_fan_speed = 15
-disable_fan_first_layers = 4
-fan_below_layer_time = 30
-bridge_fan_speed = 25
-first_layer_temperature = 240
-temperature = 240
-
-[filament:Fillamentum ASA @MINI]
-inherits = Fillamentum ASA; *ABSMINI*
-first_layer_temperature = 260
-first_layer_bed_temperature = 100
-temperature = 260
-bed_temperature = 100
-fan_always_on = 1
-cooling = 1
-min_fan_speed = 20
-max_fan_speed = 20
-min_print_speed = 15
-slowdown_below_layer_time = 15
-disable_fan_first_layers = 4
-filament_type = ASA
-filament_colour = #FFF2EC
-filament_cost = 38.7
-filament_density = 1.07
-filament_spool_weight = 230
-
-[filament:Polymaker PC-Max @MINI]
-inherits = Polymaker PC-Max; *ABSMINI*
-filament_type = PC
-filament_max_volumetric_speed = 7
-bed_temperature = 100
-filament_colour = #FFF2EC
-first_layer_bed_temperature = 100
-first_layer_temperature = 270
-temperature = 270
-bridge_fan_speed = 0
-filament_cost = 77.3
-filament_density = 1.20
-filament_retract_length = nil
-filament_retract_before_travel = nil
-filament_wipe = nil
-
-[filament:Prusament PC Blend @MINI]
-inherits = *ABSMINI*
-filament_vendor = Prusa Polymers
-filament_cost = 62.36
-filament_density = 1.22
-filament_spool_weight = 201
-fan_always_on = 0
-first_layer_temperature = 275
-first_layer_bed_temperature = 100
-temperature = 275
-bed_temperature = 100
-cooling = 1
-min_fan_speed = 20
-max_fan_speed = 20
-bridge_fan_speed = 30
-min_print_speed = 15
-disable_fan_first_layers = 4
-fan_below_layer_time = 30
-filament_type = PC
-filament_colour = #DEE0E6
-filament_max_volumetric_speed = 7
-filament_retract_length = nil
-filament_retract_speed = nil
-filament_deretract_speed = nil
-filament_retract_lift = nil
-filament_retract_before_travel = nil
-filament_wipe = nil
-compatible_printers_condition = printer_model=="MINI" and nozzle_diameter[0]!=0.8
-
-[filament:Prusament PC Blend Carbon Fiber @MINI]
-inherits = Prusament PC Blend @MINI
-filament_cost = 90.73
-filament_density = 1.16
-extrusion_multiplier = 1.04
-first_layer_temperature = 280
-temperature = 280
-disable_fan_first_layers = 4
-fan_below_layer_time = 10
-filament_max_volumetric_speed = 6.5
-filament_colour = #BBBBBB
-compatible_printers_condition = printer_model=="MINI" and nozzle_diameter[0]>=0.4 and nozzle_diameter[0]!=0.8
-
-[filament:Prusa ABS @MINI]
-inherits = *ABSMINI*
-filament_vendor = Made for Prusa
-filament_cost = 27.82
-filament_density = 1.08
-filament_spool_weight = 230
-fan_always_on = 0
-cooling = 1
-min_fan_speed = 15
-max_fan_speed = 15
-disable_fan_first_layers = 4
-fan_below_layer_time = 30
-bridge_fan_speed = 25
-compatible_printers_condition = printer_model=="MINI" and nozzle_diameter[0]!=0.8
-=======
[sla_material:BlueCast EcoGray @0.025]
inherits = *common 0.025*
exposure_time = 6
@@ -6561,7 +4744,6 @@ initial_exposure_time = 20 material_type = Tough
material_vendor = Harz Labs
material_colour = #EC0000
->>>>>>> master
[sla_material:Harz Labs Model Resin Black @0.025]
inherits = *common 0.025*
@@ -6571,50 +4753,6 @@ material_type = Tough material_vendor = Harz Labs
material_colour = #595959
-<<<<<<< HEAD
-[filament:ColorFabb HT @MINI]
-inherits = *PETMINI*
-filament_vendor = ColorFabb
-bed_temperature = 100
-bridge_fan_speed = 30
-cooling = 1
-disable_fan_first_layers = 3
-fan_always_on = 0
-fan_below_layer_time = 10
-filament_cost = 58.66
-filament_density = 1.18
-filament_spool_weight = 236
-first_layer_bed_temperature = 100
-first_layer_temperature = 270
-max_fan_speed = 20
-min_fan_speed = 15
-temperature = 270
-
-[filament:ColorFabb XT @MINI]
-inherits = *PETMINI*
-filament_vendor = ColorFabb
-filament_type = PETG
-filament_cost = 62.90
-filament_density = 1.27
-filament_spool_weight = 236
-first_layer_bed_temperature = 90
-first_layer_temperature = 260
-temperature = 270
-
-[filament:ColorFabb XT-CF20 @MINI]
-inherits = *PETMINI*
-filament_vendor = ColorFabb
-compatible_printers_condition = nozzle_diameter[0]>=0.4 and printer_model=="MINI"
-extrusion_multiplier = 1.05
-filament_cost = 80.65
-filament_density = 1.35
-filament_spool_weight = 236
-filament_colour = #804040
-filament_max_volumetric_speed = 2
-first_layer_bed_temperature = 90
-first_layer_temperature = 260
-temperature = 260
-=======
[sla_material:Harz Labs Dental Cast Red @0.025]
inherits = *common 0.025*
exposure_time = 10
@@ -6638,7 +4776,6 @@ initial_exposure_time = 30 material_type = Tough
material_vendor = Photocentric
material_colour = #C0C0C0
->>>>>>> master
[sla_material:Resinworks 3D Violet @0.025]
inherits = *common 0.025*
@@ -6656,24 +4793,6 @@ material_type = Tough material_vendor = Resinworks 3D
material_colour = #00B900
-<<<<<<< HEAD
-[filament:Prusa PETG @MINI]
-inherits = *PETMINI*
-renamed_from = "Prusa PET MINI"; "Prusa PETG MINI"
-filament_vendor = Made for Prusa
-filament_cost = 27.82
-filament_density = 1.27
-filament_spool_weight = 230
-compatible_printers_condition = printer_model=="MINI" and nozzle_diameter[0]!=0.8 and nozzle_diameter[0]!=0.6
-
-[filament:Prusa PETG @0.6 nozzle MINI]
-inherits = *PETMINI06*
-renamed_from = "Prusa PET 0.6 nozzle MINI"; "Prusa PETG 0.6 nozzle MINI"
-filament_vendor = Made for Prusa
-filament_cost = 27.82
-filament_density = 1.27
-filament_spool_weight = 230
-=======
[sla_material:Monocure 3D Black Rapid Resin @0.025]
inherits = *common 0.025*
exposure_time = 4
@@ -6691,7 +4810,6 @@ material_vendor = Monocure material_colour = #007EFD
## Prusa Polymers 0.025
->>>>>>> master
[sla_material:Prusament Resin Tough Prusa Orange @0.025]
inherits = *common 0.025*
@@ -6814,27 +4932,6 @@ material_colour = #007EFD ## material_type = Tough
## material_vendor = Made for Prusa
-<<<<<<< HEAD
-[filament:Prusament PC Blend Carbon Fiber @0.8 nozzle]
-inherits = Prusament PC Blend Carbon Fiber
-filament_max_volumetric_speed = 13
-filament_retract_lift = 0.25
-compatible_printers_condition = printer_notes!~/.*PRINTER_MODEL_MK(2|2.5).*/ and nozzle_diameter[0]==0.8 and printer_model!="MINI" and ! single_extruder_multi_material
-
-[filament:Prusament PC Blend Carbon Fiber @0.8 nozzle MK2]
-inherits = Prusament PC Blend Carbon Fiber @MK2
-filament_max_volumetric_speed = 13
-filament_retract_lift = 0.25
-compatible_printers_condition = nozzle_diameter[0]==0.8 and printer_model!="MK2SMM" and printer_notes=~/.*PRINTER_MODEL_MK(2|2.5).*/ and ! (printer_notes=~/.*PRINTER_MODEL_MK2.5.*/ and single_extruder_multi_material)
-
-[filament:Prusament PVB @0.8 nozzle]
-inherits = Prusament PVB
-first_layer_temperature = 225
-temperature = 225
-filament_max_volumetric_speed = 15
-compatible_printers_condition = nozzle_diameter[0]==0.8 and ! (printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK(2.5|3).*/ and single_extruder_multi_material)
-slowdown_below_layer_time = 20
-=======
[sla_material:Prusa Maroon Tough @0.025]
inherits = *common 0.025*
exposure_time = 6
@@ -6842,7 +4939,6 @@ initial_exposure_time = 35 material_type = Tough
material_vendor = Made for Prusa
material_colour = #804000
->>>>>>> master
[sla_material:Prusa Beige Tough @0.025]
inherits = *common 0.025*
@@ -6996,57 +5092,6 @@ material_type = Tough material_vendor = Siraya Tech
material_colour = #F8F8F8
-<<<<<<< HEAD
-[filament:Prusament PC Blend Carbon Fiber @0.8 nozzle MINI]
-inherits = Prusament PC Blend Carbon Fiber @MINI
-filament_max_volumetric_speed = 10
-filament_retract_lift = 0.25
-slowdown_below_layer_time = 20
-compatible_printers_condition = nozzle_diameter[0]==0.8 and printer_model=="MINI"
-
-[sla_print:*common*]
-compatible_printers_condition = printer_model=="SL1"
-layer_height = 0.05
-output_filename_format = [input_filename_base].sl1
-pad_edge_radius = 0.5
-pad_enable = 1
-pad_max_merge_distance = 50
-pad_wall_height = 0
-pad_wall_thickness = 1
-pad_wall_slope = 90
-slice_closing_radius = 0.005
-support_base_diameter = 3
-support_base_height = 1
-support_critical_angle = 45
-support_density_at_45 = 250
-support_density_at_horizontal = 500
-support_head_front_diameter = 0.4
-support_head_penetration = 0.4
-support_head_width = 3
-support_max_bridge_length = 10
-support_minimal_z = 0
-support_object_elevation = 5
-support_pillar_diameter = 1
-support_pillar_connection_mode = zigzag
-support_pillar_widening_factor = 0
-supports_enable = 1
-support_small_pillar_diameter_percent = 60%
-
-[sla_print:*SL1S*]
-inherits = *common*
-support_head_front_diameter = 0.5
-support_head_penetration = 0.5
-support_pillar_diameter = 1
-output_filename_format = [input_filename_base].sl1s
-compatible_printers_condition = printer_model=="SL1S"
-
-# SL1 #
-
-[sla_print:0.025 UltraDetail]
-inherits = *common*
-layer_height = 0.025
-support_head_width = 2
-=======
[sla_material:Siraya Tech Blu Clear V2 @0.025]
inherits = *common 0.025*
exposure_time = 9
@@ -7062,7 +5107,6 @@ initial_exposure_time = 35 material_type = Tough
material_vendor = Siraya Tech
material_colour = #007EFD
->>>>>>> master
[sla_material:Siraya Tech Fast Grey @0.025]
inherits = *common 0.025*
@@ -7088,38 +5132,6 @@ material_type = Tough material_vendor = Siraya Tech
material_colour = #F8F8F8
-<<<<<<< HEAD
-# SL1S #
-
-[sla_print:0.025 UltraDetail @SL1S]
-inherits = *SL1S*
-layer_height = 0.025
-support_head_width = 3
-
-[sla_print:0.05 Normal @SL1S]
-inherits = *SL1S*
-layer_height = 0.05
-
-[sla_print:0.1 Fast @SL1S]
-inherits = *SL1S*
-layer_height = 0.1
-
-########### Materials
-
-[sla_material:*common*]
-compatible_printers_condition = printer_model=="SL1"
-compatible_prints_condition = layer_height == 0.05
-exposure_time = 12
-initial_exposure_time = 45
-initial_layer_height = 0.05
-material_correction = 1,1,1
-material_notes =
-
-[sla_material:*common 0.025*]
-inherits = *common*
-compatible_prints_condition = layer_height == 0.025
-exposure_time = 10
-=======
[sla_material:Siraya Tech Sculpt @0.025]
inherits = *common 0.025*
exposure_time = 7
@@ -7139,55 +5151,11 @@ material_colour = #007EFD [sla_material:NextDent Model 2.0 Grey @0.025]
inherits = *common 0.025*
exposure_time = 14
->>>>>>> master
initial_exposure_time = 35
material_type = Dental
material_vendor = NextDent
material_colour = #808080
-<<<<<<< HEAD
-[sla_material:*common 0.035*]
-inherits = *common*
-compatible_prints_condition = layer_height == 0.035
-exposure_time = 13
-initial_exposure_time = 40
-initial_layer_height = 0.035
-
-[sla_material:*common 0.05*]
-inherits = *common*
-
-[sla_material:*common 0.1*]
-inherits = *common*
-compatible_prints_condition = layer_height == 0.1
-exposure_time = 20
-initial_exposure_time = 45
-initial_layer_height = 0.1
-
-[sla_material:*0.025_sl1s*]
-inherits = *common*
-compatible_prints_condition = layer_height == 0.025
-compatible_printers_condition = printer_model=="SL1S"
-exposure_time = 1.3
-initial_exposure_time = 25
-initial_layer_height = 0.025
-
-[sla_material:*0.05_sl1s*]
-inherits = *common*
-compatible_printers_condition = printer_model=="SL1S"
-exposure_time = 1.7
-initial_exposure_time = 25
-
-[sla_material:*0.1_sl1s*]
-inherits = *common*
-compatible_prints_condition = layer_height == 0.1
-compatible_printers_condition = printer_model=="SL1S"
-exposure_time = 2.6
-initial_exposure_time = 25
-initial_layer_height = 0.1
-
-
-########### Materials 0.025
-=======
[sla_material:NextDent Surgical Guide @0.025]
inherits = *common 0.025*
exposure_time = 6
@@ -7219,7 +5187,6 @@ initial_exposure_time = 35 material_type = Tough
material_vendor = 3DJake
material_colour = #C0C0C0
->>>>>>> master
[sla_material:3DJake High Precision Blue @0.025]
inherits = *common 0.025*
@@ -7255,11 +5222,6 @@ material_type = Tough material_vendor = Asiga
material_colour = #C0C0C0
-<<<<<<< HEAD
-[sla_material:3DM-TOUGH Clear @0.025]
-inherits = *common 0.025*
-exposure_time = 9
-=======
[sla_material:Ameralabs TGM-7 LED @0.05]
inherits = *common 0.05*
exposure_time = 7
@@ -7271,21 +5233,14 @@ material_colour = #C0C0C0 [sla_material:Ameralabs AMD 3 LED @0.05]
inherits = *common 0.05*
exposure_time = 5
->>>>>>> master
initial_exposure_time = 30
material_type = Tough
material_vendor = Ameralabs
material_colour = #808080
-<<<<<<< HEAD
-[sla_material:3DM-HR Red Wine @0.025]
-inherits = *common 0.025*
-exposure_time = 14
-=======
[sla_material:BlueCast EcoGray @0.05]
inherits = *common 0.05*
exposure_time = 7
->>>>>>> master
initial_exposure_time = 35
material_type = Tough
material_vendor = BlueCast
@@ -8443,17 +6398,10 @@ material_type = Tough material_vendor = Made for Prusa
material_colour = #595959
-<<<<<<< HEAD
-[sla_material:3DM-TOUGH Clear @0.05]
-inherits = *common 0.05*
-exposure_time = 15
-initial_exposure_time = 30
-=======
[sla_material:Prusa Cyan Tough @0.025 SL1S]
inherits = *0.025_sl1s*
exposure_time = 1.8
initial_exposure_time = 25
->>>>>>> master
material_type = Tough
material_vendor = Made for Prusa
material_colour = #79FFFF
@@ -9272,350 +7220,6 @@ material_type = Tough material_vendor = Peopoly
material_colour = #F8F8F8
-## SL1S materials ##
-
-## 0.025 SL1S
-
-[sla_material:Prusa Orange Tough @0.025 SL1S]
-inherits = *0.025_sl1s*
-exposure_time = 1.8
-initial_exposure_time = 25
-material_type = Tough
-material_vendor = Made for Prusa
-
-[sla_material:Prusa White ABS like @0.025 SL1S]
-inherits = *0.025_sl1s*
-exposure_time = 1.8
-initial_exposure_time = 25
-material_type = Tough
-material_vendor = Made for Prusa
-
-[sla_material:Prusa Azure Blue Tough @0.025 SL1S]
-inherits = *0.025_sl1s*
-exposure_time = 1.8
-initial_exposure_time = 25
-material_type = Tough
-material_vendor = Made for Prusa
-
-[sla_material:Prusa Black Tough @0.025 SL1S]
-inherits = *0.025_sl1s*
-exposure_time = 2
-initial_exposure_time = 25
-material_type = Tough
-material_vendor = Made for Prusa
-
-[sla_material:Prusa Cyan Tough @0.025 SL1S]
-inherits = *0.025_sl1s*
-exposure_time = 1.8
-initial_exposure_time = 25
-material_type = Tough
-material_vendor = Made for Prusa
-
-[sla_material:Prusa Magenta Tough @0.025 SL1S]
-inherits = *0.025_sl1s*
-exposure_time = 1.8
-initial_exposure_time = 25
-material_type = Tough
-material_vendor = Made for Prusa
-
-[sla_material:Prusa Maroon Tough @0.025 SL1S]
-inherits = *0.025_sl1s*
-exposure_time = 2
-initial_exposure_time = 25
-material_type = Tough
-material_vendor = Made for Prusa
-
-[sla_material:Prusa White Tough @0.025 SL1S]
-inherits = *0.025_sl1s*
-exposure_time = 1.8
-initial_exposure_time = 25
-material_type = Tough
-material_vendor = Made for Prusa
-
-[sla_material:Prusa Pink Tough @0.025 SL1S]
-inherits = *0.025_sl1s*
-exposure_time = 1.8
-initial_exposure_time = 25
-material_type = Tough
-material_vendor = Made for Prusa
-
-[sla_material:Prusa Grey Tough @0.025 SL1S]
-inherits = *0.025_sl1s*
-exposure_time = 2
-initial_exposure_time = 25
-material_type = Tough
-material_vendor = Made for Prusa
-
-[sla_material:Prusa Blue Flexible @0.025 SL1S]
-inherits = *0.025_sl1s*
-exposure_time = 1.8
-initial_exposure_time = 25
-material_type = Flexible
-material_vendor = Made for Prusa
-
-[sla_material:Prusa Grey High Tenacity @0.025 SL1S]
-inherits = *0.025_sl1s*
-exposure_time = 1.8
-initial_exposure_time = 25
-material_type = Tough
-material_vendor = Made for Prusa
-
-[sla_material:3DM-ABS Orange @0.025 SL1S]
-inherits = *0.025_sl1s*
-exposure_time = 1.8
-initial_exposure_time = 25
-material_type = Tough
-material_vendor = 3DM
-
-[sla_material:3DM-TOUGH Clear @0.025 SL1S]
-inherits = *0.025_sl1s*
-exposure_time = 1.8
-initial_exposure_time = 25
-material_type = Tough
-material_vendor = 3DM
-
-[sla_material:Peopoly Deft White @0.025 SL1S]
-inherits = *0.025_sl1s*
-exposure_time = 1.8
-initial_exposure_time = 25
-material_type = Tough
-material_vendor = Peopoly
-
-[sla_material:Peopoly Neo Clear @0.025 SL1S]
-inherits = *0.025_sl1s*
-exposure_time = 1.8
-initial_exposure_time = 25
-material_type = Tough
-material_vendor = Peopoly
-
-## 0.05 SL1S
-
-[sla_material:Prusa Orange Tough @0.05 SL1S]
-inherits = *0.05_sl1s*
-exposure_time = 2
-initial_exposure_time = 25
-material_type = Tough
-material_vendor = Made for Prusa
-
-[sla_material:Prusa White ABS like @0.05 SL1S]
-inherits = *0.05_sl1s*
-exposure_time = 2
-initial_exposure_time = 25
-material_type = Tough
-material_vendor = Made for Prusa
-
-[sla_material:Prusa Azure Blue Tough @0.05 SL1S]
-inherits = *0.05_sl1s*
-exposure_time = 2
-initial_exposure_time = 25
-material_type = Tough
-material_vendor = Made for Prusa
-
-[sla_material:Prusa Black Tough @0.05 SL1S]
-inherits = *0.05_sl1s*
-exposure_time = 2.4
-initial_exposure_time = 25
-material_type = Tough
-material_vendor = Made for Prusa
-
-[sla_material:Prusa Cyan Tough @0.05 SL1S]
-inherits = *0.05_sl1s*
-exposure_time = 2
-initial_exposure_time = 25
-material_type = Tough
-material_vendor = Made for Prusa
-
-[sla_material:Prusa Magenta Tough @0.05 SL1S]
-inherits = *0.05_sl1s*
-exposure_time = 2
-initial_exposure_time = 25
-material_type = Tough
-material_vendor = Made for Prusa
-
-[sla_material:Prusa Maroon Tough @0.05 SL1S]
-inherits = *0.05_sl1s*
-exposure_time = 2.4
-initial_exposure_time = 25
-material_type = Tough
-material_vendor = Made for Prusa
-
-[sla_material:Prusa White Tough @0.05 SL1S]
-inherits = *0.05_sl1s*
-exposure_time = 2
-initial_exposure_time = 25
-material_type = Tough
-material_vendor = Made for Prusa
-
-[sla_material:Prusa Pink Tough @0.05 SL1S]
-inherits = *0.05_sl1s*
-exposure_time = 2
-initial_exposure_time = 25
-material_type = Tough
-material_vendor = Made for Prusa
-
-[sla_material:Prusa Blue Flexible @0.05 SL1S]
-inherits = *0.05_sl1s*
-exposure_time = 2
-initial_exposure_time = 25
-material_type = Flexible
-material_vendor = Made for Prusa
-
-[sla_material:Prusa Grey Tough @0.05 SL1S]
-inherits = *0.05_sl1s*
-exposure_time = 2.4
-initial_exposure_time = 25
-material_type = Tough
-material_vendor = Made for Prusa
-
-[sla_material:Prusa Grey High Tenacity @0.05 SL1S]
-inherits = *0.05_sl1s*
-exposure_time = 2
-initial_exposure_time = 25
-material_type = Tough
-material_vendor = Made for Prusa
-
-[sla_material:3DM-ABS Orange @0.05 SL1S]
-inherits = *0.05_sl1s*
-exposure_time = 2.6
-initial_exposure_time = 25
-material_type = Tough
-material_vendor = 3DM
-
-[sla_material:3DM-TOUGH Clear @0.05 SL1S]
-inherits = *0.05_sl1s*
-exposure_time = 2.6
-initial_exposure_time = 25
-material_type = Tough
-material_vendor = 3DM
-
-[sla_material:Peopoly Deft White @0.05 SL1S]
-inherits = *0.05_sl1s*
-exposure_time = 2
-initial_exposure_time = 25
-material_type = Tough
-material_vendor = Peopoly
-
-[sla_material:Peopoly Neo Clear @0.05 SL1S]
-inherits = *0.05_sl1s*
-exposure_time = 2
-initial_exposure_time = 25
-material_type = Tough
-material_vendor = Peopoly
-
-## 0.1 SL1S
-
-[sla_material:Prusa Orange Tough @0.1 SL1S]
-inherits = *0.1_sl1s*
-exposure_time = 2.6
-initial_exposure_time = 25
-material_type = Tough
-material_vendor = Made for Prusa
-
-[sla_material:Prusa White ABS like @0.1 SL1S]
-inherits = *0.1_sl1s*
-exposure_time = 2.6
-initial_exposure_time = 25
-material_type = Tough
-material_vendor = Made for Prusa
-
-[sla_material:Prusa Azure Blue Tough @0.1 SL1S]
-inherits = *0.1_sl1s*
-exposure_time = 2.6
-initial_exposure_time = 25
-material_type = Tough
-material_vendor = Made for Prusa
-
-[sla_material:Prusa Black Tough @0.1 SL1S]
-inherits = *0.1_sl1s*
-exposure_time = 3
-initial_exposure_time = 25
-material_type = Tough
-material_vendor = Made for Prusa
-
-[sla_material:Prusa Cyan Tough @0.1 SL1S]
-inherits = *0.1_sl1s*
-exposure_time = 2.6
-initial_exposure_time = 25
-material_type = Tough
-material_vendor = Made for Prusa
-
-[sla_material:Prusa Magenta Tough @0.1 SL1S]
-inherits = *0.1_sl1s*
-exposure_time = 2.6
-initial_exposure_time = 25
-material_type = Tough
-material_vendor = Made for Prusa
-
-[sla_material:Prusa Maroon Tough @0.1 SL1S]
-inherits = *0.1_sl1s*
-exposure_time = 3
-initial_exposure_time = 25
-material_type = Tough
-material_vendor = Made for Prusa
-
-[sla_material:Prusa White Tough @0.1 SL1S]
-inherits = *0.1_sl1s*
-exposure_time = 2.6
-initial_exposure_time = 25
-material_type = Tough
-material_vendor = Made for Prusa
-
-[sla_material:Prusa Pink Tough @0.1 SL1S]
-inherits = *0.1_sl1s*
-exposure_time = 2.6
-initial_exposure_time = 25
-material_type = Tough
-material_vendor = Made for Prusa
-
-[sla_material:Prusa Blue Flexible @0.1 SL1S]
-inherits = *0.1_sl1s*
-exposure_time = 2.6
-initial_exposure_time = 25
-material_type = Flexible
-material_vendor = Made for Prusa
-
-[sla_material:Prusa Grey Tough @0.1 SL1S]
-inherits = *0.1_sl1s*
-exposure_time = 3
-initial_exposure_time = 25
-material_type = Tough
-material_vendor = Made for Prusa
-
-[sla_material:Prusa Grey High Tenacity @0.1 SL1S]
-inherits = *0.1_sl1s*
-exposure_time = 2.6
-initial_exposure_time = 25
-material_type = Tough
-material_vendor = Made for Prusa
-
-[sla_material:3DM-ABS Orange @0.1 SL1S]
-inherits = *0.1_sl1s*
-exposure_time = 3
-initial_exposure_time = 25
-material_type = Tough
-material_vendor = 3DM
-
-[sla_material:3DM-TOUGH Clear @0.1 SL1S]
-inherits = *0.1_sl1s*
-exposure_time = 3
-initial_exposure_time = 25
-material_type = Tough
-material_vendor = 3DM
-
-[sla_material:Peopoly Deft White @0.1 SL1S]
-inherits = *0.1_sl1s*
-exposure_time = 2.6
-initial_exposure_time = 25
-material_type = Tough
-material_vendor = Peopoly
-
-[sla_material:Peopoly Neo Clear @0.1 SL1S]
-inherits = *0.1_sl1s*
-exposure_time = 2.6
-initial_exposure_time = 25
-material_type = Tough
-material_vendor = Peopoly
-
[printer:*common*]
printer_technology = FFF
bed_shape = 0x0,250x0,250x210,0x210
@@ -9787,33 +7391,21 @@ inherits = Original Prusa i3 MK2S printer_model = MK2.5
remaining_times = 1
machine_max_jerk_e = 4.5
-<<<<<<< HEAD
-start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.10.0 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\nG1 Y-3.0 F1000.0 ; go outside print area\nG92 E0.0\nG1 X60.0 E9.0 F1000.0 ; intro line\nG1 X100.0 E12.5 F1000.0 ; intro line\nG92 E0.0
-=======
start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.10.1 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\nG1 Z0.2 F720\nG1 Y-3 F1000 ; go outside print area\nG92 E0\nG1 X60 E9 F1000 ; intro line\nG1 X100 E12.5 F1000 ; intro line\nG92 E0
->>>>>>> master
[printer:Original Prusa i3 MK2.5 0.25 nozzle]
inherits = Original Prusa i3 MK2S 0.25 nozzle
printer_model = MK2.5
remaining_times = 1
machine_max_jerk_e = 4.5
-<<<<<<< HEAD
-start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.10.0 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\nG1 Y-3.0 F1000.0 ; go outside print area\nG92 E0.0\nG1 X60.0 E9.0 F1000.0 ; intro line\nG1 X100.0 E12.5 F1000.0 ; intro line\nG92 E0.0
-=======
start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.10.1 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\nG1 Z0.2 F720\nG1 Y-3 F1000 ; go outside print area\nG92 E0\nG1 X60 E9 F1000 ; intro line\nG1 X100 E12.5 F1000 ; intro line\nG92 E0
->>>>>>> master
[printer:Original Prusa i3 MK2.5 0.6 nozzle]
inherits = Original Prusa i3 MK2S 0.6 nozzle
printer_model = MK2.5
remaining_times = 1
machine_max_jerk_e = 4.5
-<<<<<<< HEAD
-start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.10.0 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\nG1 Y-3.0 F1000.0 ; go outside print area\nG92 E0.0\nG1 X60.0 E9.0 F1000.0 ; intro line\nG1 X100.0 E12.5 F1000.0 ; intro line\nG92 E0.0
-=======
start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.10.1 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\nG1 Z0.2 F720\nG1 Y-3 F1000 ; go outside print area\nG92 E0\nG1 X60 E9 F1000 ; intro line\nG1 X100 E12.5 F1000 ; intro line\nG92 E0
->>>>>>> master
[printer:Original Prusa i3 MK2.5 0.8 nozzle]
inherits = Original Prusa i3 MK2S 0.6 nozzle
@@ -9825,11 +7417,7 @@ min_layer_height = 0.2 retract_length = 1
remaining_times = 1
machine_max_jerk_e = 4.5
-<<<<<<< HEAD
-start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM115 U3.10.0 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\nG1 Y-3.0 F1000.0 ; go outside print area\nG92 E0.0\nG1 X60.0 E9.0 F1000.0 ; intro line\nG1 X100.0 E12.5 F1000.0 ; intro line\nG92 E0.0
-=======
start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.10.1 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\nG1 Z0.2 F720\nG1 Y-3 F1000 ; go outside print area\nG92 E0\nG1 X60 E9 F1000 ; intro line\nG1 X100 E12.5 F1000 ; intro line\nG92 E0
->>>>>>> master
default_print_profile = 0.40mm QUALITY @0.8 nozzle
default_filament_profile = Prusament PLA @0.8 nozzle
color_change_gcode = M600\nG1 E0.6 F1500 ; prime after color change
@@ -9842,13 +7430,8 @@ max_print_height = 200 default_print_profile = 0.15mm OPTIMAL @MK2.5
default_filament_profile = Prusament PLA
printer_notes = Don't remove the following keywords! These keywords are used in the "compatible printer" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_VENDOR_PRUSA3D\nPRINTER_MODEL_MK2.5\n
-<<<<<<< HEAD
-start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.10.0 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\n; select extruder\nTx\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\n\n;go outside print area\nG1 Y-3.0 F1000.0\nG1 Z0.4 F1000.0\n; load to nozzle\nTc\n; purge line\nG1 X55.0 E8.0 F2000.0\nG1 Z0.3 F1000.0\nG92 E0.0\nG1 X240.0 E25.0 F2200.0\nG1 Y-2.0 F1000.0\nG1 X55.0 E25 F1400.0\nG1 Z0.20 F1000.0\nG1 X5.0 E4.0 F1000.0\nG92 E0.0\n
-end_gcode = {if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+10, max_print_height)}{endif} F720 ; Move print head up\nG1 X0 Y210 F7200\nG1 E2 F5000\nG1 E2 F5500\nG1 E2 F6000\nG1 E-15.0000 F5800\nG1 E-20.0000 F5500\nG1 E10.0000 F3000\nG1 E-10.0000 F3100\nG1 E10.0000 F3150\nG1 E-10.0000 F3250\nG1 E10.0000 F3300\n\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nM702 C\nG4 ; wait\nM104 S0 ; turn off temperature\nM900 K0 ; reset LA\nM84 ; disable motors
-=======
start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.10.1 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\n; select extruder\nTx\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\n\n;go outside print area\nG1 Y-3 F1000\nG1 Z0.4 F1000\n; load to nozzle\nTc\n; purge line\nG1 X55 E8 F2000\nG1 Z0.3 F1000\nG92 E0\nG1 X240 E25 F2200\nG1 Y-2 F1000\nG1 X55 E25 F1400\nG1 Z0.20 F1000\nG1 X5 E4 F1000\nG92 E0\n
end_gcode = {if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+10, max_print_height)}{endif} F720 ; Move print head up\nG1 X0 Y210 F7200\nG1 E2 F5000\nG1 E2 F5500\nG1 E2 F6000\nG1 E-15 F5800\nG1 E-20 F5500\nG1 E10 F3000\nG1 E-10 F3100\nG1 E10 F3150\nG1 E-10 F3250\nG1 E10 F3300\n\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nM702 C\nG4 ; wait\nM104 S0 ; turn off temperature\nM900 K0 ; reset LA\nM84 ; disable motors
->>>>>>> master
[printer:Original Prusa i3 MK2.5 MMU2 Single 0.8 nozzle]
inherits = Original Prusa i3 MK2.5S MMU2S Single 0.8 nozzle
@@ -9871,37 +7454,20 @@ printer_notes = Don't remove the following keywords! These keywords are used in single_extruder_multi_material = 1
nozzle_diameter = 0.4,0.4,0.4,0.4,0.4
extruder_colour = #FF8000;#DB5182;#3EC0FF;#FF4F4F;#FBEB7D
-<<<<<<< HEAD
-start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.10.0 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\n\n; Send the filament type to the MMU2.0 unit.\n; E stands for extruder number, F stands for filament type (0: default; 1:flex; 2: PVA)\nM403 E0 F{"" + ((filament_type[0]=="FLEX") ? 1 : ((filament_type[0]=="PVA") ? 2 : 0))}\nM403 E1 F{"" + ((filament_type[1]=="FLEX") ? 1 : ((filament_type[1]=="PVA") ? 2 : 0))}\nM403 E2 F{"" + ((filament_type[2]=="FLEX") ? 1 : ((filament_type[2]=="PVA") ? 2 : 0))}\nM403 E3 F{"" + ((filament_type[3]=="FLEX") ? 1 : ((filament_type[3]=="PVA") ? 2 : 0))}\nM403 E4 F{"" + ((filament_type[4]=="FLEX") ? 1 : ((filament_type[4]=="PVA") ? 2 : 0))}\n\n{if not has_single_extruder_multi_material_priming}\n;go outside print area\nG1 Y-3.0 F1000.0\nG1 Z0.4 F1000.0\n; select extruder\nT[initial_tool]\n; initial load\nG1 X55.0 E32.0 F1073.0\nG1 X5.0 E32.0 F1800.0\nG1 X55.0 E8.0 F2000.0\nG1 Z0.3 F1000.0\nG92 E0.0\nG1 X240.0 E25.0 F2200.0\nG1 Y-2.0 F1000.0\nG1 X55.0 E25 F1400.0\nG1 Z0.20 F1000.0\nG1 X5.0 E4.0 F1000.0\nG92 E0.0\n{endif}\nG92 E0.0\n
-end_gcode = ; Lift print head a bit\n{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+30, max_print_height)}{endif} ; Move print head up\n{if has_wipe_tower}\nG1 E-15.0000 F3000\n{else}\nG1 X0 Y210 F7200\nG1 E2 F5000\nG1 E2 F5500\nG1 E2 F6000\nG1 E-15.0000 F5800\nG1 E-20.0000 F5500\nG1 E10.0000 F3000\nG1 E-10.0000 F3100\nG1 E10.0000 F3150\nG1 E-10.0000 F3250\nG1 E10.0000 F3300\n{endif}\n\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\n\n; Unload filament\nM702 C\n\nG4 ; wait\nM104 S0 ; turn off temperature\nG1 X0 Y210 F3000 ; home X axis\nM900 K0 ; reset LA\nM84 ; disable motors\n
-=======
start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.10.1 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\n\n; Send the filament type to the MMU2.0 unit.\n; E stands for extruder number, F stands for filament type (0: default; 1:flex; 2: PVA)\nM403 E0 F{"" + ((filament_type[0]=="FLEX") ? 1 : ((filament_type[0]=="PVA") ? 2 : 0))}\nM403 E1 F{"" + ((filament_type[1]=="FLEX") ? 1 : ((filament_type[1]=="PVA") ? 2 : 0))}\nM403 E2 F{"" + ((filament_type[2]=="FLEX") ? 1 : ((filament_type[2]=="PVA") ? 2 : 0))}\nM403 E3 F{"" + ((filament_type[3]=="FLEX") ? 1 : ((filament_type[3]=="PVA") ? 2 : 0))}\nM403 E4 F{"" + ((filament_type[4]=="FLEX") ? 1 : ((filament_type[4]=="PVA") ? 2 : 0))}\n\n{if not has_single_extruder_multi_material_priming}\n;go outside print area\nG1 Y-3 F1000\nG1 Z0.4 F1000\n; select extruder\nT[initial_tool]\n; initial load\nG1 X55 E32 F1073\nG1 X5 E32 F1800\nG1 X55 E8 F2000\nG1 Z0.3 F1000\nG92 E0\nG1 X240 E25 F2200\nG1 Y-2 F1000\nG1 X55 E25 F1400\nG1 Z0.2 F1000\nG1 X5 E4 F1000\nG92 E0\n{endif}\nG92 E0\n
end_gcode = ; Lift print head a bit\n{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+30, max_print_height)}{endif} ; Move print head up\n{if has_wipe_tower}\nG1 E-15 F3000\n{else}\nG1 X0 Y210 F7200\nG1 E2 F5000\nG1 E2 F5500\nG1 E2 F6000\nG1 E-15 F5800\nG1 E-20 F5500\nG1 E10 F3000\nG1 E-10 F3100\nG1 E10 F3150\nG1 E-10 F3250\nG1 E10 F3300\n{endif}\n\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\n\n; Unload filament\nM702 C\n\nG4 ; wait\nM104 S0 ; turn off temperature\nG1 X0 Y210 F3000 ; home X axis\nM900 K0 ; reset LA\nM84 ; disable motors\n
->>>>>>> master
[printer:Original Prusa i3 MK2.5S]
inherits = Original Prusa i3 MK2.5
printer_model = MK2.5S
-<<<<<<< HEAD
-start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.10.0 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\nG1 Y-3.0 F1000.0 ; go outside print area\nG92 E0.0\nG1 X60.0 E9.0 F1000.0 ; intro line\nG1 X100.0 E12.5 F1000.0 ; intro line\nG92 E0.0
-=======
->>>>>>> master
[printer:Original Prusa i3 MK2.5S 0.25 nozzle]
inherits = Original Prusa i3 MK2.5 0.25 nozzle
printer_model = MK2.5S
-<<<<<<< HEAD
-start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.10.0 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\nG1 Y-3.0 F1000.0 ; go outside print area\nG92 E0.0\nG1 X60.0 E9.0 F1000.0 ; intro line\nG1 X100.0 E12.5 F1000.0 ; intro line\nG92 E0.0
-=======
->>>>>>> master
[printer:Original Prusa i3 MK2.5S 0.6 nozzle]
inherits = Original Prusa i3 MK2.5 0.6 nozzle
printer_model = MK2.5S
-<<<<<<< HEAD
-start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.10.0 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\nG1 Y-3.0 F1000.0 ; go outside print area\nG92 E0.0\nG1 X60.0 E9.0 F1000.0 ; intro line\nG1 X100.0 E12.5 F1000.0 ; intro line\nG92 E0.0
-=======
->>>>>>> master
[printer:Original Prusa i3 MK2.5S 0.8 nozzle]
inherits = Original Prusa i3 MK2.5 0.8 nozzle
@@ -9915,13 +7481,8 @@ max_print_height = 200 default_print_profile = 0.15mm OPTIMAL @MK2.5
default_filament_profile = Prusament PLA
printer_notes = Don't remove the following keywords! These keywords are used in the "compatible printer" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_VENDOR_PRUSA3D\nPRINTER_MODEL_MK2.5\n
-<<<<<<< HEAD
-start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.10.0 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nTx\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\n\n;go outside print area\nG1 Y-3.0 F1000.0\nG1 Z0.4 F1000.0\n; select extruder\nTc\n; purge line\nG1 X55.0 F2000.0\nG1 Z0.3 F1000.0\nG92 E0.0\nG1 X240.0 E25.0 F2200.0\nG1 Y-2.0 F1000.0\nG1 X55.0 E25 F1400.0\nG1 Z0.20 F1000.0\nG1 X5.0 E4.0 F1000.0\nG92 E0.0\n
-end_gcode = {if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+10, max_print_height)}{endif} F720 ; Move print head up\nG1 X0 Y210 F7200\nG1 E2 F5000\nG1 E2 F5500\nG1 E2 F6000\nG1 E-15.0000 F5800\nG1 E-20.0000 F5500\nG1 E10.0000 F3000\nG1 E-10.0000 F3100\nG1 E10.0000 F3150\nG1 E-10.0000 F3250\nG1 E10.0000 F3300\n\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nM702 C\nG4 ; wait\nM104 S0 ; turn off temperature\nM900 K0 ; reset LA\nM84 ; disable motors
-=======
start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.10.1 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nTx\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\n\n;go outside print area\nG1 Y-3 F1000\nG1 Z0.4 F1000\n; select extruder\nTc\n; purge line\nG1 X55 F2000\nG1 Z0.3 F1000\nG92 E0\nG1 X240 E25 F2200\nG1 Y-2 F1000\nG1 X55 E25 F1400\nG1 Z0.2 F1000\nG1 X5 E4 F1000\nG92 E0\n
end_gcode = {if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+10, max_print_height)}{endif} F720 ; Move print head up\nG1 X0 Y210 F7200\nG1 E2 F5000\nG1 E2 F5500\nG1 E2 F6000\nG1 E-15 F5800\nG1 E-20 F5500\nG1 E10 F3000\nG1 E-10 F3100\nG1 E10 F3150\nG1 E-10 F3250\nG1 E10 F3300\n\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nM702 C\nG4 ; wait\nM104 S0 ; turn off temperature\nM900 K0 ; reset LA\nM84 ; disable motors
->>>>>>> master
[printer:Original Prusa i3 MK2.5S MMU2S Single 0.8 nozzle]
inherits = Original Prusa i3 MK2.5S MMU2S Single
@@ -9931,11 +7492,7 @@ min_layer_height = 0.2 nozzle_diameter = 0.8
printer_variant = 0.8
retract_length = 1
-<<<<<<< HEAD
-start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM115 U3.10.0 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nTx\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\n\n;go outside print area\nG1 Y-3.0 F1000.0\nG1 Z0.4 F1000.0\n; select extruder\nTc\n; purge line\nG1 X55.0 F2000.0\nG1 Z0.3 F1000.0\nG92 E0.0\nG1 X240.0 E25.0 F2200.0\nG1 Y-2.0 F1000.0\nG1 X55.0 E25 F1400.0\nG1 Z0.20 F1000.0\nG1 X5.0 E4.0 F1000.0\nG92 E0.0\n
-=======
start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.10.1 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nTx\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\n\n;go outside print area\nG1 Y-3 F1000\nG1 Z0.4 F1000\n; select extruder\nTc\n; purge line\nG1 X55 F2000\nG1 Z0.3 F1000\nG92 E0\nG1 X240 E25 F2200\nG1 Y-2 F1000\nG1 X55 E25 F1400\nG1 Z0.2 F1000\nG1 X5 E4 F1000\nG92 E0\n
->>>>>>> master
default_print_profile = 0.40mm QUALITY @0.8 nozzle
default_filament_profile = Prusament PLA @0.8 nozzle
color_change_gcode = M600\nG1 E0.6 F1500 ; prime after color change
@@ -9959,12 +7516,8 @@ nozzle_diameter = 0.25 printer_variant = 0.25
retract_lift = 0.15
default_print_profile = 0.10mm DETAIL 0.25 nozzle
-<<<<<<< HEAD
-start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.10.0 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nTx\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\n\n;go outside print area\nG1 Y-3.0 F1000.0\nG1 Z0.4 F1000.0\n; select extruder\nTc\n; purge line\nG1 X55.0 F2000.0\nG1 Z0.3 F1000.0\nG92 E0.0\nG1 X240.0 E25.0 F1400.0\nG1 Y-2.0 F1000.0\nG1 X55.0 E25 F1400.0\nG1 Z0.20 F1000.0\nG1 X5.0 E4.0 F1000.0\nG92 E0.0\n
-=======
start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.10.1 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nTx\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\n\n;go outside print area\nG1 Y-3 F1000\nG1 Z0.4 F1000\n; select extruder\nTc\n; purge line\nG1 X55 F2000\nG1 Z0.3 F1000\nG92 E0\nG1 X240 E25 F1400\nG1 Y-2 F1000\nG1 X55 E25 F1400\nG1 Z0.2 F1000\nG1 X5 E4 F1000\nG92 E0\n
color_change_gcode = M600\nG1 E0.3 F1500 ; prime after color change
->>>>>>> master
[printer:Original Prusa i3 MK2.5S MMU2S]
inherits = *25mm2s*
@@ -9975,13 +7528,8 @@ printer_notes = Don't remove the following keywords! These keywords are used in single_extruder_multi_material = 1
nozzle_diameter = 0.4,0.4,0.4,0.4,0.4
extruder_colour = #FF8000;#DB5182;#3EC0FF;#FF4F4F;#FBEB7D
-<<<<<<< HEAD
-start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.10.0 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\n\n; Send the filament type to the MMU2.0 unit.\n; E stands for extruder number, F stands for filament type (0: default; 1:flex; 2: PVA)\nM403 E0 F{"" + ((filament_type[0]=="FLEX") ? 1 : ((filament_type[0]=="PVA") ? 2 : 0))}\nM403 E1 F{"" + ((filament_type[1]=="FLEX") ? 1 : ((filament_type[1]=="PVA") ? 2 : 0))}\nM403 E2 F{"" + ((filament_type[2]=="FLEX") ? 1 : ((filament_type[2]=="PVA") ? 2 : 0))}\nM403 E3 F{"" + ((filament_type[3]=="FLEX") ? 1 : ((filament_type[3]=="PVA") ? 2 : 0))}\nM403 E4 F{"" + ((filament_type[4]=="FLEX") ? 1 : ((filament_type[4]=="PVA") ? 2 : 0))}\n\n{if not has_single_extruder_multi_material_priming}\n;go outside print area\nG1 Y-3.0 F1000.0\nG1 Z0.4 F1000.0\n; select extruder\nT[initial_tool]\n; initial load\nG1 X55.0 E29.0 F1073.0\nG1 X5.0 E29.0 F1800.0\nG1 X55.0 E8.0 F2000.0\nG1 Z0.3 F1000.0\nG92 E0.0\nG1 X240.0 E25.0 F2200.0\nG1 Y-2.0 F1000.0\nG1 X55.0 E25 F1400.0\nG1 Z0.20 F1000.0\nG1 X5.0 E4.0 F1000.0\nG92 E0.0\n{endif}\nG92 E0.0\n
-end_gcode = ; Lift print head a bit\n{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+30, max_print_height)}{endif} ; Move print head up\n{if has_wipe_tower}\nG1 E-15.0000 F3000\n{else}\nG1 X0 Y210 F7200\nG1 E2 F5000\nG1 E2 F5500\nG1 E2 F6000\nG1 E-15.0000 F5800\nG1 E-20.0000 F5500\nG1 E10.0000 F3000\nG1 E-10.0000 F3100\nG1 E10.0000 F3150\nG1 E-10.0000 F3250\nG1 E10.0000 F3300\n{endif}\n\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\n\n; Unload filament\nM702 C\n\nG4 ; wait\nM104 S0 ; turn off temperature\nG1 X0 Y210 F3000 ; home X axis\nM900 K0 ; reset LA\nM84 ; disable motors\n
-=======
start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.10.1 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\n\n; Send the filament type to the MMU2.0 unit.\n; E stands for extruder number, F stands for filament type (0: default; 1:flex; 2: PVA)\nM403 E0 F{"" + ((filament_type[0]=="FLEX") ? 1 : ((filament_type[0]=="PVA") ? 2 : 0))}\nM403 E1 F{"" + ((filament_type[1]=="FLEX") ? 1 : ((filament_type[1]=="PVA") ? 2 : 0))}\nM403 E2 F{"" + ((filament_type[2]=="FLEX") ? 1 : ((filament_type[2]=="PVA") ? 2 : 0))}\nM403 E3 F{"" + ((filament_type[3]=="FLEX") ? 1 : ((filament_type[3]=="PVA") ? 2 : 0))}\nM403 E4 F{"" + ((filament_type[4]=="FLEX") ? 1 : ((filament_type[4]=="PVA") ? 2 : 0))}\n\n{if not has_single_extruder_multi_material_priming}\n;go outside print area\nG1 Y-3 F1000\nG1 Z0.4 F1000\n; select extruder\nT[initial_tool]\n; initial load\nG1 X55 E29 F1073\nG1 X5 E29 F1800\nG1 X55 E8 F2000\nG1 Z0.3 F1000\nG92 E0\nG1 X240 E25 F2200\nG1 Y-2 F1000\nG1 X55 E25 F1400\nG1 Z0.2 F1000\nG1 X5 E4 F1000\nG92 E0\n{endif}\nG92 E0\n
end_gcode = ; Lift print head a bit\n{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+30, max_print_height)}{endif} ; Move print head up\n{if has_wipe_tower}\nG1 E-15 F3000\n{else}\nG1 X0 Y210 F7200\nG1 E2 F5000\nG1 E2 F5500\nG1 E2 F6000\nG1 E-15 F5800\nG1 E-20 F5500\nG1 E10 F3000\nG1 E-10 F3100\nG1 E10 F3150\nG1 E-10 F3250\nG1 E10 F3300\n{endif}\n\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\n\n; Unload filament\nM702 C\n\nG4 ; wait\nM104 S0 ; turn off temperature\nG1 X0 Y210 F3000 ; home X axis\nM900 K0 ; reset LA\nM84 ; disable motors\n
->>>>>>> master
[printer:Original Prusa i3 MK2.5S MMU2S 0.6 nozzle]
inherits = Original Prusa i3 MK2.5S MMU2S
@@ -10011,11 +7559,7 @@ color_change_gcode = M600\nG1 E0.5 F1500 ; prime after color change ## printer_variant = 0.8
## retract_length = 1
## default_print_profile = 0.40mm QUALITY @0.8 nozzle
-<<<<<<< HEAD
-## start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM115 U3.10.0 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\n\n; Send the filament type to the MMU2.0 unit.\n; E stands for extruder number, F stands for filament type (0: default; 1:flex; 2: PVA)\nM403 E0 F{"" + ((filament_type[0]=="FLEX") ? 1 : ((filament_type[0]=="PVA") ? 2 : 0))}\nM403 E1 F{"" + ((filament_type[1]=="FLEX") ? 1 : ((filament_type[1]=="PVA") ? 2 : 0))}\nM403 E2 F{"" + ((filament_type[2]=="FLEX") ? 1 : ((filament_type[2]=="PVA") ? 2 : 0))}\nM403 E3 F{"" + ((filament_type[3]=="FLEX") ? 1 : ((filament_type[3]=="PVA") ? 2 : 0))}\nM403 E4 F{"" + ((filament_type[4]=="FLEX") ? 1 : ((filament_type[4]=="PVA") ? 2 : 0))}\n\n{if not has_single_extruder_multi_material_priming}\n;go outside print area\nG1 Y-3.0 F1000.0\nG1 Z0.4 F1000.0\n; select extruder\nT[initial_tool]\n; initial load\nG1 X55.0 E29.0 F1073.0\nG1 X5.0 E29.0 F1800.0\nG1 X55.0 E8.0 F2000.0\nG1 Z0.3 F1000.0\nG92 E0.0\nG1 X240.0 E25.0 F2200.0\nG1 Y-2.0 F1000.0\nG1 X55.0 E25 F1400.0\nG1 Z0.20 F1000.0\nG1 X5.0 E4.0 F1000.0\nG92 E0.0\n{endif}\nG92 E0.0\n
-=======
## start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.10.1 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\n\n; Send the filament type to the MMU2.0 unit.\n; E stands for extruder number, F stands for filament type (0: default; 1:flex; 2: PVA)\nM403 E0 F{"" + ((filament_type[0]=="FLEX") ? 1 : ((filament_type[0]=="PVA") ? 2 : 0))}\nM403 E1 F{"" + ((filament_type[1]=="FLEX") ? 1 : ((filament_type[1]=="PVA") ? 2 : 0))}\nM403 E2 F{"" + ((filament_type[2]=="FLEX") ? 1 : ((filament_type[2]=="PVA") ? 2 : 0))}\nM403 E3 F{"" + ((filament_type[3]=="FLEX") ? 1 : ((filament_type[3]=="PVA") ? 2 : 0))}\nM403 E4 F{"" + ((filament_type[4]=="FLEX") ? 1 : ((filament_type[4]=="PVA") ? 2 : 0))}\n\n{if not has_single_extruder_multi_material_priming}\n;go outside print area\nG1 Y-3.0 F1000.0\nG1 Z0.4 F1000.0\n; select extruder\nT[initial_tool]\n; initial load\nG1 X55.0 E29.0 F1073.0\nG1 X5.0 E29.0 F1800.0\nG1 X55.0 E8.0 F2000.0\nG1 Z0.3 F1000.0\nG92 E0.0\nG1 X240.0 E25.0 F2200.0\nG1 Y-2.0 F1000.0\nG1 X55.0 E25 F1400.0\nG1 Z0.20 F1000.0\nG1 X5.0 E4.0 F1000.0\nG92 E0.0\n{endif}\nG92 E0.0\n
->>>>>>> master
## [printer:Original Prusa i3 MK2.5 MMU2 0.8 nozzle]
## inherits = Original Prusa i3 MK2.5 MMU2
@@ -10025,11 +7569,7 @@ color_change_gcode = M600\nG1 E0.5 F1500 ; prime after color change ## printer_variant = 0.8
## retract_length = 1
## default_print_profile = 0.40mm QUALITY @0.8 nozzle
-<<<<<<< HEAD
-## start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM115 U3.10.0 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\n\n; Send the filament type to the MMU2.0 unit.\n; E stands for extruder number, F stands for filament type (0: default; 1:flex; 2: PVA)\nM403 E0 F{"" + ((filament_type[0]=="FLEX") ? 1 : ((filament_type[0]=="PVA") ? 2 : 0))}\nM403 E1 F{"" + ((filament_type[1]=="FLEX") ? 1 : ((filament_type[1]=="PVA") ? 2 : 0))}\nM403 E2 F{"" + ((filament_type[2]=="FLEX") ? 1 : ((filament_type[2]=="PVA") ? 2 : 0))}\nM403 E3 F{"" + ((filament_type[3]=="FLEX") ? 1 : ((filament_type[3]=="PVA") ? 2 : 0))}\nM403 E4 F{"" + ((filament_type[4]=="FLEX") ? 1 : ((filament_type[4]=="PVA") ? 2 : 0))}\n\n{if not has_single_extruder_multi_material_priming}\n;go outside print area\nG1 Y-3.0 F1000.0\nG1 Z0.4 F1000.0\n; select extruder\nT[initial_tool]\n; initial load\nG1 X55.0 E29.0 F1073.0\nG1 X5.0 E29.0 F1800.0\nG1 X55.0 E8.0 F2000.0\nG1 Z0.3 F1000.0\nG92 E0.0\nG1 X240.0 E25.0 F2200.0\nG1 Y-2.0 F1000.0\nG1 X55.0 E25 F1400.0\nG1 Z0.20 F1000.0\nG1 X5.0 E4.0 F1000.0\nG92 E0.0\n{endif}\nG92 E0.0\n
-=======
## start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.10.1 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\n\n; Send the filament type to the MMU2.0 unit.\n; E stands for extruder number, F stands for filament type (0: default; 1:flex; 2: PVA)\nM403 E0 F{"" + ((filament_type[0]=="FLEX") ? 1 : ((filament_type[0]=="PVA") ? 2 : 0))}\nM403 E1 F{"" + ((filament_type[1]=="FLEX") ? 1 : ((filament_type[1]=="PVA") ? 2 : 0))}\nM403 E2 F{"" + ((filament_type[2]=="FLEX") ? 1 : ((filament_type[2]=="PVA") ? 2 : 0))}\nM403 E3 F{"" + ((filament_type[3]=="FLEX") ? 1 : ((filament_type[3]=="PVA") ? 2 : 0))}\nM403 E4 F{"" + ((filament_type[4]=="FLEX") ? 1 : ((filament_type[4]=="PVA") ? 2 : 0))}\n\n{if not has_single_extruder_multi_material_priming}\n;go outside print area\nG1 Y-3.0 F1000.0\nG1 Z0.4 F1000.0\n; select extruder\nT[initial_tool]\n; initial load\nG1 X55.0 E29.0 F1073.0\nG1 X5.0 E29.0 F1800.0\nG1 X55.0 E8.0 F2000.0\nG1 Z0.3 F1000.0\nG92 E0.0\nG1 X240.0 E25.0 F2200.0\nG1 Y-2.0 F1000.0\nG1 X55.0 E25 F1400.0\nG1 Z0.20 F1000.0\nG1 X5.0 E4.0 F1000.0\nG92 E0.0\n{endif}\nG92 E0.0\n
->>>>>>> master
# XXXXXXXXXXXXXXXXX
# XXX--- MK3 ---XXX
@@ -10059,11 +7599,7 @@ remaining_times = 1 printer_notes = Don't remove the following keywords! These keywords are used in the "compatible printer" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_VENDOR_PRUSA3D\nPRINTER_MODEL_MK3\n
retract_lift_below = 209
max_print_height = 210
-<<<<<<< HEAD
-start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.10.0 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\nG1 Y-3.0 F1000.0 ; go outside print area\nG92 E0.0\nG1 X60.0 E9.0 F1000.0 ; intro line\nG1 X100.0 E12.5 F1000.0 ; intro line\nG92 E0.0\nM221 S{if layer_height<0.075}100{else}95{endif}\n\n; Don't change E values below. Excessive value can damage the printer.\n{if print_settings_id=~/.*(DETAIL @MK3|QUALITY @MK3).*/}M907 E430 ; set extruder motor current{endif}\n{if print_settings_id=~/.*(SPEED @MK3|DRAFT @MK3).*/}M907 E538 ; set extruder motor current{endif}
-=======
start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.10.1 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\nG1 Z0.2 F720\nG1 Y-3 F1000 ; go outside print area\nG92 E0\nG1 X60 E9 F1000 ; intro line\nG1 X100 E12.5 F1000 ; intro line\nG92 E0\nM221 S{if layer_height<0.075}100{else}95{endif}\n\n; Don't change E values below. Excessive value can damage the printer.\n{if print_settings_id=~/.*(DETAIL @MK3|QUALITY @MK3).*/}M907 E430 ; set extruder motor current{endif}\n{if print_settings_id=~/.*(SPEED @MK3|DRAFT @MK3).*/}M907 E538 ; set extruder motor current{endif}
->>>>>>> master
printer_model = MK3
default_print_profile = 0.15mm QUALITY @MK3
@@ -10074,11 +7610,7 @@ max_layer_height = 0.15 min_layer_height = 0.05
printer_variant = 0.25
retract_lift = 0.15
-<<<<<<< HEAD
-start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.10.0 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\nG1 Y-3.0 F1000.0 ; go outside print area\nG92 E0.0\nG1 X60.0 E8.0 F700.0 ; intro line\nG1 X100.0 E12.5 F700.0 ; intro line\nG92 E0.0\nM221 S{if layer_height<0.075}100{else}95{endif}\n\n; Don't change E value below. Excessive value can damage the printer.\n{if print_settings_id=~/.*@0.25 nozzle MK3.*/}M907 E430 ; set extruder motor current{endif}
-=======
start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.10.1 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\nG1 Z0.2 F720\nG1 Y-3 F1000 ; go outside print area\nG92 E0\nG1 X60 E8 F700 ; intro line\nG1 X100 E12.5 F700 ; intro line\nG92 E0\nM221 S{if layer_height<0.075}100{else}95{endif}\n\n; Don't change E value below. Excessive value can damage the printer.\n{if print_settings_id=~/.*@0.25 nozzle MK3.*/}M907 E430 ; set extruder motor current{endif}
->>>>>>> master
default_print_profile = 0.10mm DETAIL @0.25 nozzle MK3
color_change_gcode = M600\nG1 E0.3 F1500 ; prime after color change
@@ -10088,11 +7620,7 @@ nozzle_diameter = 0.6 max_layer_height = 0.40
min_layer_height = 0.15
printer_variant = 0.6
-<<<<<<< HEAD
-start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.10.0 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\nG1 Y-3.0 F1000.0 ; go outside print area\nG92 E0.0\nG1 X60.0 E9.0 F1000.0 ; intro line\nG1 X100.0 E12.5 F1000.0 ; intro line\nG92 E0.0\nM221 S{if layer_height<0.075}100{else}95{endif}
-=======
start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.10.1 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\nG1 Z0.2 F720\nG1 Y-3 F1000 ; go outside print area\nG92 E0\nG1 X60 E9 F1000 ; intro line\nG1 X100 E12.5 F1000 ; intro line\nG92 E0\nM221 S{if layer_height<0.075}100{else}95{endif}
->>>>>>> master
default_print_profile = 0.30mm QUALITY @0.6 nozzle MK3
color_change_gcode = M600\nG1 E0.5 F1500 ; prime after color change
@@ -10103,11 +7631,7 @@ max_layer_height = 0.6 min_layer_height = 0.2
printer_variant = 0.8
retract_length = 1
-<<<<<<< HEAD
-start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM115 U3.10.0 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\nG1 Y-3.0 F1000.0 ; go outside print area\nG92 E0.0\nG1 X60.0 E9.0 F1000.0 ; intro line\nG1 X100.0 E12.5 F1000.0 ; intro line\nG92 E0.0\nM221 S{if layer_height<0.075}100{else}95{endif}
-=======
start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.10.1 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\nG1 Z0.2 F720\nG1 Y-3 F1000 ; go outside print area\nG92 E0\nG1 X60 E9 F1000 ; intro line\nG1 X100 E12.5 F1000 ; intro line\nG92 E0\nM221 S95
->>>>>>> master
default_print_profile = 0.40mm QUALITY @0.8 nozzle
default_filament_profile = Prusament PLA @0.8 nozzle
color_change_gcode = M600\nG1 E0.6 F1500 ; prime after color change
@@ -10116,19 +7640,11 @@ color_change_gcode = M600\nG1 E0.6 F1500 ; prime after color change inherits = Original Prusa i3 MK3
renamed_from = "Original Prusa i3 MK3S"
printer_model = MK3S
-<<<<<<< HEAD
-start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.10.0 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\nG1 Y-3.0 F1000.0 ; go outside print area\nG92 E0.0\nG1 X60.0 E9.0 F1000.0 ; intro line\nG1 X100.0 E12.5 F1000.0 ; intro line\nG92 E0.0\nM221 S{if layer_height<0.075}100{else}95{endif}\n\n; Don't change E values below. Excessive value can damage the printer.\n{if print_settings_id=~/.*(DETAIL @MK3|QUALITY @MK3).*/}M907 E430 ; set extruder motor current{endif}\n{if print_settings_id=~/.*(SPEED @MK3|DRAFT @MK3).*/}M907 E538 ; set extruder motor current{endif}
-=======
->>>>>>> master
[printer:Original Prusa i3 MK3S & MK3S+ 0.25 nozzle]
inherits = Original Prusa i3 MK3 0.25 nozzle
renamed_from = "Original Prusa i3 MK3S 0.25 nozzle"
printer_model = MK3S
-<<<<<<< HEAD
-start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.10.0 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\nG1 Y-3.0 F1000.0 ; go outside print area\nG92 E0.0\nG1 X60.0 E8.0 F700.0 ; intro line\nG1 X100.0 E12.5 F700.0 ; intro line\nG92 E0.0\nM221 S{if layer_height<0.075}100{else}95{endif}\n\n; Don't change E value below. Excessive value can damage the printer.\n{if print_settings_id=~/.*@0.25 nozzle MK3.*/}M907 E430 ; set extruder motor current{endif}
-=======
->>>>>>> master
[printer:Original Prusa i3 MK3S & MK3S+ 0.6 nozzle]
inherits = Original Prusa i3 MK3 0.6 nozzle
@@ -10145,11 +7661,7 @@ single_extruder_multi_material = 1 cooling_tube_length = 10
cooling_tube_retraction = 30
parking_pos_retraction = 85
-<<<<<<< HEAD
-retract_length_toolchange = 2
-=======
retract_length_toolchange = 0
->>>>>>> master
extra_loading_move = -13
printer_model = MK3MMU2
default_print_profile = 0.15mm QUALITY @MK3
@@ -10161,11 +7673,7 @@ single_extruder_multi_material = 1 cooling_tube_length = 20
cooling_tube_retraction = 40
parking_pos_retraction = 85
-<<<<<<< HEAD
-retract_length_toolchange = 2
-=======
retract_length_toolchange = 0
->>>>>>> master
extra_loading_move = -25
printer_model = MK3SMMU2S
default_print_profile = 0.15mm QUALITY @MK3
@@ -10195,13 +7703,8 @@ default_filament_profile = Prusament PLA @MMU2 inherits = *mm2*
single_extruder_multi_material = 0
default_filament_profile = Prusament PLA
-<<<<<<< HEAD
-start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.10.0 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nTx\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\n\n;go outside print area\nG1 Y-3.0 F1000.0\nG1 Z0.4 F1000.0\n; select extruder\nTc\n; purge line\nG1 X55.0 E8.0 F2000.0\nG1 Z0.3 F1000.0\nG92 E0.0\nG1 X240.0 E25.0 F2200.0\nG1 Y-2.0 F1000.0\nG1 X55.0 E25 F1400.0\nG1 Z0.20 F1000.0\nG1 X5.0 E4.0 F1000.0\n\nM221 S{if layer_height<0.075}100{else}95{endif}\nG92 E0.0\n\n; Don't change E values below. Excessive value can damage the printer.\n{if print_settings_id=~/.*(DETAIL @MK3|QUALITY @MK3).*/}M907 E430 ; set extruder motor current{endif}\n{if print_settings_id=~/.*(SPEED @MK3|DRAFT @MK3).*/}M907 E538 ; set extruder motor current{endif}
-end_gcode = {if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+10, max_print_height)}{endif} F720 ; Move print head up\nG1 X0 Y210 F7200\nG1 E2 F5000\nG1 E2 F5500\nG1 E2 F6000\nG1 E-15.0000 F5800\nG1 E-20.0000 F5500\nG1 E10.0000 F3000\nG1 E-10.0000 F3100\nG1 E10.0000 F3150\nG1 E-10.0000 F3250\nG1 E10.0000 F3300\n\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nM702 C\nG4 ; wait\nM221 S100 ; reset flow\nM900 K0 ; reset LA\n{if print_settings_id=~/.*(DETAIL @MK3|QUALITY @MK3|@0.25 nozzle MK3).*/}M907 E538 ; reset extruder motor current{endif}\nM104 S0 ; turn off temperature\nM84 ; disable motors
-=======
start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.10.1 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nTx\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\n\n;go outside print area\nG1 Y-3 F1000\nG1 Z0.4 F1000\n; select extruder\nTc\n; purge line\nG1 X55 E8 F2000\nG1 Z0.3 F1000\nG92 E0\nG1 X240 E25 F2200\nG1 Y-2 F1000\nG1 X55 E25 F1400\nG1 Z0.2 F1000\nG1 X5 E4 F1000\n\nM221 S{if layer_height<0.075}100{else}95{endif}\nG92 E0\n\n; Don't change E values below. Excessive value can damage the printer.\n{if print_settings_id=~/.*(DETAIL @MK3|QUALITY @MK3).*/}M907 E430 ; set extruder motor current{endif}\n{if print_settings_id=~/.*(SPEED @MK3|DRAFT @MK3).*/}M907 E538 ; set extruder motor current{endif}
end_gcode = {if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+10, max_print_height)}{endif} F720 ; Move print head up\nG1 X0 Y210 F7200\nG1 E2 F5000\nG1 E2 F5500\nG1 E2 F6000\nG1 E-15 F5800\nG1 E-20 F5500\nG1 E10 F3000\nG1 E-10 F3100\nG1 E10 F3150\nG1 E-10 F3250\nG1 E10 F3300\n\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nM702 C\nG4 ; wait\nM221 S100 ; reset flow\nM900 K0 ; reset LA\n{if print_settings_id=~/.*(DETAIL @MK3|QUALITY @MK3|@0.25 nozzle MK3).*/}M907 E538 ; reset extruder motor current{endif}\nM104 S0 ; turn off temperature\nM84 ; disable motors
->>>>>>> master
[printer:Original Prusa i3 MK3 MMU2 Single 0.6 nozzle]
inherits = Original Prusa i3 MK3 MMU2 Single
@@ -10210,11 +7713,7 @@ nozzle_diameter = 0.6 max_layer_height = 0.40
min_layer_height = 0.15
printer_variant = 0.6
-<<<<<<< HEAD
-start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.10.0 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nTx\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\n\n;go outside print area\nG1 Y-3.0 F1000.0\nG1 Z0.4 F1000.0\n; select extruder\nTc\n; purge line\nG1 X55.0 E8.0 F2000.0\nG1 Z0.3 F1000.0\nG92 E0.0\nG1 X240.0 E25.0 F2200.0\nG1 Y-2.0 F1000.0\nG1 X55.0 E25 F1400.0\nG1 Z0.20 F1000.0\nG1 X5.0 E4.0 F1000.0\n\nM221 S{if layer_height<0.075}100{else}95{endif}\nG92 E0.0
-=======
start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.10.1 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nTx\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\n\n;go outside print area\nG1 Y-3 F1000\nG1 Z0.4 F1000\n; select extruder\nTc\n; purge line\nG1 X55 E8 F2000\nG1 Z0.3 F1000\nG92 E0\nG1 X240 E25 F2200\nG1 Y-2 F1000\nG1 X55 E25 F1400\nG1 Z0.2 F1000\nG1 X5 E4 F1000\n\nM221 S{if layer_height<0.075}100{else}95{endif}\nG92 E0
->>>>>>> master
default_print_profile = 0.30mm QUALITY @0.6 nozzle MK3
color_change_gcode = M600\nG1 E0.5 F1500 ; prime after color change
@@ -10226,11 +7725,7 @@ max_layer_height = 0.6 min_layer_height = 0.2
printer_variant = 0.8
retract_length = 1
-<<<<<<< HEAD
-start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM115 U3.10.0 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nTx\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\n\n;go outside print area\nG1 Y-3.0 F1000.0\nG1 Z0.4 F1000.0\n; select extruder\nTc\n; purge line\nG1 X55.0 E8.0 F2000.0\nG1 Z0.3 F1000.0\nG92 E0.0\nG1 X240.0 E25.0 F2200.0\nG1 Y-2.0 F1000.0\nG1 X55.0 E25 F1400.0\nG1 Z0.20 F1000.0\nG1 X5.0 E4.0 F1000.0\n\nM221 S{if layer_height<0.075}100{else}95{endif}\nG92 E0.0
-=======
start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.10.1 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nTx\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\n\n;go outside print area\nG1 Y-3 F1000\nG1 Z0.4 F1000\n; select extruder\nTc\n; purge line\nG1 X55 E8 F2000\nG1 Z0.3 F1000\nG92 E0\nG1 X240 E25 F2200\nG1 Y-2 F1000\nG1 X55 E25 F1400\nG1 Z0.2 F1000\nG1 X5 E4 F1000\n\nM221 S{if layer_height<0.075}100{else}95{endif}\nG92 E0
->>>>>>> master
default_print_profile = 0.40mm QUALITY @0.8 nozzle
default_filament_profile = Prusament PLA @0.8 nozzle
color_change_gcode = M600\nG1 E0.6 F1500 ; prime after color change
@@ -10243,11 +7738,7 @@ max_layer_height = 0.15 min_layer_height = 0.05
printer_variant = 0.25
retract_lift = 0.15
-<<<<<<< HEAD
-start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.10.0 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nTx\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\n\n;go outside print area\nG1 Y-3.0 F1000.0\nG1 Z0.4 F1000.0\n; select extruder\nTc\n; purge line\nG1 X55.0 E8.0 F1000.0\nG1 Z0.3 F1000.0\nG92 E0.0\nG1 X240.0 E25.0 F1400.0\nG1 Y-2.0 F1000.0\nG1 X55.0 E25 F1400.0\nG1 Z0.20 F1000.0\nG1 X5.0 E4.0 F1000.0\n\nM221 S{if layer_height<0.075}100{else}95{endif}\nG92 E0.0\n\n; Don't change E value below. Excessive value can damage the printer.\n{if print_settings_id=~/.*@0.25 nozzle MK3.*/}M907 E430 ; set extruder motor current{endif}
-=======
start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.10.1 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nTx\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\n\n;go outside print area\nG1 Y-3 F1000\nG1 Z0.4 F1000\n; select extruder\nTc\n; purge line\nG1 X55 E8 F1000\nG1 Z0.3 F1000\nG92 E0\nG1 X240 E25 F1400\nG1 Y-2 F1000\nG1 X55 E25 F1400\nG1 Z0.2 F1000\nG1 X5 E4 F1000\n\nM221 S{if layer_height<0.075}100{else}95{endif}\nG92 E0\n\n; Don't change E value below. Excessive value can damage the printer.\n{if print_settings_id=~/.*@0.25 nozzle MK3.*/}M907 E430 ; set extruder motor current{endif}
->>>>>>> master
default_print_profile = 0.10mm DETAIL @0.25 nozzle MK3
color_change_gcode = M600\nG1 E0.3 F1500 ; prime after color change
@@ -10256,26 +7747,16 @@ inherits = *mm2* machine_max_acceleration_e = 8000,8000
nozzle_diameter = 0.4,0.4,0.4,0.4,0.4
extruder_colour = #FF8000;#DB5182;#3EC0FF;#FF4F4F;#FBEB7D
-<<<<<<< HEAD
-start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.10.0 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\n\n; Send the filament type to the MMU2.0 unit.\n; E stands for extruder number, F stands for filament type (0: default; 1:flex; 2: PVA)\nM403 E0 F{"" + ((filament_type[0]=="FLEX") ? 1 : ((filament_type[0]=="PVA") ? 2 : 0))}\nM403 E1 F{"" + ((filament_type[1]=="FLEX") ? 1 : ((filament_type[1]=="PVA") ? 2 : 0))}\nM403 E2 F{"" + ((filament_type[2]=="FLEX") ? 1 : ((filament_type[2]=="PVA") ? 2 : 0))}\nM403 E3 F{"" + ((filament_type[3]=="FLEX") ? 1 : ((filament_type[3]=="PVA") ? 2 : 0))}\nM403 E4 F{"" + ((filament_type[4]=="FLEX") ? 1 : ((filament_type[4]=="PVA") ? 2 : 0))}\n\n{if not has_single_extruder_multi_material_priming}\n;go outside print area\nG1 Y-3.0 F1000.0\nG1 Z0.4 F1000.0\n; select extruder\nT[initial_tool]\n; initial load\nG1 X55.0 E32.0 F1073.0\nG1 X5.0 E32.0 F1800.0\nG1 X55.0 E8.0 F2000.0\nG1 Z0.3 F1000.0\nG92 E0.0\nG1 X240.0 E25.0 F2200.0\nG1 Y-2.0 F1000.0\nG1 X55.0 E25 F1400.0\nG1 Z0.20 F1000.0\nG1 X5.0 E4.0 F1000.0\nG92 E0.0\n{endif}\n\nM221 S{if layer_height<0.075}100{else}95{endif}\nG92 E0.0\n\n; Don't change E values below. Excessive value can damage the printer.\n{if print_settings_id=~/.*(DETAIL @MK3|QUALITY @MK3|SOLUBLE).*/}M907 E430 ; set extruder motor current{endif}\n{if print_settings_id=~/.*(SPEED @MK3|DRAFT @MK3).*/}M907 E538 ; set extruder motor current{endif}
-end_gcode = ; Lift print head a bit\n{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+30, max_print_height)}{endif} ; Move print head up\n{if has_wipe_tower}\nG1 E-15.0000 F3000\n{else}\nG1 X0 Y210 F7200\nG1 E2 F5000\nG1 E2 F5500\nG1 E2 F6000\nG1 E-15.0000 F5800\nG1 E-20.0000 F5500\nG1 E10.0000 F3000\nG1 E-10.0000 F3100\nG1 E10.0000 F3150\nG1 E-10.0000 F3250\nG1 E10.0000 F3300\n{endif}\n\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\n\n; Unload filament\nM702 C\n\nG4 ; wait\nM221 S100 ; reset flow\nM900 K0 ; reset LA\n{if print_settings_id=~/.*(DETAIL @MK3|QUALITY @MK3|SOLUBLE|@0.25 nozzle MK3).*/}M907 E538 ; reset extruder motor current{endif}\nM104 S0 ; turn off temperature\nG1 X0 Y210 F3000 ; home X axis\nM84 ; disable motors\n
-=======
start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.10.1 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\n\n; Send the filament type to the MMU2.0 unit.\n; E stands for extruder number, F stands for filament type (0: default; 1:flex; 2: PVA)\nM403 E0 F{"" + ((filament_type[0]=="FLEX") ? 1 : ((filament_type[0]=="PVA") ? 2 : 0))}\nM403 E1 F{"" + ((filament_type[1]=="FLEX") ? 1 : ((filament_type[1]=="PVA") ? 2 : 0))}\nM403 E2 F{"" + ((filament_type[2]=="FLEX") ? 1 : ((filament_type[2]=="PVA") ? 2 : 0))}\nM403 E3 F{"" + ((filament_type[3]=="FLEX") ? 1 : ((filament_type[3]=="PVA") ? 2 : 0))}\nM403 E4 F{"" + ((filament_type[4]=="FLEX") ? 1 : ((filament_type[4]=="PVA") ? 2 : 0))}\n\n{if not has_single_extruder_multi_material_priming}\n;go outside print area\nG1 Y-3 F1000\nG1 Z0.4 F1000\n; select extruder\nT[initial_tool]\n; initial load\nG1 X55 E32 F1073\nG1 X5 E32 F1800\nG1 X55 E8 F2000\nG1 Z0.3 F1000\nG92 E0\nG1 X240 E25 F2200\nG1 Y-2 F1000\nG1 X55 E25 F1400\nG1 Z0.2 F1000\nG1 X5 E4 F1000\nG92 E0\n{endif}\n\nM221 S{if layer_height<0.075}100{else}95{endif}\nG92 E0\n\n; Don't change E values below. Excessive value can damage the printer.\n{if print_settings_id=~/.*(DETAIL @MK3|QUALITY @MK3|SOLUBLE).*/}M907 E430 ; set extruder motor current{endif}\n{if print_settings_id=~/.*(SPEED @MK3|DRAFT @MK3).*/}M907 E538 ; set extruder motor current{endif}
end_gcode = ; Lift print head a bit\n{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+30, max_print_height)}{endif} ; Move print head up\n{if has_wipe_tower}\nG1 E-15 F3000\n{else}\nG1 X0 Y210 F7200\nG1 E2 F5000\nG1 E2 F5500\nG1 E2 F6000\nG1 E-15 F5800\nG1 E-20 F5500\nG1 E10 F3000\nG1 E-10 F3100\nG1 E10 F3150\nG1 E-10 F3250\nG1 E10 F3300\n{endif}\n\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\n\n; Unload filament\nM702 C\n\nG4 ; wait\nM221 S100 ; reset flow\nM900 K0 ; reset LA\n{if print_settings_id=~/.*(DETAIL @MK3|QUALITY @MK3|SOLUBLE|@0.25 nozzle MK3).*/}M907 E538 ; reset extruder motor current{endif}\nM104 S0 ; turn off temperature\nG1 X0 Y210 F3000 ; home X axis\nM84 ; disable motors\n
->>>>>>> master
[printer:Original Prusa i3 MK3S & MK3S+ MMU2S Single]
inherits = *mm2s*
renamed_from = "Original Prusa i3 MK3S MMU2S Single"
single_extruder_multi_material = 0
default_filament_profile = Prusament PLA
-<<<<<<< HEAD
-start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.10.0 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nTx\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\n\n;go outside print area\nG1 Y-3.0 F1000.0\nG1 Z0.4 F1000.0\n; select extruder\nTc\n; purge line\nG1 X55.0 F2000.0\nG1 Z0.3 F1000.0\nG92 E0.0\nG1 X240.0 E25.0 F2200.0\nG1 Y-2.0 F1000.0\nG1 X55.0 E25 F1400.0\nG1 Z0.20 F1000.0\nG1 X5.0 E4.0 F1000.0\n\nM221 S{if layer_height<0.075}100{else}95{endif}\nG92 E0.0\n\n; Don't change E values below. Excessive value can damage the printer.\n{if print_settings_id=~/.*(DETAIL @MK3|QUALITY @MK3).*/}M907 E430 ; set extruder motor current{endif}\n{if print_settings_id=~/.*(SPEED @MK3|DRAFT @MK3).*/}M907 E538 ; set extruder motor current{endif}
-end_gcode = {if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+10, max_print_height)}{endif} F720 ; Move print head up\nG1 X0 Y210 F7200\nG1 E2 F5000\nG1 E2 F5500\nG1 E2 F6000\nG1 E-15.0000 F5800\nG1 E-20.0000 F5500\nG1 E10.0000 F3000\nG1 E-10.0000 F3100\nG1 E10.0000 F3150\nG1 E-10.0000 F3250\nG1 E10.0000 F3300\n\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nM702 C\nG4 ; wait\nM221 S100 ; reset flow\nM900 K0 ; reset LA\n{if print_settings_id=~/.*(DETAIL @MK3|QUALITY @MK3|@0.25 nozzle MK3).*/}M907 E538 ; reset extruder motor current{endif}\nM104 S0 ; turn off temperature\nM84 ; disable motors
-=======
start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.10.1 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nTx\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\n\n;go outside print area\nG1 Y-3 F1000\nG1 Z0.4 F1000\n; select extruder\nTc\n; purge line\nG1 X55 F2000\nG1 Z0.3 F1000\nG92 E0\nG1 X240 E25 F2200\nG1 Y-2 F1000\nG1 X55 E25 F1400\nG1 Z0.2 F1000\nG1 X5 E4 F1000\n\nM221 S{if layer_height<0.075}100{else}95{endif}\nG92 E0\n\n; Don't change E values below. Excessive value can damage the printer.\n{if print_settings_id=~/.*(DETAIL @MK3|QUALITY @MK3).*/}M907 E430 ; set extruder motor current{endif}\n{if print_settings_id=~/.*(SPEED @MK3|DRAFT @MK3).*/}M907 E538 ; set extruder motor current{endif}
end_gcode = {if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+10, max_print_height)}{endif} F720 ; Move print head up\nG1 X0 Y210 F7200\nG1 E2 F5000\nG1 E2 F5500\nG1 E2 F6000\nG1 E-15 F5800\nG1 E-20 F5500\nG1 E10 F3000\nG1 E-10 F3100\nG1 E10 F3150\nG1 E-10 F3250\nG1 E10 F3300\n\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nM702 C\nG4 ; wait\nM221 S100 ; reset flow\nM900 K0 ; reset LA\n{if print_settings_id=~/.*(DETAIL @MK3|QUALITY @MK3|@0.25 nozzle MK3).*/}M907 E538 ; reset extruder motor current{endif}\nM104 S0 ; turn off temperature\nM84 ; disable motors
->>>>>>> master
[printer:Original Prusa i3 MK3S & MK3S+ MMU2S Single 0.6 nozzle]
inherits = Original Prusa i3 MK3S & MK3S+ MMU2S Single
@@ -10285,11 +7766,7 @@ nozzle_diameter = 0.6 max_layer_height = 0.40
min_layer_height = 0.15
printer_variant = 0.6
-<<<<<<< HEAD
-start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.10.0 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nTx\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\n\n;go outside print area\nG1 Y-3.0 F1000.0\nG1 Z0.4 F1000.0\n; select extruder\nTc\n; purge line\nG1 X55.0 F2000.0\nG1 Z0.3 F1000.0\nG92 E0.0\nG1 X240.0 E25.0 F2200.0\nG1 Y-2.0 F1000.0\nG1 X55.0 E25 F1400.0\nG1 Z0.20 F1000.0\nG1 X5.0 E4.0 F1000.0\n\nM221 S{if layer_height<0.075}100{else}95{endif}\nG92 E0.0
-=======
start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.10.1 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nTx\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\n\n;go outside print area\nG1 Y-3 F1000\nG1 Z0.4 F1000\n; select extruder\nTc\n; purge line\nG1 X55 F2000\nG1 Z0.3 F1000\nG92 E0\nG1 X240 E25 F2200\nG1 Y-2 F1000\nG1 X55 E25 F1400\nG1 Z0.2 F1000\nG1 X5 E4 F1000\n\nM221 S{if layer_height<0.075}100{else}95{endif}\nG92 E0
->>>>>>> master
default_print_profile = 0.30mm QUALITY @0.6 nozzle MK3
color_change_gcode = M600\nG1 E0.5 F1500 ; prime after color change
@@ -10301,11 +7778,7 @@ max_layer_height = 0.6 min_layer_height = 0.2
printer_variant = 0.8
retract_length = 1
-<<<<<<< HEAD
-start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM115 U3.10.0 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nTx\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\n\n;go outside print area\nG1 Y-3.0 F1000.0\nG1 Z0.4 F1000.0\n; select extruder\nTc\n; purge line\nG1 X55.0 F2000.0\nG1 Z0.3 F1000.0\nG92 E0.0\nG1 X240.0 E25.0 F2200.0\nG1 Y-2.0 F1000.0\nG1 X55.0 E25 F1400.0\nG1 Z0.20 F1000.0\nG1 X5.0 E4.0 F1000.0\n\nM221 S{if layer_height<0.075}100{else}95{endif}\nG92 E0.0
-=======
start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.10.1 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nTx\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\n\n;go outside print area\nG1 Y-3 F1000\nG1 Z0.4 F1000\n; select extruder\nTc\n; purge line\nG1 X55 F2000\nG1 Z0.3 F1000\nG92 E0\nG1 X240 E25 F2200\nG1 Y-2 F1000\nG1 X55 E25 F1400\nG1 Z0.2 F1000\nG1 X5 E4 F1000\n\nM221 S{if layer_height<0.075}100{else}95{endif}\nG92 E0
->>>>>>> master
default_print_profile = 0.40mm QUALITY @0.8 nozzle
default_filament_profile = Prusament PLA @0.8 nozzle
color_change_gcode = M600\nG1 E0.6 F1500 ; prime after color change
@@ -10319,11 +7792,7 @@ max_layer_height = 0.15 min_layer_height = 0.05
printer_variant = 0.25
retract_lift = 0.15
-<<<<<<< HEAD
-start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.10.0 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nTx\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\n\n;go outside print area\nG1 Y-3.0 F1000.0\nG1 Z0.4 F1000.0\n; select extruder\nTc\n; purge line\nG1 X55.0 F2000.0\nG1 Z0.3 F1000.0\nG92 E0.0\nG1 X240.0 E25.0 F1400.0\nG1 Y-2.0 F1000.0\nG1 X55.0 E25 F1400.0\nG1 Z0.20 F1000.0\nG1 X5.0 E4.0 F1000.0\n\nM221 S{if layer_height<0.075}100{else}95{endif}\nG92 E0.0\n\n; Don't change E value below. Excessive value can damage the printer.\n{if print_settings_id=~/.*@0.25 nozzle MK3.*/}M907 E430 ; set extruder motor current{endif}
-=======
start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.10.1 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nTx\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\n\n;go outside print area\nG1 Y-3 F1000\nG1 Z0.4 F1000\n; select extruder\nTc\n; purge line\nG1 X55 F2000\nG1 Z0.3 F1000\nG92 E0\nG1 X240 E25 F1400\nG1 Y-2 F1000\nG1 X55 E25 F1400\nG1 Z0.2 F1000\nG1 X5 E4 F1000\n\nM221 S{if layer_height<0.075}100{else}95{endif}\nG92 E0\n\n; Don't change E value below. Excessive value can damage the printer.\n{if print_settings_id=~/.*@0.25 nozzle MK3.*/}M907 E430 ; set extruder motor current{endif}
->>>>>>> master
default_print_profile = 0.10mm DETAIL @0.25 nozzle MK3
color_change_gcode = M600\nG1 E0.3 F1500 ; prime after color change
@@ -10333,13 +7802,8 @@ renamed_from = "Original Prusa i3 MK3S MMU2S" machine_max_acceleration_e = 8000,8000
nozzle_diameter = 0.4,0.4,0.4,0.4,0.4
extruder_colour = #FF8000;#DB5182;#3EC0FF;#FF4F4F;#FBEB7D
-<<<<<<< HEAD
-start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.10.0 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\n\n; Send the filament type to the MMU2.0 unit.\n; E stands for extruder number, F stands for filament type (0: default; 1:flex; 2: PVA)\nM403 E0 F{"" + ((filament_type[0]=="FLEX") ? 1 : ((filament_type[0]=="PVA") ? 2 : 0))}\nM403 E1 F{"" + ((filament_type[1]=="FLEX") ? 1 : ((filament_type[1]=="PVA") ? 2 : 0))}\nM403 E2 F{"" + ((filament_type[2]=="FLEX") ? 1 : ((filament_type[2]=="PVA") ? 2 : 0))}\nM403 E3 F{"" + ((filament_type[3]=="FLEX") ? 1 : ((filament_type[3]=="PVA") ? 2 : 0))}\nM403 E4 F{"" + ((filament_type[4]=="FLEX") ? 1 : ((filament_type[4]=="PVA") ? 2 : 0))}\n\n{if not has_single_extruder_multi_material_priming}\n;go outside print area\nG1 Y-3.0 F1000.0\nG1 Z0.4 F1000.0\n; select extruder\nT[initial_tool]\n; initial load\nG1 X55.0 E29.0 F1073.0\nG1 X5.0 E29.0 F1800.0\nG1 X55.0 E8.0 F2000.0\nG1 Z0.3 F1000.0\nG92 E0.0\nG1 X240.0 E25.0 F2200.0\nG1 Y-2.0 F1000.0\nG1 X55.0 E25 F1400.0\nG1 Z0.20 F1000.0\nG1 X5.0 E4.0 F1000.0\nG92 E0.0\n{endif}\n\nM221 S{if layer_height<0.075}100{else}95{endif}\nG92 E0.0\n\n; Don't change E values below. Excessive value can damage the printer.\n{if print_settings_id=~/.*(DETAIL @MK3|QUALITY @MK3|SOLUBLE).*/}M907 E430 ; set extruder motor current{endif}\n{if print_settings_id=~/.*(SPEED @MK3|DRAFT @MK3).*/}M907 E538 ; set extruder motor current{endif}
-end_gcode = ; Lift print head a bit\n{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+30, max_print_height)}{endif} ; Move print head up\n{if has_wipe_tower}\nG1 E-15.0000 F3000\n{else}\nG1 X0 Y210 F7200\nG1 E2 F5000\nG1 E2 F5500\nG1 E2 F6000\nG1 E-15.0000 F5800\nG1 E-20.0000 F5500\nG1 E10.0000 F3000\nG1 E-10.0000 F3100\nG1 E10.0000 F3150\nG1 E-10.0000 F3250\nG1 E10.0000 F3300\n{endif}\n\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\n\n; Unload filament\nM702 C\n\nG4 ; wait\nM221 S100 ; reset flow\nM900 K0 ; reset LA\n{if print_settings_id=~/.*(DETAIL @MK3|QUALITY @MK3|SOLUBLE|@0.25 nozzle MK3).*/}M907 E538 ; reset extruder motor current{endif}\nM104 S0 ; turn off temperature\nG1 X0 Y210 F3000 ; home X axis\nM84 ; disable motors\n
-=======
start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.10.1 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\n\n; Send the filament type to the MMU2.0 unit.\n; E stands for extruder number, F stands for filament type (0: default; 1:flex; 2: PVA)\nM403 E0 F{"" + ((filament_type[0]=="FLEX") ? 1 : ((filament_type[0]=="PVA") ? 2 : 0))}\nM403 E1 F{"" + ((filament_type[1]=="FLEX") ? 1 : ((filament_type[1]=="PVA") ? 2 : 0))}\nM403 E2 F{"" + ((filament_type[2]=="FLEX") ? 1 : ((filament_type[2]=="PVA") ? 2 : 0))}\nM403 E3 F{"" + ((filament_type[3]=="FLEX") ? 1 : ((filament_type[3]=="PVA") ? 2 : 0))}\nM403 E4 F{"" + ((filament_type[4]=="FLEX") ? 1 : ((filament_type[4]=="PVA") ? 2 : 0))}\n\n{if not has_single_extruder_multi_material_priming}\n;go outside print area\nG1 Y-3 F1000\nG1 Z0.4 F1000\n; select extruder\nT[initial_tool]\n; initial load\nG1 X55 E29 F1073\nG1 X5 E29 F1800\nG1 X55 E8 F2000\nG1 Z0.3 F1000\nG92 E0\nG1 X240 E25 F2200\nG1 Y-2 F1000\nG1 X55 E25 F1400\nG1 Z0.2 F1000\nG1 X5 E4 F1000\nG92 E0\n{endif}\n\nM221 S{if layer_height<0.075}100{else}95{endif}\nG92 E0\n\n; Don't change E values below. Excessive value can damage the printer.\n{if print_settings_id=~/.*(DETAIL @MK3|QUALITY @MK3|SOLUBLE).*/}M907 E430 ; set extruder motor current{endif}\n{if print_settings_id=~/.*(SPEED @MK3|DRAFT @MK3).*/}M907 E538 ; set extruder motor current{endif}
end_gcode = ; Lift print head a bit\n{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+30, max_print_height)}{endif} ; Move print head up\n{if has_wipe_tower}\nG1 E-15 F3000\n{else}\nG1 X0 Y210 F7200\nG1 E2 F5000\nG1 E2 F5500\nG1 E2 F6000\nG1 E-15 F5800\nG1 E-20 F5500\nG1 E10 F3000\nG1 E-10 F3100\nG1 E10 F3150\nG1 E-10 F3250\nG1 E10 F3300\n{endif}\n\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\n\n; Unload filament\nM702 C\n\nG4 ; wait\nM221 S100 ; reset flow\nM900 K0 ; reset LA\n{if print_settings_id=~/.*(DETAIL @MK3|QUALITY @MK3|SOLUBLE|@0.25 nozzle MK3).*/}M907 E538 ; reset extruder motor current{endif}\nM104 S0 ; turn off temperature\nG1 X0 Y210 F3000 ; home X axis\nM84 ; disable motors\n
->>>>>>> master
## 0.6mm nozzle MMU2/S printer profiles
@@ -10350,11 +7814,7 @@ nozzle_diameter = 0.6,0.6,0.6,0.6,0.6 max_layer_height = 0.40
min_layer_height = 0.15
printer_variant = 0.6
-<<<<<<< HEAD
-start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.10.0 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\n\n; Send the filament type to the MMU2.0 unit.\n; E stands for extruder number, F stands for filament type (0: default; 1:flex; 2: PVA)\nM403 E0 F{"" + ((filament_type[0]=="FLEX") ? 1 : ((filament_type[0]=="PVA") ? 2 : 0))}\nM403 E1 F{"" + ((filament_type[1]=="FLEX") ? 1 : ((filament_type[1]=="PVA") ? 2 : 0))}\nM403 E2 F{"" + ((filament_type[2]=="FLEX") ? 1 : ((filament_type[2]=="PVA") ? 2 : 0))}\nM403 E3 F{"" + ((filament_type[3]=="FLEX") ? 1 : ((filament_type[3]=="PVA") ? 2 : 0))}\nM403 E4 F{"" + ((filament_type[4]=="FLEX") ? 1 : ((filament_type[4]=="PVA") ? 2 : 0))}\n\n{if not has_single_extruder_multi_material_priming}\n;go outside print area\nG1 Y-3.0 F1000.0\nG1 Z0.4 F1000.0\n; select extruder\nT[initial_tool]\n; initial load\nG1 X55.0 E29.0 F1073.0\nG1 X5.0 E29.0 F1800.0\nG1 X55.0 E8.0 F2000.0\nG1 Z0.3 F1000.0\nG92 E0.0\nG1 X240.0 E25.0 F2200.0\nG1 Y-2.0 F1000.0\nG1 X55.0 E25 F1400.0\nG1 Z0.20 F1000.0\nG1 X5.0 E4.0 F1000.0\nG92 E0.0\n{endif}\n\nM221 S{if layer_height<0.075}100{else}95{endif}\nG92 E0.0
-=======
start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.10.1 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\n\n; Send the filament type to the MMU2.0 unit.\n; E stands for extruder number, F stands for filament type (0: default; 1:flex; 2: PVA)\nM403 E0 F{"" + ((filament_type[0]=="FLEX") ? 1 : ((filament_type[0]=="PVA") ? 2 : 0))}\nM403 E1 F{"" + ((filament_type[1]=="FLEX") ? 1 : ((filament_type[1]=="PVA") ? 2 : 0))}\nM403 E2 F{"" + ((filament_type[2]=="FLEX") ? 1 : ((filament_type[2]=="PVA") ? 2 : 0))}\nM403 E3 F{"" + ((filament_type[3]=="FLEX") ? 1 : ((filament_type[3]=="PVA") ? 2 : 0))}\nM403 E4 F{"" + ((filament_type[4]=="FLEX") ? 1 : ((filament_type[4]=="PVA") ? 2 : 0))}\n\n{if not has_single_extruder_multi_material_priming}\n;go outside print area\nG1 Y-3 F1000\nG1 Z0.4 F1000\n; select extruder\nT[initial_tool]\n; initial load\nG1 X55 E29 F1073\nG1 X5 E29 F1800\nG1 X55 E8 F2000\nG1 Z0.3 F1000\nG92 E0\nG1 X240 E25 F2200\nG1 Y-2 F1000\nG1 X55 E25 F1400\nG1 Z0.2 F1000\nG1 X5 E4 F1000\nG92 E0\n{endif}\n\nM221 S{if layer_height<0.075}100{else}95{endif}\nG92 E0
->>>>>>> master
default_print_profile = 0.30mm QUALITY @0.6 nozzle MK3
color_change_gcode = M600\nG1 E0.5 F1500 ; prime after color change
@@ -10364,11 +7824,7 @@ nozzle_diameter = 0.6,0.6,0.6,0.6,0.6 max_layer_height = 0.40
min_layer_height = 0.15
printer_variant = 0.6
-<<<<<<< HEAD
-start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.10.0 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\n\n; Send the filament type to the MMU2.0 unit.\n; E stands for extruder number, F stands for filament type (0: default; 1:flex; 2: PVA)\nM403 E0 F{"" + ((filament_type[0]=="FLEX") ? 1 : ((filament_type[0]=="PVA") ? 2 : 0))}\nM403 E1 F{"" + ((filament_type[1]=="FLEX") ? 1 : ((filament_type[1]=="PVA") ? 2 : 0))}\nM403 E2 F{"" + ((filament_type[2]=="FLEX") ? 1 : ((filament_type[2]=="PVA") ? 2 : 0))}\nM403 E3 F{"" + ((filament_type[3]=="FLEX") ? 1 : ((filament_type[3]=="PVA") ? 2 : 0))}\nM403 E4 F{"" + ((filament_type[4]=="FLEX") ? 1 : ((filament_type[4]=="PVA") ? 2 : 0))}\n\n{if not has_single_extruder_multi_material_priming}\n;go outside print area\nG1 Y-3.0 F1000.0\nG1 Z0.4 F1000.0\n; select extruder\nT[initial_tool]\n; initial load\nG1 X55.0 E32.0 F1073.0\nG1 X5.0 E32.0 F1800.0\nG1 X55.0 E8.0 F2000.0\nG1 Z0.3 F1000.0\nG92 E0.0\nG1 X240.0 E25.0 F2200.0\nG1 Y-2.0 F1000.0\nG1 X55.0 E25 F1400.0\nG1 Z0.20 F1000.0\nG1 X5.0 E4.0 F1000.0\nG92 E0.0\n{endif}\n\nM221 S{if layer_height<0.075}100{else}95{endif}\nG92 E0.0
-=======
start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.10.1 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\n\n; Send the filament type to the MMU2.0 unit.\n; E stands for extruder number, F stands for filament type (0: default; 1:flex; 2: PVA)\nM403 E0 F{"" + ((filament_type[0]=="FLEX") ? 1 : ((filament_type[0]=="PVA") ? 2 : 0))}\nM403 E1 F{"" + ((filament_type[1]=="FLEX") ? 1 : ((filament_type[1]=="PVA") ? 2 : 0))}\nM403 E2 F{"" + ((filament_type[2]=="FLEX") ? 1 : ((filament_type[2]=="PVA") ? 2 : 0))}\nM403 E3 F{"" + ((filament_type[3]=="FLEX") ? 1 : ((filament_type[3]=="PVA") ? 2 : 0))}\nM403 E4 F{"" + ((filament_type[4]=="FLEX") ? 1 : ((filament_type[4]=="PVA") ? 2 : 0))}\n\n{if not has_single_extruder_multi_material_priming}\n;go outside print area\nG1 Y-3 F1000\nG1 Z0.4 F1000\n; select extruder\nT[initial_tool]\n; initial load\nG1 X55 E32 F1073\nG1 X5 E32 F1800\nG1 X55 E8 F2000\nG1 Z0.3 F1000\nG92 E0\nG1 X240 E25 F2200\nG1 Y-2 F1000\nG1 X55 E25 F1400\nG1 Z0.2 F1000\nG1 X5 E4 F1000\nG92 E0\n{endif}\n\nM221 S{if layer_height<0.075}100{else}95{endif}\nG92 E0
->>>>>>> master
default_print_profile = 0.30mm QUALITY @0.6 nozzle MK3
color_change_gcode = M600\nG1 E0.5 F1500 ; prime after color change
@@ -10382,11 +7838,7 @@ color_change_gcode = M600\nG1 E0.5 F1500 ; prime after color change ## max_layer_height = 0.6
## min_layer_height = 0.2
## printer_variant = 0.8
-<<<<<<< HEAD
-## start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM115 U3.10.0 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\n\n; Send the filament type to the MMU2.0 unit.\n; E stands for extruder number, F stands for filament type (0: default; 1:flex; 2: PVA)\nM403 E0 F{"" + ((filament_type[0]=="FLEX") ? 1 : ((filament_type[0]=="PVA") ? 2 : 0))}\nM403 E1 F{"" + ((filament_type[1]=="FLEX") ? 1 : ((filament_type[1]=="PVA") ? 2 : 0))}\nM403 E2 F{"" + ((filament_type[2]=="FLEX") ? 1 : ((filament_type[2]=="PVA") ? 2 : 0))}\nM403 E3 F{"" + ((filament_type[3]=="FLEX") ? 1 : ((filament_type[3]=="PVA") ? 2 : 0))}\nM403 E4 F{"" + ((filament_type[4]=="FLEX") ? 1 : ((filament_type[4]=="PVA") ? 2 : 0))}\n\n{if not has_single_extruder_multi_material_priming}\n;go outside print area\nG1 Y-3.0 F1000.0\nG1 Z0.4 F1000.0\n; select extruder\nT[initial_tool]\n; initial load\nG1 X55.0 E32.0 F1073.0\nG1 X5.0 E32.0 F1800.0\nG1 X55.0 E8.0 F2000.0\nG1 Z0.3 F1000.0\nG92 E0.0\nG1 X240.0 E25.0 F2200.0\nG1 Y-2.0 F1000.0\nG1 X55.0 E25 F1400.0\nG1 Z0.20 F1000.0\nG1 X5.0 E4.0 F1000.0\nG92 E0.0\n{endif}\n\nM221 S{if layer_height<0.075}100{else}95{endif}\nG92 E0.0
-=======
## start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.10.1 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\n\n; Send the filament type to the MMU2.0 unit.\n; E stands for extruder number, F stands for filament type (0: default; 1:flex; 2: PVA)\nM403 E0 F{"" + ((filament_type[0]=="FLEX") ? 1 : ((filament_type[0]=="PVA") ? 2 : 0))}\nM403 E1 F{"" + ((filament_type[1]=="FLEX") ? 1 : ((filament_type[1]=="PVA") ? 2 : 0))}\nM403 E2 F{"" + ((filament_type[2]=="FLEX") ? 1 : ((filament_type[2]=="PVA") ? 2 : 0))}\nM403 E3 F{"" + ((filament_type[3]=="FLEX") ? 1 : ((filament_type[3]=="PVA") ? 2 : 0))}\nM403 E4 F{"" + ((filament_type[4]=="FLEX") ? 1 : ((filament_type[4]=="PVA") ? 2 : 0))}\n\n{if not has_single_extruder_multi_material_priming}\n;go outside print area\nG1 Y-3.0 F1000\nG1 Z0.4 F1000\n; select extruder\nT[initial_tool]\n; initial load\nG1 X55.0 E32.0 F1073.0\nG1 X5.0 E32.0 F1800.0\nG1 X55.0 E8.0 F2000.0\nG1 Z0.3 F1000\nG92 E0.0\nG1 X240.0 E25.0 F2200.0\nG1 Y-2.0 F1000.0\nG1 X55.0 E25 F1400.0\nG1 Z0.20 F1000.0\nG1 X5.0 E4.0 F1000.0\nG92 E0.0\n{endif}\n\nM221 S{if layer_height<0.075}100{else}95{endif}\nG92 E0.0
->>>>>>> master
## default_print_profile = 0.40mm QUALITY @0.8 nozzle
## [printer:Original Prusa i3 MK3S & MK3S+ MMU2S 0.8 nozzle]
@@ -10395,11 +7847,7 @@ color_change_gcode = M600\nG1 E0.5 F1500 ; prime after color change ## max_layer_height = 0.6
## min_layer_height = 0.2
## printer_variant = 0.8
-<<<<<<< HEAD
-## start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM115 U3.10.0 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\n\n; Send the filament type to the MMU2.0 unit.\n; E stands for extruder number, F stands for filament type (0: default; 1:flex; 2: PVA)\nM403 E0 F{"" + ((filament_type[0]=="FLEX") ? 1 : ((filament_type[0]=="PVA") ? 2 : 0))}\nM403 E1 F{"" + ((filament_type[1]=="FLEX") ? 1 : ((filament_type[1]=="PVA") ? 2 : 0))}\nM403 E2 F{"" + ((filament_type[2]=="FLEX") ? 1 : ((filament_type[2]=="PVA") ? 2 : 0))}\nM403 E3 F{"" + ((filament_type[3]=="FLEX") ? 1 : ((filament_type[3]=="PVA") ? 2 : 0))}\nM403 E4 F{"" + ((filament_type[4]=="FLEX") ? 1 : ((filament_type[4]=="PVA") ? 2 : 0))}\n\n{if not has_single_extruder_multi_material_priming}\n;go outside print area\nG1 Y-3.0 F1000.0\nG1 Z0.4 F1000.0\n; select extruder\nT[initial_tool]\n; initial load\nG1 X55.0 E29.0 F1073.0\nG1 X5.0 E29.0 F1800.0\nG1 X55.0 E8.0 F2000.0\nG1 Z0.3 F1000.0\nG92 E0.0\nG1 X240.0 E25.0 F2200.0\nG1 Y-2.0 F1000.0\nG1 X55.0 E25 F1400.0\nG1 Z0.20 F1000.0\nG1 X5.0 E4.0 F1000.0\nG92 E0.0\n{endif}\n\nM221 S{if layer_height<0.075}100{else}95{endif}\nG92 E0.0
-=======
## start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.10.1 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\n\n; Send the filament type to the MMU2.0 unit.\n; E stands for extruder number, F stands for filament type (0: default; 1:flex; 2: PVA)\nM403 E0 F{"" + ((filament_type[0]=="FLEX") ? 1 : ((filament_type[0]=="PVA") ? 2 : 0))}\nM403 E1 F{"" + ((filament_type[1]=="FLEX") ? 1 : ((filament_type[1]=="PVA") ? 2 : 0))}\nM403 E2 F{"" + ((filament_type[2]=="FLEX") ? 1 : ((filament_type[2]=="PVA") ? 2 : 0))}\nM403 E3 F{"" + ((filament_type[3]=="FLEX") ? 1 : ((filament_type[3]=="PVA") ? 2 : 0))}\nM403 E4 F{"" + ((filament_type[4]=="FLEX") ? 1 : ((filament_type[4]=="PVA") ? 2 : 0))}\n\n{if not has_single_extruder_multi_material_priming}\n;go outside print area\nG1 Y-3.0 F1000.0\nG1 Z0.4 F1000.0\n; select extruder\nT[initial_tool]\n; initial load\nG1 X55.0 E29.0 F1073.0\nG1 X5.0 E29.0 F1800.0\nG1 X55.0 E8.0 F2000.0\nG1 Z0.3 F1000.0\nG92 E0.0\nG1 X240.0 E25.0 F2200.0\nG1 Y-2.0 F1000.0\nG1 X55.0 E25 F1400.0\nG1 Z0.20 F1000.0\nG1 X5.0 E4.0 F1000.0\nG92 E0.0\n{endif}\n\nM221 S{if layer_height<0.075}100{else}95{endif}\nG92 E0.0
->>>>>>> master
## default_print_profile = 0.40mm QUALITY @0.8 nozzle
## MINI
@@ -10539,10 +7987,6 @@ max_initial_exposure_time = 300 printer_correction = 1,1,1
relative_correction = 1,1
area_fill = 45
-<<<<<<< HEAD
-printer_notes = Don't remove the following keywords! These keywords are used in the "compatible printer" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_VENDOR_PRUSA3D\nPRINTER_MODEL_SL1S\n
-=======
->>>>>>> master
# The obsolete presets will be removed when upgrading from the legacy configuration structure (up to Slic3r 1.39.2) to 1.40.0 and newer.
[obsolete_presets]
diff --git a/resources/profiles/TriLAB.idx b/resources/profiles/TriLAB.idx index 6e0e2989f..b64aab27b 100644 --- a/resources/profiles/TriLAB.idx +++ b/resources/profiles/TriLAB.idx @@ -1,8 +1,5 @@ min_slic3r_version = 2.3.2-alpha0 -<<<<<<< HEAD -======= 0.0.9 Added AzteQ Industrial materials PC/ABS (Fillamentum), PC-Max (Polymaker), Nylon FX256 (Fillamentum), Added DeltiQ 2 materials Nylon PA12 (Fiberlogy), Nylon CF15 Carbon (Fillamentum), PEBA 90A - FlexFill (Fillamentum), MoldLay (Wax-Alike), disabled retract only when crossing perimeters, some minor setting improvements ->>>>>>> master 0.0.8 Added new AzteQ Industrial printer, added DeltiQ 2 profiles for 0.6mm nozzle, added material ASA 275 (Spectrum), some minor setting improvements min_slic3r_version = 2.3.0-alpha3 0.0.7 Added PLA, PETG profiles for 0.25 nozzle, fixed supports on 0.8 nozzle profile, fixed max volumetric speed, disabled elefant foot compensation diff --git a/resources/profiles/TriLAB.ini b/resources/profiles/TriLAB.ini index c2710450d..8a68b8219 100644 --- a/resources/profiles/TriLAB.ini +++ b/resources/profiles/TriLAB.ini @@ -6,11 +6,7 @@ name = TriLAB # Configuration version of this file. Config file will only be installed, if the config_version differs. # This means, the server may force the PrusaSlicer configuration to be downgraded. -<<<<<<< HEAD -config_version = 0.0.8 -======= config_version = 0.0.9 ->>>>>>> master # Where to get the updates from? config_update_url = https://files.prusa3d.com/wp-content/uploads/repository/PrusaSlicer-settings-master/live/TriLAB/ # changelog_url = https://files.prusa3d.com/?latest=slicer-profiles&lng=%1% @@ -26,11 +22,7 @@ technology = FFF family = AzteQ bed_model = aq_bed.stl bed_texture = aq_bed_texture.svg -<<<<<<< HEAD -default_materials = AzteQ Industrial (Door Opened) - PLA - ExtraFill (Fillamentum);AzteQ Industrial (Door Opened) - PLA - Generic;AzteQ Industrial (PLA Printhead) - PLA - ExtraFill (Fillamentum);AzteQ Industrial - ABS - ExtraFill (Fillamentum);AzteQ Industrial - ABS - Generic;AzteQ Industrial - ASA - ExtraFill (Fillamentum);AzteQ Industrial - ASA - Generic;AzteQ Industrial - ASA - Prusament (Prusa);AzteQ Industrial - PA - Nylon PA12 (Fiberlogy);AzteQ Industrial - PC Blend - Prusament (Prusa) -======= default_materials = AzteQ Industrial (Door Opened) - PLA - ExtraFill (Fillamentum);AzteQ Industrial (Door Opened) - PLA - Generic;AzteQ Industrial (PLA Printhead) - PLA - ExtraFill (Fillamentum);AzteQ Industrial - ABS - ExtraFill (Fillamentum);AzteQ Industrial - ABS - Generic;AzteQ Industrial - ASA - ExtraFill (Fillamentum);AzteQ Industrial - ASA - Generic;AzteQ Industrial - ASA - Prusament (Prusa);AzteQ Industrial - PA - Nylon PA12 (Fiberlogy);AzteQ Industrial - PC Blend - Prusament (Prusa);AzteQ Industrial - PC - PolyMax (Polymaker);AzteQ Industrial - PC - PolyMax (Polymaker) @0.6 nozzle;AzteQ Industrial - PC/ABS - (Fillamentum);AzteQ Industrial - PC/ABS - (Fillamentum) @0.6 nozzle;AzteQ Industrial - PA - Nylon FX256 (Fillamentum);AzteQ Industrial - PA - Nylon FX256 (Fillamentum) @0.6 nozzle ->>>>>>> master [printer_model:DQ2] name = DeltiQ 2 @@ -39,11 +31,7 @@ technology = FFF family = DeltiQ 2 bed_model = dq2_bed.stl bed_texture = dq2_bed_texture.svg -<<<<<<< HEAD -default_materials = DeltiQ - PLA - Generic;DeltiQ - PLA - ExtraFill (Fillamentum);DeltiQ - PETG - Generic;DeltiQ - PETG (Devil Design);DeltiQ - ABS - Generic;DeltiQ - ABS - ExtraFill (Fillamentum);DeltiQ - ASA - ExtraFill (Fillamentum);DeltiQ - ASA - ASA 275 (Spectrum);DeltiQ - CPE - HG100 (Fillamentum);DeltiQ - PLA - ExtraFill (Fillamentum) @0.25 nozzle;DeltiQ - PETG (Devil Design) @0.25 nozzle;DeltiQ - PLA - ExtraFill (Fillamentum) @0.6 nozzle;DeltiQ - PETG (Devil Design) @0.6 nozzle;DeltiQ - ABS - ExtraFill (Fillamentum) @0.6 nozzle;DeltiQ - ASA - ExtraFill (Fillamentum) @0.6 nozzle;DeltiQ - ASA - ASA 275 (Spectrum) @0.6 nozzle;DeltiQ - CPE - HG100 (Fillamentum) @0.6 nozzle;DeltiQ - PLA - ExtraFill (Fillamentum) @0.8 nozzle;DeltiQ - PETG (Devil Design) @0.8 nozzle -======= default_materials = DeltiQ - PLA - Generic;DeltiQ - PLA - ExtraFill (Fillamentum);DeltiQ - PETG - Generic;DeltiQ - PETG (Devil Design);DeltiQ - ABS - Generic;DeltiQ - ABS - ExtraFill (Fillamentum);DeltiQ - ASA - ExtraFill (Fillamentum);DeltiQ - ASA - ASA 275 (Spectrum);DeltiQ - CPE - HG100 (Fillamentum);DeltiQ - PLA - ExtraFill (Fillamentum) @0.25 nozzle;DeltiQ - PETG (Devil Design) @0.25 nozzle;DeltiQ - PLA - ExtraFill (Fillamentum) @0.6 nozzle;DeltiQ - PETG (Devil Design) @0.6 nozzle;DeltiQ - ABS - ExtraFill (Fillamentum) @0.6 nozzle;DeltiQ - ASA - ExtraFill (Fillamentum) @0.6 nozzle;DeltiQ - ASA - ASA 275 (Spectrum) @0.6 nozzle;DeltiQ - CPE - HG100 (Fillamentum) @0.6 nozzle;DeltiQ - PLA - ExtraFill (Fillamentum) @0.8 nozzle;DeltiQ - PETG (Devil Design) @0.8 nozzle;DeltiQ - PA - Nylon PA12 (Fiberlogy);DeltiQ - PA - Nylon CF15 Carbon (Fillamentum);DeltiQ - MoldLay (Wax-Alike) ->>>>>>> master [printer_model:DQ2P] name = DeltiQ 2 Plus @@ -52,11 +40,7 @@ technology = FFF family = DeltiQ 2 bed_model = dq2_bed.stl bed_texture = dq2_bed_texture.svg -<<<<<<< HEAD -default_materials = DeltiQ - PLA - Generic;DeltiQ - PLA - ExtraFill (Fillamentum);DeltiQ - PETG - Generic;DeltiQ - PETG (Devil Design);DeltiQ - ABS - Generic;DeltiQ - ABS - ExtraFill (Fillamentum);DeltiQ - ASA - ExtraFill (Fillamentum);DeltiQ - ASA - ASA 275 (Spectrum);DeltiQ - CPE - HG100 (Fillamentum);DeltiQ - PLA - ExtraFill (Fillamentum) @0.25 nozzle;DeltiQ - PETG (Devil Design) @0.25 nozzle;DeltiQ - PLA - ExtraFill (Fillamentum) @0.6 nozzle;DeltiQ - PETG (Devil Design) @0.6 nozzle;DeltiQ - ABS - ExtraFill (Fillamentum) @0.6 nozzle;DeltiQ - ASA - ExtraFill (Fillamentum) @0.6 nozzle;DeltiQ - ASA - ASA 275 (Spectrum) @0.6 nozzle;DeltiQ - CPE - HG100 (Fillamentum) @0.6 nozzle;DeltiQ - PLA - ExtraFill (Fillamentum) @0.8 nozzle;DeltiQ - PETG (Devil Design) @0.8 nozzle -======= default_materials = DeltiQ - PLA - Generic;DeltiQ - PLA - ExtraFill (Fillamentum);DeltiQ - PETG - Generic;DeltiQ - PETG (Devil Design);DeltiQ - ABS - Generic;DeltiQ - ABS - ExtraFill (Fillamentum);DeltiQ - ASA - ExtraFill (Fillamentum);DeltiQ - ASA - ASA 275 (Spectrum);DeltiQ - CPE - HG100 (Fillamentum);DeltiQ - PLA - ExtraFill (Fillamentum) @0.25 nozzle;DeltiQ - PETG (Devil Design) @0.25 nozzle;DeltiQ - PLA - ExtraFill (Fillamentum) @0.6 nozzle;DeltiQ - PETG (Devil Design) @0.6 nozzle;DeltiQ - ABS - ExtraFill (Fillamentum) @0.6 nozzle;DeltiQ - ASA - ExtraFill (Fillamentum) @0.6 nozzle;DeltiQ - ASA - ASA 275 (Spectrum) @0.6 nozzle;DeltiQ - CPE - HG100 (Fillamentum) @0.6 nozzle;DeltiQ - PLA - ExtraFill (Fillamentum) @0.8 nozzle;DeltiQ - PETG (Devil Design) @0.8 nozzle;DeltiQ - PA - Nylon PA12 (Fiberlogy);DeltiQ - PA - Nylon CF15 Carbon (Fillamentum);DeltiQ - MoldLay (Wax-Alike) ->>>>>>> master [printer_model:DQ2+FP2] name = DeltiQ 2 + FlexPrint 2 @@ -65,11 +49,7 @@ technology = FFF family = DeltiQ 2 bed_model = dq2_bed.stl bed_texture = dq2_bed_texture.svg -<<<<<<< HEAD -default_materials = DeltiQ FP2 - PLA - Generic;DeltiQ FP2 - PLA - ExtraFill (Fillamentum);DeltiQ FP2 - PETG - Generic;DeltiQ FP2 - PETG (Devil Design);DeltiQ FP2 - ABS - Generic;DeltiQ FP2 - ABS - ExtraFill (Fillamentum);DeltiQ FP2 - ASA - ExtraFill (Fillamentum);DeltiQ FP2 - CPE - HG100 (Fillamentum);DeltiQ FP2 - FLEX - Generic;DeltiQ FP2 - TPU 92A - FlexFill (Fillamentum);DeltiQ FP2 - TPU 98A - FlexFill (Fillamentum);DeltiQ FP2 - TPU 93A (SMARTFIL) -======= default_materials = DeltiQ FP2 - PLA - Generic;DeltiQ FP2 - PLA - ExtraFill (Fillamentum);DeltiQ FP2 - PETG - Generic;DeltiQ FP2 - PETG (Devil Design);DeltiQ FP2 - ABS - Generic;DeltiQ FP2 - ABS - ExtraFill (Fillamentum);DeltiQ FP2 - ASA - ExtraFill (Fillamentum);DeltiQ FP2 - CPE - HG100 (Fillamentum);DeltiQ FP2 - FLEX - Generic;DeltiQ FP2 - TPU 92A - FlexFill (Fillamentum);DeltiQ FP2 - TPU 98A - FlexFill (Fillamentum);DeltiQ FP2 - TPU 93A (SMARTFIL);DeltiQ FP2 - PEBA 90A - FlexFill (Fillamentum) ->>>>>>> master [printer_model:DQ2P+FP2] name = DeltiQ 2 Plus + FlexPrint 2 @@ -78,11 +58,7 @@ technology = FFF family = DeltiQ 2 bed_model = dq2_bed.stl bed_texture = dq2_bed_texture.svg -<<<<<<< HEAD -default_materials = DeltiQ FP2 - PLA - Generic;DeltiQ FP2 - PLA - ExtraFill (Fillamentum);DeltiQ FP2 - PETG - Generic;DeltiQ FP2 - PETG (Devil Design);DeltiQ FP2 - ABS - Generic;DeltiQ FP2 - ABS - ExtraFill (Fillamentum);DeltiQ FP2 - ASA - ExtraFill (Fillamentum);DeltiQ FP2 - CPE - HG100 (Fillamentum);DeltiQ FP2 - FLEX - Generic;DeltiQ FP2 - TPU 92A - FlexFill (Fillamentum);DeltiQ FP2 - TPU 98A - FlexFill (Fillamentum);DeltiQ FP2 - TPU 93A (SMARTFIL) -======= default_materials = DeltiQ FP2 - PLA - Generic;DeltiQ FP2 - PLA - ExtraFill (Fillamentum);DeltiQ FP2 - PETG - Generic;DeltiQ FP2 - PETG (Devil Design);DeltiQ FP2 - ABS - Generic;DeltiQ FP2 - ABS - ExtraFill (Fillamentum);DeltiQ FP2 - ASA - ExtraFill (Fillamentum);DeltiQ FP2 - CPE - HG100 (Fillamentum);DeltiQ FP2 - FLEX - Generic;DeltiQ FP2 - TPU 92A - FlexFill (Fillamentum);DeltiQ FP2 - TPU 98A - FlexFill (Fillamentum);DeltiQ FP2 - TPU 93A (SMARTFIL);DeltiQ FP2 - PEBA 90A - FlexFill (Fillamentum) ->>>>>>> master [printer_model:DQ2+FP] name = DeltiQ 2 + FlexPrint @@ -480,11 +456,7 @@ max_print_speed = 60 max_volumetric_speed = 0 min_skirt_length = 4 notes = -<<<<<<< HEAD -only_retract_when_crossing_perimeters = 1 -======= only_retract_when_crossing_perimeters = 0 ->>>>>>> master ooze_prevention = 0 output_filename_format = {input_filename_base}_{printer_model}_{filament_type[0]}_{layer_height}mm_{print_time}_{timestamp}.gcode overhangs = 1 @@ -1078,8 +1050,6 @@ min_print_speed = 10 slowdown_below_layer_time = 4 temperature = 235 -<<<<<<< HEAD -======= [filament:DeltiQ FP2 - PEBA 90A - FlexFill (Fillamentum)] inherits = DeltiQ FP2 - TPU 98A - FlexFill (Fillamentum) extrusion_multiplier = 1.1 @@ -1137,7 +1107,6 @@ min_fan_speed = 70 temperature = 175 filament_vendor = Wax-Alike ->>>>>>> master # AzteQ filaments # [filament:*AzteQ common*] @@ -1299,8 +1268,6 @@ inherits = AzteQ Industrial - ABS - ExtraFill (Fillamentum) compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_TRILAB.*/ and printer_notes=~/.*PRINTER_MODEL_AQI.*/ and nozzle_diameter[0]==0.6 filament_max_volumetric_speed = 15 -<<<<<<< HEAD -======= [filament:AzteQ Industrial - PC/ABS - (Fillamentum)] inherits = AzteQ Industrial - ABS - Generic filament_vendor = Fillamentum @@ -1342,7 +1309,6 @@ inherits = AzteQ Industrial - PC - PolyMax (Polymaker) compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_TRILAB.*/ and printer_notes=~/.*PRINTER_MODEL_AQI.*/ and nozzle_diameter[0]==0.6 filament_max_volumetric_speed = 15 ->>>>>>> master [filament:AzteQ Industrial - ASA - Generic] inherits = *AzteQ common* bed_temperature = 100 @@ -1377,11 +1343,7 @@ max_fan_speed = 75 min_fan_speed = 50 min_print_speed = 10 slowdown_below_layer_time = 5 -<<<<<<< HEAD -start_filament_gcode = "; FILAMENT_START_GCODE\nM191 S75 ; Set and wait - chamber temperature" -======= start_filament_gcode = "; FILAMENT_START_GCODE\nM191 S50 ; Set and wait - chamber temperature" ->>>>>>> master temperature = 265 [filament:AzteQ Industrial - ASA - Generic @0.6 nozzle] @@ -1392,13 +1354,10 @@ filament_max_volumetric_speed = 15 [filament:AzteQ Industrial - ASA - ExtraFill (Fillamentum)] inherits = AzteQ Industrial - ASA - Generic filament_vendor = Fillamentum -<<<<<<< HEAD -======= first_layer_temperature = 255 temperature = 255 max_fan_speed = 80 min_fan_speed = 60 ->>>>>>> master [filament:AzteQ Industrial - ASA - ExtraFill (Fillamentum) @0.6 nozzle] inherits = AzteQ Industrial - ASA - ExtraFill (Fillamentum) @@ -1411,19 +1370,11 @@ filament_cost = 680 filament_density = 1.07 filament_spool_weight = 0 filament_vendor = Prusa -<<<<<<< HEAD -first_layer_temperature = 255 -max_fan_speed = 100 -min_fan_speed = 95 -start_filament_gcode = "; FILAMENT_START_GCODE\nM191 S50 ; Set and wait - chamber temperature" -temperature = 255 -======= first_layer_temperature = 260 max_fan_speed = 70 min_fan_speed = 70 start_filament_gcode = "; FILAMENT_START_GCODE\nM191 S50 ; Set and wait - chamber temperature" temperature = 260 ->>>>>>> master [filament:AzteQ Industrial - ASA - Prusament (Prusa) @0.6 nozzle] inherits = AzteQ Industrial - ASA - Prusament (Prusa) @@ -1476,8 +1427,6 @@ inherits = AzteQ Industrial - PA - Nylon PA12 (Fiberlogy) compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_TRILAB.*/ and printer_notes=~/.*PRINTER_MODEL_AQI.*/ and nozzle_diameter[0]==0.6 filament_max_volumetric_speed = 15 -<<<<<<< HEAD -======= [filament:AzteQ Industrial - PA - Nylon FX256 (Fillamentum)] inherits = *AzteQ common* bed_temperature = 100 @@ -1524,7 +1473,6 @@ inherits = AzteQ Industrial - PA - Nylon FX256 (Fillamentum) compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_TRILAB.*/ and printer_notes=~/.*PRINTER_MODEL_AQI.*/ and nozzle_diameter[0]==0.6 filament_max_volumetric_speed = 15 ->>>>>>> master [filament:AzteQ Industrial - PC Blend - Prusament (Prusa)] inherits = *AzteQ common* bed_temperature = 100 @@ -1553,33 +1501,22 @@ filament_type = PC filament_vendor = Prusa filament_wipe = 1 first_layer_bed_temperature = 100 -<<<<<<< HEAD -first_layer_temperature = 275 -======= first_layer_temperature = 270 ->>>>>>> master full_fan_speed_layer = 0 max_fan_speed = 50 min_fan_speed = 30 min_print_speed = 10 slowdown_below_layer_time = 5 start_filament_gcode = "; FILAMENT_START_GCODE\nM191 S75 ; Set and wait - chamber temperature" -<<<<<<< HEAD -temperature = 275 -======= temperature = 270 filament_notes = "S180 ; Probing temperature" ->>>>>>> master [filament:AzteQ Industrial - PC Blend - Prusament (Prusa) @0.6 nozzle] inherits = AzteQ Industrial - PC Blend - Prusament (Prusa) compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_TRILAB.*/ and printer_notes=~/.*PRINTER_MODEL_AQI.*/ and nozzle_diameter[0]==0.6 filament_max_volumetric_speed = 15 -<<<<<<< HEAD -======= ->>>>>>> master # DeltiQ Printer # @@ -1795,11 +1732,7 @@ retract_lift_below = 0 retract_restart_extra = 0 retract_restart_extra_toolchange = 0 retract_speed = 30 -<<<<<<< HEAD -start_gcode = ; START_GCODE\nT0\nM220 S100 ; Set feedmultiply back to 100 percent\nG90 ; Absolute positioning for motion\nM83 ; Relative extruder\nM107 ; Layer fan off\n\nM140 S[first_layer_bed_temperature] ; Set and continue - bed temperature\n[start_filament_gcode]\nM104 S150 ; Set and continue - hotend probing temperature\nM190 S[first_layer_bed_temperature] ; Set and wait - bed temperature\nM109 S150 ; Set and wait - hotend probing temperature\n\nG28 ; Home all axes\nG32 ; Probe Z and calculate Z plane\nG29 ; Mesh bed probe\n\nM104 S[first_layer_temperature] ; Set and continue - printing temperature\n\nG1009 ; Purge hotend\nG92 E0 ; Zero extruder -======= start_gcode = ; START_GCODE\nT0\nM220 S100 ; Set feedmultiply back to 100 percent\nG90 ; Absolute positioning for motion\nM83 ; Relative extruder\nM107 ; Layer fan off\n\nM140 S[first_layer_bed_temperature] ; Set and continue - bed temperature\nM104 S150 ; Set and continue - hotend probing temperature\n[start_filament_gcode]\nM190 S[first_layer_bed_temperature] ; Set and wait - bed temperature\nM109 [filament_notes] ; Set and wait for material specific hotend probing temperature\n\nG28 ; Home all axes\nG32 ; Probe Z and calculate Z plane\nG29 ; Mesh bed probe\n\nM104 S[first_layer_temperature] ; Set and continue - printing temperature\n\nG1009 ; Purge hotend\nG92 E0 ; Zero extruder ->>>>>>> master wipe = 1 [printer:AzteQ Industrial] diff --git a/src/PrusaSlicer.cpp b/src/PrusaSlicer.cpp index 1da7bb386..3d2e6e6b7 100644 --- a/src/PrusaSlicer.cpp +++ b/src/PrusaSlicer.cpp @@ -184,11 +184,7 @@ int CLI::run(int argc, char **argv) ConfigSubstitutionContext config_substitutions(config_substitution_rule); //FIXME should we check the version here? // | Model::LoadAttribute::CheckVersion ? model = Model::read_from_file(file, &config, &config_substitutions, Model::LoadAttribute::AddDefaultInstances); -<<<<<<< HEAD - PrinterTechnology other_printer_technology = Slic3r::printer_technology(config); -======= PrinterTechnology other_printer_technology = get_printer_technology(config); ->>>>>>> master if (printer_technology == ptUnknown) { printer_technology = other_printer_technology; } @@ -647,9 +643,6 @@ bool CLI::setup(int argc, char **argv) // Detect the operating system flavor after SLIC3R_LOGLEVEL is set. detect_platform(); -<<<<<<< HEAD - boost::filesystem::path path_to_binary = boost::filesystem::system_complete(argv[0]); -======= #ifdef WIN32 // Notify user that a blacklisted DLL was injected into PrusaSlicer process (for example Nahimic, see GH #5573). // We hope that if a DLL is being injected into a PrusaSlicer process, it happens at the very start of the application, @@ -670,7 +663,6 @@ bool CLI::setup(int argc, char **argv) // See Invoking prusa-slicer from $PATH environment variable crashes #5542 // boost::filesystem::path path_to_binary = boost::filesystem::system_complete(argv[0]); boost::filesystem::path path_to_binary = boost::dll::program_location(); ->>>>>>> master // Path from the Slic3r binary to its resources. #ifdef __APPLE__ diff --git a/src/libslic3r/AppConfig.cpp b/src/libslic3r/AppConfig.cpp index 0d1404721..5b4bb34a3 100644 --- a/src/libslic3r/AppConfig.cpp +++ b/src/libslic3r/AppConfig.cpp @@ -227,33 +227,6 @@ static std::string appconfig_md5_hash_line(const std::string_view data) // Assume that the last line with the comment inside the config file contains a checksum and that the user didn't modify the config file. static bool verify_config_file_checksum(boost::nowide::ifstream &ifs) -<<<<<<< HEAD -{ - auto read_whole_config_file = [&ifs]() -> std::string { - std::stringstream ss; - ss << ifs.rdbuf(); - return ss.str(); - }; - - ifs.seekg(0, boost::nowide::ifstream::beg); - std::string whole_config = read_whole_config_file(); - - // The checksum should be on the last line in the config file. - if (size_t last_comment_pos = whole_config.find_last_of('#'); last_comment_pos != std::string::npos) { - // Split read config into two parts, one with checksum, and the second part is part with configuration from the checksum was computed. - // Verify existence and validity of the MD5 checksum line at the end of the file. - // When the checksum isn't found, the checksum was not saved correctly, it was removed or it is an older config file without the checksum. - // If the checksum is incorrect, then the file was either not saved correctly or modified. - if (std::string_view(whole_config.c_str() + last_comment_pos, whole_config.size() - last_comment_pos) == appconfig_md5_hash_line({ whole_config.data(), last_comment_pos })) - return true; - } - return false; -} -#endif - -std::string AppConfig::load() -======= ->>>>>>> master { auto read_whole_config_file = [&ifs]() -> std::string { std::stringstream ss; @@ -288,19 +261,11 @@ std::string AppConfig::load(const std::string &path) bool recovered = false; try { -<<<<<<< HEAD - ifs.open(AppConfig::config_path()); -#ifdef WIN32 - // Verify the checksum of the config file without taking just for debugging purpose. - if (!verify_config_file_checksum(ifs)) - BOOST_LOG_TRIVIAL(info) << "The configuration file " << AppConfig::config_path() << -======= ifs.open(path); #ifdef WIN32 // Verify the checksum of the config file without taking just for debugging purpose. if (!verify_config_file_checksum(ifs)) BOOST_LOG_TRIVIAL(info) << "The configuration file " << path << ->>>>>>> master " has a wrong MD5 checksum or the checksum is missing. This may indicate a file corruption or a harmless user edit."; ifs.seekg(0, boost::nowide::ifstream::beg); @@ -310,33 +275,11 @@ std::string AppConfig::load(const std::string &path) #ifdef WIN32 // The configuration file is corrupted, try replacing it with the backup configuration. ifs.close(); -<<<<<<< HEAD - std::string backup_path = (boost::format("%1%.bak") % AppConfig::config_path()).str(); -======= std::string backup_path = (boost::format("%1%.bak") % path).str(); ->>>>>>> master if (boost::filesystem::exists(backup_path)) { // Compute checksum of the configuration backup file and try to load configuration from it when the checksum is correct. boost::nowide::ifstream backup_ifs(backup_path); if (!verify_config_file_checksum(backup_ifs)) { -<<<<<<< HEAD - BOOST_LOG_TRIVIAL(error) << format("Both \"%1%\" and \"%2%\" are corrupted. It isn't possible to restore configuration from the backup.", AppConfig::config_path(), backup_path); - backup_ifs.close(); - boost::filesystem::remove(backup_path); - } else if (std::string error_message; copy_file(backup_path, AppConfig::config_path(), error_message, false) != SUCCESS) { - BOOST_LOG_TRIVIAL(error) << format("Configuration file \"%1%\" is corrupted. Failed to restore from backup \"%2%\": %3%", AppConfig::config_path(), backup_path, error_message); - backup_ifs.close(); - boost::filesystem::remove(backup_path); - } else { - BOOST_LOG_TRIVIAL(info) << format("Configuration file \"%1%\" was corrupted. It has been succesfully restored from the backup \"%2%\".", AppConfig::config_path(), backup_path); - // Try parse configuration file after restore from backup. - try { - ifs.open(AppConfig::config_path()); - pt::read_ini(ifs, tree); - recovered = true; - } catch (pt::ptree_error& ex) { - BOOST_LOG_TRIVIAL(info) << format("Failed to parse configuration file \"%1%\" after it has been restored from backup: %2%", AppConfig::config_path(), ex.what()); -======= BOOST_LOG_TRIVIAL(error) << format("Both \"%1%\" and \"%2%\" are corrupted. It isn't possible to restore configuration from the backup.", path, backup_path); backup_ifs.close(); boost::filesystem::remove(backup_path); @@ -353,16 +296,11 @@ std::string AppConfig::load(const std::string &path) recovered = true; } catch (pt::ptree_error& ex) { BOOST_LOG_TRIVIAL(info) << format("Failed to parse configuration file \"%1%\" after it has been restored from backup: %2%", path, ex.what()); ->>>>>>> master } } } else #endif // WIN32 -<<<<<<< HEAD - BOOST_LOG_TRIVIAL(info) << format("Failed to parse configuration file \"%1%\": %2%", AppConfig::config_path(), ex.what()); -======= BOOST_LOG_TRIVIAL(info) << format("Failed to parse configuration file \"%1%\": %2%", path, ex.what()); ->>>>>>> master if (! recovered) { // Report the initial error of parsing PrusaSlicer.ini. // Error while parsing config file. We'll customize the error message and rethrow to be displayed. diff --git a/src/libslic3r/AppConfig.hpp b/src/libslic3r/AppConfig.hpp index 17c696c74..cd0f1a5ae 100644 --- a/src/libslic3r/AppConfig.hpp +++ b/src/libslic3r/AppConfig.hpp @@ -35,11 +35,8 @@ public: // Load the slic3r.ini from a user profile directory (or a datadir, if configured). // return error string or empty strinf std::string load(); -<<<<<<< HEAD -======= // Load from an explicit path. std::string load(const std::string &path); ->>>>>>> master // Store the slic3r.ini into a user profile directory (or a datadir, if configured). void save(); diff --git a/src/libslic3r/Config.cpp b/src/libslic3r/Config.cpp index 378645f86..18b97665d 100644 --- a/src/libslic3r/Config.cpp +++ b/src/libslic3r/Config.cpp @@ -581,13 +581,7 @@ bool ConfigBase::set_deserialize_raw(const t_config_option_key &opt_key_src, con (optdef->type == coEnum || optdef->type == coBool) && ConfigHelpers::looks_like_enum_value(value)) { // Deserialize failed, try to substitute with a default value. assert(substitutions_ctxt.rule == ForwardCompatibilitySubstitutionRule::Enable || substitutions_ctxt.rule == ForwardCompatibilitySubstitutionRule::EnableSilent); -<<<<<<< HEAD - if (optdef->type == coEnum && opt_key == "gcode_flavor" && (value == "marlin2" || value == "marlinfirmware")) - static_cast<ConfigOptionEnum<GCodeFlavor>*>(opt)->value = gcfMarlin; - else if (optdef->type == coBool) -======= if (optdef->type == coBool) ->>>>>>> master static_cast<ConfigOptionBool*>(opt)->value = ConfigHelpers::enum_looks_like_true_value(value); else // Just use the default of the option. @@ -673,21 +667,6 @@ ConfigSubstitutions ConfigBase::load(const std::string &file, ForwardCompatibili } ConfigSubstitutions ConfigBase::load_from_ini(const std::string &file, ForwardCompatibilitySubstitutionRule compatibility_rule) -<<<<<<< HEAD -{ - try { - boost::property_tree::ptree tree; - boost::nowide::ifstream ifs(file); - boost::property_tree::read_ini(ifs, tree); - return this->load(tree, compatibility_rule); - } catch (const ConfigurationError &e) { - throw ConfigurationError(format("Failed loading configuration file \"%1%\": %2%", file, e.what())); - } -} - -ConfigSubstitutions ConfigBase::load(const boost::property_tree::ptree &tree, ForwardCompatibilitySubstitutionRule compatibility_rule) -{ -======= { try { boost::property_tree::ptree tree; @@ -748,7 +727,6 @@ ConfigSubstitutions ConfigBase::load_from_ini_string_commented(std::string &&dat ConfigSubstitutions ConfigBase::load(const boost::property_tree::ptree &tree, ForwardCompatibilitySubstitutionRule compatibility_rule) { ->>>>>>> master ConfigSubstitutionContext substitutions_ctxt(compatibility_rule); for (const boost::property_tree::ptree::value_type &v : tree) { try { @@ -759,50 +737,10 @@ ConfigSubstitutions ConfigBase::load(const boost::property_tree::ptree &tree, Fo } } return std::move(substitutions_ctxt.substitutions); -<<<<<<< HEAD -} - -// Load the config keys from the tail of a G-code file. -ConfigSubstitutions ConfigBase::load_from_gcode_file(const std::string &file, ForwardCompatibilitySubstitutionRule compatibility_rule) -{ - try { - // Read a 64k block from the end of the G-code. - boost::nowide::ifstream ifs(file); - { - const char slic3r_gcode_header[] = "; generated by Slic3r "; - const char prusaslicer_gcode_header[] = "; generated by PrusaSlicer "; - std::string firstline; - std::getline(ifs, firstline); - if (strncmp(slic3r_gcode_header, firstline.c_str(), strlen(slic3r_gcode_header)) != 0 && - strncmp(prusaslicer_gcode_header, firstline.c_str(), strlen(prusaslicer_gcode_header)) != 0) - throw ConfigurationError("Not a PrusaSlicer / Slic3r PE generated g-code."); - } - ifs.seekg(0, ifs.end); - auto file_length = ifs.tellg(); - auto data_length = std::min<std::fstream::pos_type>(65535, file_length); - ifs.seekg(file_length - data_length, ifs.beg); - std::vector<char> data(size_t(data_length) + 1, 0); - ifs.read(data.data(), data_length); - ifs.close(); - - ConfigSubstitutionContext substitutions_ctxt(compatibility_rule); - size_t key_value_pairs = load_from_gcode_string(data.data(), substitutions_ctxt); - if (key_value_pairs < 80) - throw ConfigurationError(format("Suspiciously low number of configuration values extracted from %1%: %2%", file, key_value_pairs)); - return std::move(substitutions_ctxt.substitutions); - } catch (const ConfigurationError &e) { - throw ConfigurationError(format("Failed loading configuration from G-code \"%1%\": %2%", file, e.what())); - } -} - -// Load the config keys from the given string. -size_t ConfigBase::load_from_gcode_string(const char* str, ConfigSubstitutionContext& substitutions) -======= } // Load the config keys from the given string. size_t ConfigBase::load_from_gcode_string_legacy(ConfigBase& config, const char* str, ConfigSubstitutionContext& substitutions) ->>>>>>> master { if (str == nullptr) return 0; @@ -847,11 +785,7 @@ size_t ConfigBase::load_from_gcode_string_legacy(ConfigBase& config, const char* if (key == nullptr) break; try { -<<<<<<< HEAD - this->set_deserialize(std::string(key, key_end), std::string(value, end), substitutions); -======= config.set_deserialize(std::string(key, key_end), std::string(value, end), substitutions); ->>>>>>> master ++num_key_value_pairs; } catch (UnknownOptionException & /* e */) { diff --git a/src/libslic3r/Config.hpp b/src/libslic3r/Config.hpp index 1711f06bc..3aac187cb 100644 --- a/src/libslic3r/Config.hpp +++ b/src/libslic3r/Config.hpp @@ -133,7 +133,6 @@ public: ConfigurationError("No definition exception") {} NoDefinitionException(const std::string &opt_key) : ConfigurationError(std::string("No definition exception: ") + opt_key) {} -<<<<<<< HEAD }; // Indicate that an unsupported accessor was called on a config option. @@ -149,23 +148,6 @@ public: class BadOptionValueException : public ConfigurationError { public: -======= -}; - -// Indicate that an unsupported accessor was called on a config option. -class BadOptionTypeException : public ConfigurationError -{ -public: - BadOptionTypeException() : ConfigurationError("Bad option type exception") {} - BadOptionTypeException(const std::string &message) : ConfigurationError(message) {} - BadOptionTypeException(const char* message) : ConfigurationError(message) {} -}; - -// Indicate that an option has been deserialized from an invalid value. -class BadOptionValueException : public ConfigurationError -{ -public: ->>>>>>> master BadOptionValueException() : ConfigurationError("Bad option value exception") {} BadOptionValueException(const std::string &message) : ConfigurationError(message) {} BadOptionValueException(const char* message) : ConfigurationError(message) {} @@ -2026,17 +2008,11 @@ public: void setenv_() const; ConfigSubstitutions load(const std::string &file, ForwardCompatibilitySubstitutionRule compatibility_rule); ConfigSubstitutions load_from_ini(const std::string &file, ForwardCompatibilitySubstitutionRule compatibility_rule); -<<<<<<< HEAD - ConfigSubstitutions load_from_gcode_file(const std::string &file, ForwardCompatibilitySubstitutionRule compatibility_rule); - // Returns number of key/value pairs extracted. - size_t load_from_gcode_string(const char* str, ConfigSubstitutionContext& substitutions); -======= ConfigSubstitutions load_from_ini_string(const std::string &data, ForwardCompatibilitySubstitutionRule compatibility_rule); // Loading a "will be one day a legacy format" of configuration stored into 3MF or AMF. // Accepts the same data as load_from_ini_string(), only with each configuration line possibly prefixed with a semicolon (G-code comment). ConfigSubstitutions load_from_ini_string_commented(std::string &&data, ForwardCompatibilitySubstitutionRule compatibility_rule); ConfigSubstitutions load_from_gcode_file(const std::string &file, ForwardCompatibilitySubstitutionRule compatibility_rule); ->>>>>>> master ConfigSubstitutions load(const boost::property_tree::ptree &tree, ForwardCompatibilitySubstitutionRule compatibility_rule); void save(const std::string &file) const; diff --git a/src/libslic3r/Fill/Fill.cpp b/src/libslic3r/Fill/Fill.cpp index cef9f42d4..a3e4aee31 100644 --- a/src/libslic3r/Fill/Fill.cpp +++ b/src/libslic3r/Fill/Fill.cpp @@ -274,13 +274,8 @@ std::vector<SurfaceFill> group_fills(const Layer &layer) } if (internal_solid_fill == nullptr) { // Produce another solid fill. -<<<<<<< HEAD - params.extruder = layerm.region()->extruder(frSolidInfill); - params.pattern = layerm.region()->config().top_fill_pattern == ipMonotonic ? ipMonotonic : ipRectilinear; -======= params.extruder = layerm.region().extruder(frSolidInfill); params.pattern = layerm.region().config().top_fill_pattern == ipMonotonic ? ipMonotonic : ipRectilinear; ->>>>>>> master params.density = 100.f; params.extrusion_role = erInternalInfill; params.angle = float(Geometry::deg2rad(layerm.region().config().fill_angle.value)); diff --git a/src/libslic3r/Format/3mf.cpp b/src/libslic3r/Format/3mf.cpp index f207572b7..0e44cc14e 100644 --- a/src/libslic3r/Format/3mf.cpp +++ b/src/libslic3r/Format/3mf.cpp @@ -453,10 +453,7 @@ namespace Slic3r { ~_3MF_Importer(); bool load_model_from_file(const std::string& filename, Model& model, DynamicPrintConfig& config, ConfigSubstitutionContext& config_substitutions, bool check_version); -<<<<<<< HEAD -======= unsigned int version() const { return m_version; } ->>>>>>> master private: void _destroy_xml_parser(); @@ -708,10 +705,6 @@ namespace Slic3r { close_zip_reader(&archive); -<<<<<<< HEAD - for (const IdToModelObjectMap::value_type& object : m_objects) { - if (object.second >= m_model->objects.size()) { -======= if (m_version == 0) { // if the 3mf was not produced by PrusaSlicer and there is more than one instance, // split the object in as many objects as instances @@ -759,7 +752,6 @@ namespace Slic3r { for (const IdToModelObjectMap::value_type& object : m_objects) { if (object.second >= int(m_model->objects.size())) { ->>>>>>> master add_error("Unable to find object"); return false; } @@ -922,9 +914,6 @@ namespace Slic3r { add_error("Error while reading config data to buffer"); return; } -<<<<<<< HEAD - config.load_from_gcode_string(buffer.data(), config_substitutions); -======= //FIXME Loading a "will be one day a legacy format" of configuration in a form of a G-code comment. // Each config line is prefixed with a semicolon (G-code comment), that is ugly. @@ -933,7 +922,6 @@ namespace Slic3r { // See https://github.com/prusa3d/PrusaSlicer/issues/7155. We'll revert it for now. //config_substitutions.substitutions = config.load_from_ini_string_commented(std::move(buffer), config_substitutions.rule); ConfigBase::load_from_gcode_string_legacy(config, buffer.data(), config_substitutions); ->>>>>>> master } } @@ -1459,11 +1447,7 @@ namespace Slic3r { { // deletes all non-built or non-instanced objects for (const IdToModelObjectMap::value_type& object : m_objects) { -<<<<<<< HEAD - if (object.second >= m_model->objects.size()) { -======= if (object.second >= int(m_model->objects.size())) { ->>>>>>> master add_error("Unable to find object"); return false; } @@ -1986,18 +1970,6 @@ namespace Slic3r { } { -<<<<<<< HEAD - unsigned int ii = i * 3; - stl_facet& facet = stl.facet_start[i]; - for (unsigned int v = 0; v < 3; ++v) - { - unsigned int tri_id = geometry.triangles[src_start_id + ii + v] * 3; - if (tri_id + 2 >= geometry.vertices.size()) { - add_error("Malformed triangle mesh"); - return false; - } - facet.vertex[v] = Vec3f(geometry.vertices[tri_id + 0], geometry.vertices[tri_id + 1], geometry.vertices[tri_id + 2]); -======= int min_id = its.indices.front()[0]; int max_id = min_id; for (const Vec3i& face : its.indices) { @@ -2035,7 +2007,6 @@ namespace Slic3r { triangle_mesh.transform(object.instances.front()->get_transformation().get_matrix(), false); object.instances.front()->set_transformation(Slic3r::Geometry::Transformation()); //FIXME do the mesh fixing? ->>>>>>> master } } if (triangle_mesh.volume() < 0) @@ -2092,8 +2063,6 @@ namespace Slic3r { volume->source.is_converted_from_meters = metadata.value == "1"; else volume->config.set_deserialize(metadata.key, metadata.value, config_substitutions); -<<<<<<< HEAD -======= } // this may happen for 3mf saved by 3rd part softwares @@ -2102,7 +2071,6 @@ namespace Slic3r { if (renamed_volumes_count > 0) volume->name += "_" + std::to_string(renamed_volumes_count + 1); ++renamed_volumes_count; ->>>>>>> master } } @@ -3129,17 +3097,6 @@ bool _3MF_Exporter::_add_custom_gcode_per_print_z_file_to_archive( mz_zip_archiv return true; } -<<<<<<< HEAD -bool load_3mf(const char* path, DynamicPrintConfig& config, ConfigSubstitutionContext& config_substitutions, Model* model, bool check_version) - { - if (path == nullptr || model == nullptr) - return false; - - _3MF_Importer importer; - bool res = importer.load_model_from_file(path, *model, config, config_substitutions, check_version); - importer.log_errors(); - return res; -======= // Perform conversions based on the config values available. //FIXME provide a version of PrusaSlicer that stored the project file (3MF). static void handle_legacy_project_loaded(unsigned int version_project_file, DynamicPrintConfig& config) @@ -3150,7 +3107,6 @@ static void handle_legacy_project_loaded(unsigned int version_project_file, Dyna auto *opt_brim_separation = config.option<ConfigOptionFloat>("brim_separation", true); opt_brim_separation->value = opt_elephant_foot->value; } ->>>>>>> master } } diff --git a/src/libslic3r/Format/AMF.cpp b/src/libslic3r/Format/AMF.cpp index e16b4c5fd..235cdecb5 100644 --- a/src/libslic3r/Format/AMF.cpp +++ b/src/libslic3r/Format/AMF.cpp @@ -607,13 +607,7 @@ void AMFParserContext::endElement(const char * /* name */) // Faces of the current volume: case NODE_TYPE_TRIANGLE: assert(m_object && m_volume); -<<<<<<< HEAD - m_volume_facets.emplace_back(atoi(m_value[0].c_str())); - m_volume_facets.emplace_back(atoi(m_value[1].c_str())); - m_volume_facets.emplace_back(atoi(m_value[2].c_str())); -======= m_volume_facets.emplace_back(atoi(m_value[0].c_str()), atoi(m_value[1].c_str()), atoi(m_value[2].c_str())); ->>>>>>> master m_value[0].clear(); m_value[1].clear(); m_value[2].clear(); @@ -623,26 +617,6 @@ void AMFParserContext::endElement(const char * /* name */) case NODE_TYPE_VOLUME: { assert(m_object && m_volume); -<<<<<<< HEAD - TriangleMesh mesh; - stl_file &stl = mesh.stl; - stl.stats.type = inmemory; - stl.stats.number_of_facets = int(m_volume_facets.size() / 3); - stl.stats.original_num_facets = stl.stats.number_of_facets; - stl_allocate(&stl); - - bool has_transform = ! m_volume_transform.isApprox(Transform3d::Identity(), 1e-10); - for (size_t i = 0; i < m_volume_facets.size();) { - stl_facet &facet = stl.facet_start[i/3]; - for (unsigned int v = 0; v < 3; ++v) - { - unsigned int tri_id = m_volume_facets[i++] * 3; - if (tri_id < 0 || tri_id + 2 >= m_object_vertices.size()) { - this->stop("Malformed triangle mesh"); - return; - } - facet.vertex[v] = Vec3f(m_object_vertices[tri_id + 0], m_object_vertices[tri_id + 1], m_object_vertices[tri_id + 2]); -======= if (m_volume_facets.empty()) { this->stop("An empty triangle mesh found"); return; @@ -661,7 +635,6 @@ void AMFParserContext::endElement(const char * /* name */) min_id = std::min(min_id, tri_id); max_id = std::max(max_id, tri_id); } ->>>>>>> master } // rebase indices to the current vertices list @@ -736,9 +709,6 @@ void AMFParserContext::endElement(const char * /* name */) case NODE_TYPE_METADATA: if ((m_config != nullptr) && strncmp(m_value[0].c_str(), SLIC3R_CONFIG_TYPE, strlen(SLIC3R_CONFIG_TYPE)) == 0) { -<<<<<<< HEAD - m_config->load_from_gcode_string(m_value[1].c_str(), *m_config_substitutions); -======= //FIXME Loading a "will be one day a legacy format" of configuration in a form of a G-code comment. // Each config line is prefixed with a semicolon (G-code comment), that is ugly. @@ -747,7 +717,6 @@ void AMFParserContext::endElement(const char * /* name */) // See https://github.com/prusa3d/PrusaSlicer/issues/7155. We'll revert it for now. //m_config_substitutions->substitutions = m_config->load_from_ini_string_commented(std::move(m_value[1].c_str()), m_config_substitutions->rule); ConfigBase::load_from_gcode_string_legacy(*m_config, std::move(m_value[1].c_str()), *m_config_substitutions); ->>>>>>> master } else if (strncmp(m_value[0].c_str(), "slic3r.", 7) == 0) { const char *opt_key = m_value[0].c_str() + 7; @@ -926,13 +895,7 @@ bool load_amf_file(const char *path, DynamicPrintConfig *config, ConfigSubstitut } int done = feof(pFile); if (XML_Parse(parser, buff, len, done) == XML_STATUS_ERROR || ctx.error()) { -<<<<<<< HEAD - printf("AMF parser: Parse error at line %d:\n%s\n", - (int)XML_GetCurrentLineNumber(parser), - ctx.error_message()); -======= BOOST_LOG_TRIVIAL(error) << "AMF parser: Parse error at line " << int(XML_GetCurrentLineNumber(parser)) << ": " << ctx.error_message(); ->>>>>>> master break; } if (done) { diff --git a/src/libslic3r/Format/PRUS.cpp b/src/libslic3r/Format/PRUS.cpp deleted file mode 100644 index 6f86a203f..000000000 --- a/src/libslic3r/Format/PRUS.cpp +++ /dev/null @@ -1,335 +0,0 @@ -#include <string.h> -#include <exception> - -#include <boost/algorithm/string.hpp> -#include <boost/nowide/convert.hpp> -#include <boost/nowide/cstdio.hpp> - -#include "miniz_extension.hpp" - -#include <Eigen/Geometry> - -#include "../libslic3r.h" -#include "../Model.hpp" - -#include "PRUS.hpp" - -#if 0 -// Enable debugging and assert in this file. -#define DEBUG -#define _DEBUG -#undef NDEBUG -#endif - -#include <assert.h> - -namespace Slic3r -{ - -struct StlHeader -{ - char comment[80]; - uint32_t nTriangles; -}; - -static_assert(sizeof(StlHeader) == 84, "StlHeader size not correct"); - -// Buffered line reader to a string buffer. -class LineReader -{ -public: - LineReader(std::vector<char> &data) : m_buffer(data), m_pos(0), m_len((int)data.size()) {} - - const char* next_line() { - // Skip empty lines. - while (m_pos < m_len && (m_buffer[m_pos] == '\r' || m_buffer[m_pos] == '\n')) - ++ m_pos; - if (m_pos == m_len) { - // End of file. - return nullptr; - } - // The buffer is nonempty and it does not start with end of lines. Find the first end of line. - int end = m_pos + 1; - while (end < m_len && m_buffer[end] != '\r' && m_buffer[end] != '\n') - ++ end; - char *ptr_out = m_buffer.data() + m_pos; - m_pos = end + 1; - m_buffer[end] = 0; - return ptr_out; - } - - int next_line_scanf(const char *format, ...) - { - const char *line = next_line(); - if (line == nullptr) - return -1; - int result; - va_list arglist; - va_start(arglist, format); - result = vsscanf(line, format, arglist); - va_end(arglist); - return result; - } - -private: - std::vector<char> &m_buffer; - int m_pos; - int m_len; -}; - -static void extract_model_from_archive( - // name of the model file - const char *name, - // path to the archive - const char *path, - // content of scene.xml - const std::vector<char> &scene_xml_data, - // loaded data of this STL - std::vector<char> &data, - // Model, to which the newly loaded objects will be added - Model *model, - // To map multiple STLs into a single model object for multi-material prints. - std::map<int, ModelObject*> &group_to_model_object) -{ - // Find the model entry in the XML data. - char model_name_tag[1024]; - sprintf(model_name_tag, "<model name=\"%s\">", name); - const char *model_xml = strstr(scene_xml_data.data(), model_name_tag); - const char *zero_tag = "<zero>"; - const char *zero_xml = strstr(scene_xml_data.data(), zero_tag); - Vec3d instance_rotation = Vec3d::Zero(); - Vec3d instance_scaling_factor = Vec3d::Ones(); - Vec3d instance_offset = Vec3d::Zero(); - bool trafo_set = false; - unsigned int group_id = (unsigned int)-1; - unsigned int extruder_id = (unsigned int)-1; - ModelObject *model_object = nullptr; - if (model_xml != nullptr) { - model_xml += strlen(model_name_tag); - const char *position_tag = "<position>"; - const char *position_xml = strstr(model_xml, position_tag); - const char *rotation_tag = "<rotation>"; - const char *rotation_xml = strstr(model_xml, rotation_tag); - const char *scale_tag = "<scale>"; - const char *scale_xml = strstr(model_xml, scale_tag); - float position[3], rotation[3], scale[3], zero[3]; - if (position_xml != nullptr && rotation_xml != nullptr && scale_xml != nullptr && zero_xml != nullptr && - sscanf(position_xml+strlen(position_tag), - "[%f, %f, %f]", position, position+1, position+2) == 3 && - sscanf(rotation_xml+strlen(rotation_tag), - "[%f, %f, %f]", rotation, rotation+1, rotation+2) == 3 && - sscanf(scale_xml+strlen(scale_tag), - "[%f, %f, %f]", scale, scale+1, scale+2) == 3 && - sscanf(zero_xml+strlen(zero_tag), - "[%f, %f, %f]", zero, zero+1, zero+2) == 3) { - instance_scaling_factor = Vec3d((double)scale[0], (double)scale[1], (double)scale[2]); - instance_rotation = Vec3d(-(double)rotation[0], -(double)rotation[1], -(double)rotation[2]); - instance_offset = Vec3d((double)(position[0] - zero[0]), (double)(position[1] - zero[1]), (double)(position[2] - zero[2])); - trafo_set = true; - } - const char *group_tag = "<group>"; - const char *group_xml = strstr(model_xml, group_tag); - const char *extruder_tag = "<extruder>"; - const char *extruder_xml = strstr(model_xml, extruder_tag); - if (group_xml != nullptr) { - int group = atoi(group_xml + strlen(group_tag)); - if (group > 0) { - group_id = group; - auto it = group_to_model_object.find(group_id); - if (it != group_to_model_object.end()) - model_object = it->second; - } - } - if (extruder_xml != nullptr) { - int e = atoi(extruder_xml + strlen(extruder_tag)); - if (e > 0) - extruder_id = e; - } - } - if (! trafo_set) - throw Slic3r::FileIOError(std::string("Archive ") + path + " does not contain a valid entry in scene.xml for " + name); - - // Extract the STL. - StlHeader header; - TriangleMesh mesh; - bool mesh_valid = false; - bool stl_ascii = false; - if (data.size() > sizeof(StlHeader)) { - memcpy((char*)&header, data.data(), sizeof(StlHeader)); - if (strncmp(header.comment, "solid ", 6) == 0) - stl_ascii = true; - else { - // Header has been extracted. Now read the faces. - stl_file &stl = mesh.stl; - stl.stats.type = inmemory; - stl.stats.number_of_facets = header.nTriangles; - stl.stats.original_num_facets = header.nTriangles; - stl_allocate(&stl); - if (header.nTriangles > 0 && data.size() == 50 * header.nTriangles + sizeof(StlHeader)) { - memcpy((char*)stl.facet_start.data(), data.data() + sizeof(StlHeader), 50 * header.nTriangles); - if (sizeof(stl_facet) > SIZEOF_STL_FACET) { - // The stl.facet_start is not packed tightly. Unpack the array of stl_facets. - unsigned char *data = (unsigned char*)stl.facet_start.data(); - for (size_t i = header.nTriangles - 1; i > 0; -- i) - memmove(data + i * sizeof(stl_facet), data + i * SIZEOF_STL_FACET, SIZEOF_STL_FACET); - } - // All the faces have been read. - stl_get_size(&stl); - mesh.repair(); - if (std::abs(stl.stats.min(2)) < EPSILON) - stl.stats.min(2) = 0.; - // Add a mesh to a model. - if (mesh.facets_count() > 0) - mesh_valid = true; - } - } - } else - stl_ascii = true; - - if (stl_ascii) { - // Try to parse ASCII STL. - char normal_buf[3][32]; - stl_facet facet; - std::vector<stl_facet> facets; - LineReader line_reader(data); - std::string solid_name; - facet.extra[0] = facet.extra[1] = 0; - for (;;) { - const char *line = line_reader.next_line(); - if (line == nullptr) - // End of file. - break; - if (strncmp(line, "solid", 5) == 0) { - // Opening the "solid" block. - if (! solid_name.empty()) { - // Error, solid block is already open. - facets.clear(); - break; - } - solid_name = line + 5; - if (solid_name.empty()) - solid_name = "unknown"; - continue; - } - if (strncmp(line, "endsolid", 8) == 0) { - // Closing the "solid" block. - if (solid_name.empty()) { - // Error, no solid block is open. - facets.clear(); - break; - } - solid_name.clear(); - continue; - } - // Line has to start with the word solid. - int res_normal = sscanf(line, " facet normal %31s %31s %31s", normal_buf[0], normal_buf[1], normal_buf[2]); - assert(res_normal == 3); - int res_outer_loop = line_reader.next_line_scanf(" outer loop"); - assert(res_outer_loop == 0); - int res_vertex1 = line_reader.next_line_scanf(" vertex %f %f %f", &facet.vertex[0](0), &facet.vertex[0](1), &facet.vertex[0](2)); - assert(res_vertex1 == 3); - int res_vertex2 = line_reader.next_line_scanf(" vertex %f %f %f", &facet.vertex[1](0), &facet.vertex[1](1), &facet.vertex[1](2)); - assert(res_vertex2 == 3); - int res_vertex3 = line_reader.next_line_scanf(" vertex %f %f %f", &facet.vertex[2](0), &facet.vertex[2](1), &facet.vertex[2](2)); - assert(res_vertex3 == 3); - int res_endloop = line_reader.next_line_scanf(" endloop"); - assert(res_endloop == 0); - int res_endfacet = line_reader.next_line_scanf(" endfacet"); - if (res_normal != 3 || res_outer_loop != 0 || res_vertex1 != 3 || res_vertex2 != 3 || res_vertex3 != 3 || res_endloop != 0 || res_endfacet != 0) { - // perror("Something is syntactically very wrong with this ASCII STL!"); - facets.clear(); - break; - } - // The facet normal has been parsed as a single string as to workaround for not a numbers in the normal definition. - if (sscanf(normal_buf[0], "%f", &facet.normal(0)) != 1 || - sscanf(normal_buf[1], "%f", &facet.normal(1)) != 1 || - sscanf(normal_buf[2], "%f", &facet.normal(2)) != 1) { - // Normal was mangled. Maybe denormals or "not a number" were stored? - // Just reset the normal and silently ignore it. - facet.normal = stl_normal::Zero(); - } - facets.emplace_back(facet); - } - if (! facets.empty() && solid_name.empty()) { - stl_file &stl = mesh.stl; - stl.stats.type = inmemory; - stl.stats.number_of_facets = (uint32_t)facets.size(); - stl.stats.original_num_facets = (int)facets.size(); - stl_allocate(&stl); - memcpy((void*)stl.facet_start.data(), facets.data(), facets.size() * 50); - stl_get_size(&stl); - mesh.repair(); - // Add a mesh to a model. - if (mesh.facets_count() > 0) - mesh_valid = true; - } - } - - if (! mesh_valid) - throw Slic3r::FileIOError(std::string("Archive ") + path + " does not contain a valid mesh for " + name); - - // Add this mesh to the model. - ModelVolume *volume = nullptr; - if (model_object == nullptr) { - // This is a first mesh of a group. Create a new object & volume. - model_object = model->add_object(name, path, std::move(mesh)); - volume = model_object->volumes.front(); - ModelInstance *instance = model_object->add_instance(); - instance->set_rotation(instance_rotation); - instance->set_scaling_factor(instance_scaling_factor); - instance->set_offset(instance_offset); - if (group_id != (unsigned int)(-1)) - group_to_model_object[group_id] = model_object; - } else { - // This is not the 1st mesh of a group. Add it to the ModelObject. - volume = model_object->add_volume(std::move(mesh)); - volume->name = name; - } - // Set the extruder to the volume. - if (extruder_id != (unsigned int)-1) - volume->config.set("extruder", int(extruder_id)); -} - -// Load a PrusaControl project file into a provided model. -bool load_prus(const char *path, Model *model) -{ - mz_zip_archive archive; - mz_zip_zero_struct(&archive); - - size_t n_models_initial = model->objects.size(); - mz_bool res = MZ_FALSE; - try { - if (!open_zip_reader(&archive, path)) - throw Slic3r::FileIOError(std::string("Unable to init zip reader for ") + path); - std::vector<char> scene_xml_data; - // For grouping multiple STLs into a single ModelObject for multi-material prints. - std::map<int, ModelObject*> group_to_model_object; - mz_uint num_entries = mz_zip_reader_get_num_files(&archive); - for (mz_uint i = 0; i < num_entries; ++ i) { - mz_zip_archive_file_stat stat; - if (! mz_zip_reader_file_stat(&archive, i, &stat)) - continue; - std::vector<char> buffer; - buffer.assign((size_t)stat.m_uncomp_size, 0); - res = mz_zip_reader_extract_file_to_mem(&archive, stat.m_filename, (char*)buffer.data(), (size_t)stat.m_uncomp_size, 0); - if (res == MZ_FALSE) - throw Slic3r::FileIOError(std::string("Error while extracting a file from ") + path); - if (strcmp(stat.m_filename, "scene.xml") == 0) { - if (! scene_xml_data.empty()) - throw Slic3r::FileIOError(std::string("Multiple scene.xml were found in the archive.") + path); - scene_xml_data = std::move(buffer); - } else if (boost::iends_with(stat.m_filename, ".stl")) { - // May throw std::exception - extract_model_from_archive(stat.m_filename, path, scene_xml_data, buffer, model, group_to_model_object); - } - } - } catch (std::exception &ex) { - close_zip_reader(&archive); - throw ex; - } - - close_zip_reader(&archive); - return model->objects.size() > n_models_initial; -} - -}; // namespace Slic3r diff --git a/src/libslic3r/Format/SL1.cpp b/src/libslic3r/Format/SL1.cpp index c049b8050..6ed8c5ebe 100644 --- a/src/libslic3r/Format/SL1.cpp +++ b/src/libslic3r/Format/SL1.cpp @@ -204,11 +204,7 @@ RasterParams get_raster_params(const DynamicPrintConfig &cfg) if (!opt_disp_cols || !opt_disp_rows || !opt_disp_w || !opt_disp_h || !opt_mirror_x || !opt_mirror_y || !opt_orient) -<<<<<<< HEAD - throw Slic3r::FileIOError("Invalid SL1 / SL1S file"); -======= throw MissingProfileError("Invalid SL1 / SL1S file"); ->>>>>>> master RasterParams rstp; @@ -234,11 +230,7 @@ SliceParams get_slice_params(const DynamicPrintConfig &cfg) auto *opt_init_layerh = cfg.option<ConfigOptionFloat>("initial_layer_height"); if (!opt_layerh || !opt_init_layerh) -<<<<<<< HEAD - throw Slic3r::FileIOError("Invalid SL1 / SL1S file"); -======= throw MissingProfileError("Invalid SL1 / SL1S file"); ->>>>>>> master return SliceParams{opt_layerh->getFloat(), opt_init_layerh->getFloat()}; } @@ -302,12 +294,9 @@ ConfigSubstitutions import_sla_archive(const std::string &zipfname, DynamicPrint return out.load(arch.profile, ForwardCompatibilitySubstitutionRule::Enable); } -<<<<<<< HEAD -======= // If the profile is missing from the archive (older PS versions did not have // it), profile_out's initial value will be used as fallback. profile_out will be empty on // function return if the archive did not contain any profile. ->>>>>>> master ConfigSubstitutions import_sla_archive( const std::string & zipfname, Vec2i windowsize, @@ -319,10 +308,6 @@ ConfigSubstitutions import_sla_archive( windowsize.x() = std::max(2, windowsize.x()); windowsize.y() = std::max(2, windowsize.y()); -<<<<<<< HEAD - ArchiveData arch = extract_sla_archive(zipfname, "thumbnail"); - ConfigSubstitutions config_substitutions = profile.load(arch.profile, ForwardCompatibilitySubstitutionRule::Enable); -======= std::string exclude_entries{"thumbnail"}; ArchiveData arch = extract_sla_archive(zipfname, exclude_entries); DynamicPrintConfig profile_in, profile_use; @@ -346,7 +331,6 @@ ConfigSubstitutions import_sla_archive( } } } ->>>>>>> master // If the archive contains an empty profile, use the one that was passed as output argument // then replace it with the readed profile to report that it was empty. @@ -362,11 +346,7 @@ ConfigSubstitutions import_sla_archive( extract_slices_from_sla_archive(arch, rstp, progr); if (!slices.empty()) -<<<<<<< HEAD - out = slices_to_triangle_mesh(slices, 0, slicp.layerh, slicp.initial_layerh); -======= out = slices_to_mesh(slices, 0, slicp.layerh, slicp.initial_layerh); ->>>>>>> master return config_substitutions; } diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp index 5c460a203..5fac4b822 100644 --- a/src/libslic3r/GCode.cpp +++ b/src/libslic3r/GCode.cpp @@ -2185,11 +2185,7 @@ GCode::LayerResult GCode::process_layer( if (single_object_instance_idx == size_t(-1)) { // Normal (non-sequential) print. -<<<<<<< HEAD - gcode += ProcessLayer::emit_custom_gcode_per_print_z(*this, layer_tools.custom_gcode, first_extruder_id, print.config()); -======= gcode += ProcessLayer::emit_custom_gcode_per_print_z(*this, layer_tools.custom_gcode, m_writer.extruder()->id(), first_extruder_id, print.config()); ->>>>>>> master } // Extrude skirt at the print_z of the raft layers and normal object layers // not at the print_z of the interlaced support material layers. diff --git a/src/libslic3r/LayerRegion.cpp b/src/libslic3r/LayerRegion.cpp index f97da7c25..fd29d6d54 100644 --- a/src/libslic3r/LayerRegion.cpp +++ b/src/libslic3r/LayerRegion.cpp @@ -287,11 +287,7 @@ void LayerRegion::process_external_surfaces(const Layer *lower_layer, const Poly double custom_angle = Geometry::deg2rad(this->region().config().bridge_angle.value); if (bd.detect_angle(custom_angle)) { bridges[idx_last].bridge_angle = bd.angle; -<<<<<<< HEAD - if (this->layer()->object()->config().support_material) { -======= if (this->layer()->object()->has_support()) { ->>>>>>> master // polygons_append(this->bridged, bd.coverage()); append(this->unsupported_bridge_edges, bd.unsupported_edges()); } diff --git a/src/libslic3r/Model.cpp b/src/libslic3r/Model.cpp index b6c1504e6..efc66f478 100644 --- a/src/libslic3r/Model.cpp +++ b/src/libslic3r/Model.cpp @@ -119,11 +119,6 @@ Model Model::read_from_file(const std::string& input_file, DynamicPrintConfig* c else if (boost::algorithm::iends_with(input_file, ".3mf")) //FIXME options & LoadAttribute::CheckVersion ? result = load_3mf(input_file.c_str(), *config, *config_substitutions, &model, false); -<<<<<<< HEAD - else if (boost::algorithm::iends_with(input_file, ".prusa")) - result = load_prus(input_file.c_str(), &model); -======= ->>>>>>> master else throw Slic3r::RuntimeError("Unknown file format. Input file must have .stl, .obj, .amf(.xml) or .prusa extension."); @@ -441,11 +436,7 @@ void Model::convert_multipart_object(unsigned int max_extruders) int counter = 1; auto copy_volume = [o, max_extruders, &counter, &extruder_counter](ModelVolume *new_v) { assert(new_v != nullptr); -<<<<<<< HEAD - new_v->name = o->name + "_" + std::to_string(counter++); -======= new_v->name = (counter > 1) ? o->name + "_" + std::to_string(counter++) : o->name; ->>>>>>> master new_v->config.set("extruder", auto_extruder_id(max_extruders, extruder_counter)); return new_v; }; @@ -1816,11 +1807,7 @@ size_t ModelVolume::split(unsigned int max_extruders) this->object->volumes[ivolume]->translate(offset); this->object->volumes[ivolume]->name = name + "_" + std::to_string(idx + 1); this->object->volumes[ivolume]->config.set("extruder", auto_extruder_id(max_extruders, extruder_counter)); -<<<<<<< HEAD - delete mesh; -======= this->object->volumes[ivolume]->m_is_splittable = 0; ->>>>>>> master ++ idx; } diff --git a/src/libslic3r/Platform.cpp b/src/libslic3r/Platform.cpp index 5408cf938..338752112 100644 --- a/src/libslic3r/Platform.cpp +++ b/src/libslic3r/Platform.cpp @@ -3,15 +3,12 @@ #include <boost/log/trivial.hpp> #include <boost/filesystem/operations.hpp> -<<<<<<< HEAD -======= #if defined(__APPLE__) #include <sys/types.h> #include <sys/sysctl.h> #include <mach/machine.h> #endif ->>>>>>> master namespace Slic3r { static auto s_platform = Platform::Uninitialized; @@ -25,10 +22,6 @@ void detect_platform() s_platform_flavor = PlatformFlavor::Generic; #elif defined(__APPLE__) BOOST_LOG_TRIVIAL(info) << "Platform: OSX"; -<<<<<<< HEAD - s_platform = Platform::OSX; - s_platform_flavor = PlatformFlavor::Generic; -======= s_platform = Platform::OSX; s_platform_flavor = PlatformFlavor::GenericOSX; { @@ -62,7 +55,6 @@ void detect_platform() } } } ->>>>>>> master #elif defined(__linux__) BOOST_LOG_TRIVIAL(info) << "Platform: Linux"; s_platform = Platform::Linux; @@ -113,8 +105,6 @@ PlatformFlavor platform_flavor() return s_platform_flavor; } -<<<<<<< HEAD -======= std::string platform_to_string(Platform platform) @@ -153,5 +143,4 @@ std::string platform_flavor_to_string(PlatformFlavor pf) } ->>>>>>> master } // namespace Slic3r diff --git a/src/libslic3r/Platform.hpp b/src/libslic3r/Platform.hpp index e6ddfdeb5..6db8ba880 100644 --- a/src/libslic3r/Platform.hpp +++ b/src/libslic3r/Platform.hpp @@ -1,11 +1,8 @@ #ifndef SLIC3R_Platform_HPP #define SLIC3R_Platform_HPP -<<<<<<< HEAD -======= #include <string> ->>>>>>> master namespace Slic3r { enum class Platform @@ -21,20 +18,6 @@ enum class Platform enum class PlatformFlavor { Uninitialized, -<<<<<<< HEAD - Unknown, - // For Windows and OSX, until we need to be more specific. - Generic, - // For Platform::Linux - GenericLinux, - LinuxOnChromium, - // Microsoft's Windows on Linux (Linux kernel simulated on NTFS kernel) - WSL, - // Microsoft's Windows on Linux, version 2 (virtual machine) - WSL2, - // For Platform::BSDUnix - OpenBSD, -======= Unknown, Generic, // For Windows and OSX, until we need to be more specific. GenericLinux, // For Platform::Linux @@ -45,7 +28,6 @@ enum class PlatformFlavor GenericOSX, // For Platform::OSX OSXOnX86, // For Apple's on Intel X86 CPU OSXOnArm, // For Apple's on Arm CPU ->>>>>>> master }; // To be called on program start-up. @@ -54,12 +36,9 @@ void detect_platform(); Platform platform(); PlatformFlavor platform_flavor(); -<<<<<<< HEAD -======= std::string platform_to_string(Platform platform); std::string platform_flavor_to_string(PlatformFlavor pf); ->>>>>>> master } // namespace Slic3r #endif // SLIC3R_Platform_HPP diff --git a/src/libslic3r/Preset.hpp b/src/libslic3r/Preset.hpp index 04407aa72..f4e4c1471 100644 --- a/src/libslic3r/Preset.hpp +++ b/src/libslic3r/Preset.hpp @@ -112,10 +112,7 @@ public: TYPE_FILAMENT, TYPE_SLA_MATERIAL, TYPE_PRINTER, -<<<<<<< HEAD -======= TYPE_COUNT, ->>>>>>> master // This type is here to support PresetConfigSubstitutions for physical printers, however it does not belong to the Preset class, // PhysicalPrinter class is used instead. TYPE_PHYSICAL_PRINTER, diff --git a/src/libslic3r/PresetBundle.cpp b/src/libslic3r/PresetBundle.cpp index 68d163b6d..874b775cd 100644 --- a/src/libslic3r/PresetBundle.cpp +++ b/src/libslic3r/PresetBundle.cpp @@ -188,9 +188,6 @@ void PresetBundle::setup_directories() } } -<<<<<<< HEAD -PresetsConfigSubstitutions PresetBundle::load_presets(AppConfig &config, ForwardCompatibilitySubstitutionRule substitution_rule, const std::string &preferred_model_id) -======= // recursively copy all files and dirs in from_dir to to_dir static void copy_dir(const boost::filesystem::path& from_dir, const boost::filesystem::path& to_dir) { @@ -264,7 +261,6 @@ void PresetBundle::import_newer_configs(const std::string& from) PresetsConfigSubstitutions PresetBundle::load_presets(AppConfig &config, ForwardCompatibilitySubstitutionRule substitution_rule, const PresetPreferences& preferred_selection/* = PresetPreferences()*/) ->>>>>>> master { // First load the vendor specific system presets. PresetsConfigSubstitutions substitutions; @@ -315,11 +311,7 @@ PresetsConfigSubstitutions PresetBundle::load_presets(AppConfig &config, Forward if (! errors_cummulative.empty()) throw Slic3r::RuntimeError(errors_cummulative); -<<<<<<< HEAD - this->load_selections(config, preferred_model_id); -======= this->load_selections(config, preferred_selection); ->>>>>>> master return substitutions; } @@ -1033,21 +1025,14 @@ ConfigSubstitutions PresetBundle::load_config_file_config_bundle( // Load the config bundle, but don't save the loaded presets to user profile directory, as only the presets marked as active in the loaded preset bundle // will be loaded into the master PresetBundle and activated. auto [presets_substitutions, presets_imported] = tmp_bundle.load_configbundle(path, {}, compatibility_rule); -<<<<<<< HEAD -======= UNUSED(presets_imported); ->>>>>>> master std::string bundle_name = std::string(" - ") + boost::filesystem::path(path).filename().string(); // 2) Extract active configs from the config bundle, copy them and activate them in this bundle. ConfigSubstitutions config_substitutions; -<<<<<<< HEAD - auto load_one = [this, &path, &bundle_name, &presets_substitutions = presets_substitutions, &config_substitutions](PresetCollection &collection_dst, PresetCollection &collection_src, const std::string &preset_name_src, bool activate) -> std::string { -======= auto load_one = [&path, &bundle_name, &presets_substitutions = presets_substitutions, &config_substitutions]( PresetCollection &collection_dst, PresetCollection &collection_src, const std::string &preset_name_src, bool activate) -> std::string { ->>>>>>> master // If there are substitutions reported for this preset, move them to config_substitutions. if (auto it = std::find_if(presets_substitutions.begin(), presets_substitutions.end(), [&preset_name_src](const PresetConfigSubstitutions& subs){ return subs.preset_name == preset_name_src; }); it != presets_substitutions.end() && ! it->substitutions.empty()) @@ -1107,11 +1092,7 @@ ConfigSubstitutions PresetBundle::load_config_file_config_bundle( this->update_compatible(PresetSelectCompatibleType::Never); sort_remove_duplicates(config_substitutions); -<<<<<<< HEAD - return std::move(config_substitutions); -======= return config_substitutions; ->>>>>>> master } // Process the Config Bundle loaded as a Boost property tree. diff --git a/src/libslic3r/PresetBundle.hpp b/src/libslic3r/PresetBundle.hpp index 3a229f5da..2a5ce6839 100644 --- a/src/libslic3r/PresetBundle.hpp +++ b/src/libslic3r/PresetBundle.hpp @@ -35,14 +35,9 @@ public: // Load ini files of all types (print, filament, printer) from Slic3r::data_dir() / presets. // Load selections (current print, current filaments, current printer) from config.ini -<<<<<<< HEAD - // This is done just once on application start up. - PresetsConfigSubstitutions load_presets(AppConfig &config, ForwardCompatibilitySubstitutionRule rule, const std::string &preferred_model_id = ""); -======= // select preferred presets, if any exist PresetsConfigSubstitutions load_presets(AppConfig &config, ForwardCompatibilitySubstitutionRule rule, const PresetPreferences& preferred_selection = PresetPreferences()); ->>>>>>> master // Export selections (current print, current filaments, current printer) into config.ini void export_selections(AppConfig &config); diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index c22f35de6..b1a25829b 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -1871,10 +1871,7 @@ void PrintConfigDef::init_fff_params() def->enum_values.push_back("flashair"); def->enum_values.push_back("astrobox"); def->enum_values.push_back("repetier"); -<<<<<<< HEAD -======= def->enum_values.push_back("mks"); ->>>>>>> master def->enum_labels.push_back("PrusaLink"); def->enum_labels.push_back("OctoPrint"); def->enum_labels.push_back("Duet"); @@ -4414,22 +4411,8 @@ CLIMiscConfigDef::CLIMiscConfigDef() ConfigOptionDef* def; def = this->add("ignore_nonexistent_config", coBool); - def->label = "Ignore non-existent config files"; - def->tooltip = "Do not fail if a file supplied to --load does not exist."; - - def = this->add("config_compatibility", coEnum); - def->label = "Forward-compatibility rule when loading configurations from config files and project files (3MF, AMF)."; - def->tooltip = "This version of PrusaSlicer may not understand configurations produced by newest PrusaSlicer versions. " - "For example, newer PrusaSlicer may extend the list of supported firmware flavors. One may decide to " - "bail out or to substitute an unknown value with a default silently or verbosely."; - def->enum_keys_map = &ConfigOptionEnum<ForwardCompatibilitySubstitutionRule>::get_enum_values(); - def->enum_values.push_back("disable"); - def->enum_values.push_back("enable"); - def->enum_values.push_back("enable_silent"); - def->enum_labels.push_back("Bail out on unknown configuration values"); - def->enum_labels.push_back("Enable reading unknown configuration values by verbosely substituting them with defaults."); - def->enum_labels.push_back("Enable reading unknown configuration values by silently substituting them with defaults."); - def->set_default_value(new ConfigOptionEnum<ForwardCompatibilitySubstitutionRule>(ForwardCompatibilitySubstitutionRule::Enable)); + def->label = L("Ignore non-existent config files"); + def->tooltip = L("Do not fail if a file supplied to --load does not exist."); def = this->add("config_compatibility", coEnum); def->label = L("Forward-compatibility rule when loading configurations from config files and project files (3MF, AMF)."); @@ -4446,40 +4429,40 @@ CLIMiscConfigDef::CLIMiscConfigDef() def->set_default_value(new ConfigOptionEnum<ForwardCompatibilitySubstitutionRule>(ForwardCompatibilitySubstitutionRule::Enable)); def = this->add("load", coStrings); - def->label = "Load config file"; - def->tooltip = "Load configuration from the specified file. It can be used more than once to load options from multiple files."; + def->label = L("Load config file"); + def->tooltip = L("Load configuration from the specified file. It can be used more than once to load options from multiple files."); def = this->add("output", coString); - def->label = "Output File"; - def->tooltip = "The file where the output will be written (if not specified, it will be based on the input file)."; + def->label = L("Output File"); + def->tooltip = L("The file where the output will be written (if not specified, it will be based on the input file)."); def->cli = "output|o"; def = this->add("single_instance", coBool); - def->label = "Single instance mode"; - def->tooltip = "If enabled, the command line arguments are sent to an existing instance of GUI PrusaSlicer, " + def->label = L("Single instance mode"); + def->tooltip = L("If enabled, the command line arguments are sent to an existing instance of GUI PrusaSlicer, " "or an existing PrusaSlicer window is activated. " - "Overrides the \"single_instance\" configuration value from application preferences."; + "Overrides the \"single_instance\" configuration value from application preferences."); /* def = this->add("autosave", coString); - def->label = "Autosave"; - def->tooltip = "Automatically export current configuration to the specified file."; + def->label = L("Autosave"); + def->tooltip = L("Automatically export current configuration to the specified file."); */ def = this->add("datadir", coString); - def->label = "Data directory"; - def->tooltip = "Load and store settings at the given directory. This is useful for maintaining different profiles or including configurations from a network storage."; + def->label = L("Data directory"); + def->tooltip = L("Load and store settings at the given directory. This is useful for maintaining different profiles or including configurations from a network storage."); def = this->add("loglevel", coInt); - def->label = "Logging level"; - def->tooltip = "Sets logging sensitivity. 0:fatal, 1:error, 2:warning, 3:info, 4:debug, 5:trace\n" - "For example. loglevel=2 logs fatal, error and warning level messages."; + def->label = L("Logging level"); + def->tooltip = L("Sets logging sensitivity. 0:fatal, 1:error, 2:warning, 3:info, 4:debug, 5:trace\n" + "For example. loglevel=2 logs fatal, error and warning level messages."); def->min = 0; #if (defined(_MSC_VER) || defined(__MINGW32__)) && defined(SLIC3R_GUI) def = this->add("sw_renderer", coBool); - def->label = "Render with a software renderer"; - def->tooltip = "Render with a software renderer. The bundled MESA software renderer is loaded instead of the default OpenGL driver."; + def->label = L("Render with a software renderer"); + def->tooltip = L("Render with a software renderer. The bundled MESA software renderer is loaded instead of the default OpenGL driver."); def->min = 0; #endif /* _MSC_VER */ } diff --git a/src/libslic3r/PrintConfig.hpp b/src/libslic3r/PrintConfig.hpp index 78cbdfd49..2cc758e7b 100644 --- a/src/libslic3r/PrintConfig.hpp +++ b/src/libslic3r/PrintConfig.hpp @@ -44,11 +44,7 @@ enum class MachineLimitsUsage { }; enum PrintHostType { -<<<<<<< HEAD - htPrusaLink, htOctoPrint, htDuet, htFlashAir, htAstroBox, htRepetier -======= htPrusaLink, htOctoPrint, htDuet, htFlashAir, htAstroBox, htRepetier, htMKS ->>>>>>> master }; enum AuthorizationType { @@ -124,138 +120,12 @@ enum SLAPillarConnectionMode { slapcmDynamic }; -<<<<<<< HEAD -template<> inline const t_config_enum_values& ConfigOptionEnum<PrinterTechnology>::get_enum_values() { - static t_config_enum_values keys_map; - if (keys_map.empty()) { - keys_map["FFF"] = ptFFF; - keys_map["SLA"] = ptSLA; - } - return keys_map; -} - -template<> inline const t_config_enum_values& ConfigOptionEnum<GCodeFlavor>::get_enum_values() { - static t_config_enum_values keys_map; - if (keys_map.empty()) { - keys_map["reprap"] = gcfRepRapSprinter; - keys_map["reprapfirmware"] = gcfRepRapFirmware; - keys_map["repetier"] = gcfRepetier; - keys_map["teacup"] = gcfTeacup; - keys_map["makerware"] = gcfMakerWare; - keys_map["marlin"] = gcfMarlin; - keys_map["sailfish"] = gcfSailfish; - keys_map["smoothie"] = gcfSmoothie; - keys_map["mach3"] = gcfMach3; - keys_map["machinekit"] = gcfMachinekit; - keys_map["no-extrusion"] = gcfNoExtrusion; - } - return keys_map; -} - -template<> inline const t_config_enum_values& ConfigOptionEnum<MachineLimitsUsage>::get_enum_values() { - static t_config_enum_values keys_map; - if (keys_map.empty()) { - keys_map["emit_to_gcode"] = int(MachineLimitsUsage::EmitToGCode); - keys_map["time_estimate_only"] = int(MachineLimitsUsage::TimeEstimateOnly); - keys_map["ignore"] = int(MachineLimitsUsage::Ignore); - } - return keys_map; -} - -template<> inline const t_config_enum_values& ConfigOptionEnum<PrintHostType>::get_enum_values() { - static t_config_enum_values keys_map; - if (keys_map.empty()) { - keys_map["prusalink"] = htPrusaLink; - keys_map["octoprint"] = htOctoPrint; - keys_map["duet"] = htDuet; - keys_map["flashair"] = htFlashAir; - keys_map["astrobox"] = htAstroBox; - keys_map["repetier"] = htRepetier; - - } - return keys_map; -} - -template<> inline const t_config_enum_values& ConfigOptionEnum<AuthorizationType>::get_enum_values() { - static t_config_enum_values keys_map; - if (keys_map.empty()) { - keys_map["key"] = atKeyPassword; - keys_map["user"] = atUserPassword; - } - return keys_map; -} - -template<> inline const t_config_enum_values& ConfigOptionEnum<InfillPattern>::get_enum_values() { - static t_config_enum_values keys_map; - if (keys_map.empty()) { - keys_map["rectilinear"] = ipRectilinear; - keys_map["monotonic"] = ipMonotonic; - keys_map["alignedrectilinear"] = ipAlignedRectilinear; - keys_map["grid"] = ipGrid; - keys_map["triangles"] = ipTriangles; - keys_map["stars"] = ipStars; - keys_map["cubic"] = ipCubic; - keys_map["line"] = ipLine; - keys_map["concentric"] = ipConcentric; - keys_map["honeycomb"] = ipHoneycomb; - keys_map["3dhoneycomb"] = ip3DHoneycomb; - keys_map["gyroid"] = ipGyroid; - keys_map["hilbertcurve"] = ipHilbertCurve; - keys_map["archimedeanchords"] = ipArchimedeanChords; - keys_map["octagramspiral"] = ipOctagramSpiral; - keys_map["adaptivecubic"] = ipAdaptiveCubic; - keys_map["supportcubic"] = ipSupportCubic; - } - return keys_map; -} - -template<> inline const t_config_enum_values& ConfigOptionEnum<IroningType>::get_enum_values() { - static t_config_enum_values keys_map; - if (keys_map.empty()) { - keys_map["top"] = int(IroningType::TopSurfaces); - keys_map["topmost"] = int(IroningType::TopmostOnly); - keys_map["solid"] = int(IroningType::AllSolid); - } - return keys_map; -} - -template<> inline const t_config_enum_values& ConfigOptionEnum<SupportMaterialPattern>::get_enum_values() { - static t_config_enum_values keys_map; - if (keys_map.empty()) { - keys_map["rectilinear"] = smpRectilinear; - keys_map["rectilinear-grid"] = smpRectilinearGrid; - keys_map["honeycomb"] = smpHoneycomb; - } - return keys_map; -} - -template<> inline const t_config_enum_values& ConfigOptionEnum<SeamPosition>::get_enum_values() { - static t_config_enum_values keys_map; - if (keys_map.empty()) { - keys_map["random"] = spRandom; - keys_map["nearest"] = spNearest; - keys_map["aligned"] = spAligned; - keys_map["rear"] = spRear; - } - return keys_map; -} - -template<> inline const t_config_enum_values& ConfigOptionEnum<SLADisplayOrientation>::get_enum_values() { - static const t_config_enum_values keys_map = { - { "landscape", sladoLandscape}, - { "portrait", sladoPortrait} - }; - - return keys_map; -} -======= enum BrimType { btNoBrim, btOuterOnly, btInnerOnly, btOuterAndInner, }; ->>>>>>> master enum DraftShield { dsDisabled, dsLimited, dsEnabled @@ -286,16 +156,6 @@ CONFIG_OPTION_ENUM_DECLARE_STATIC_MAPS(ForwardCompatibilitySubstitutionRule) #undef CONFIG_OPTION_ENUM_DECLARE_STATIC_MAPS -template<> inline const t_config_enum_values& ConfigOptionEnum<ForwardCompatibilitySubstitutionRule>::get_enum_values() { - static const t_config_enum_values keys_map = { - { "disable", ForwardCompatibilitySubstitutionRule::Disable }, - { "enable", ForwardCompatibilitySubstitutionRule::Enable }, - { "enable_silent", ForwardCompatibilitySubstitutionRule::EnableSilent } - }; - - return keys_map; -} - // Defines each and every confiuration option of Slic3r, including the properties of the GUI dialogs. // Does not store the actual values, but defines default values. class PrintConfigDef : public ConfigDef diff --git a/src/libslic3r/PrintObject.cpp b/src/libslic3r/PrintObject.cpp index d7fb1265f..31d948db9 100644 --- a/src/libslic3r/PrintObject.cpp +++ b/src/libslic3r/PrintObject.cpp @@ -1694,687 +1694,6 @@ bool PrintObject::update_layer_height_profile(const ModelObject &model_object, c return updated; } -<<<<<<< HEAD -// 1) Decides Z positions of the layers, -// 2) Initializes layers and their regions -// 3) Slices the object meshes -// 4) Slices the modifier meshes and reclassifies the slices of the object meshes by the slices of the modifier meshes -// 5) Applies size compensation (offsets the slices in XY plane) -// 6) Replaces bad slices by the slices reconstructed from the upper/lower layer -// Resulting expolygons of layer regions are marked as Internal. -// -// this should be idempotent -void PrintObject::_slice(const std::vector<coordf_t> &layer_height_profile) -{ - BOOST_LOG_TRIVIAL(info) << "Slicing objects..." << log_memory_info(); - - m_typed_slices = false; - - // 1) Initialize layers and their slice heights. - std::vector<float> slice_zs; - { - this->clear_layers(); - // Object layers (pairs of bottom/top Z coordinate), without the raft. - std::vector<coordf_t> object_layers = generate_object_layers(m_slicing_params, layer_height_profile); - // Reserve object layers for the raft. Last layer of the raft is the contact layer. - int id = int(m_slicing_params.raft_layers()); - slice_zs.reserve(object_layers.size()); - Layer *prev = nullptr; - for (size_t i_layer = 0; i_layer < object_layers.size(); i_layer += 2) { - coordf_t lo = object_layers[i_layer]; - coordf_t hi = object_layers[i_layer + 1]; - coordf_t slice_z = 0.5 * (lo + hi); - Layer *layer = this->add_layer(id ++, hi - lo, hi + m_slicing_params.object_print_z_min, slice_z); - slice_zs.push_back(float(slice_z)); - if (prev != nullptr) { - prev->upper_layer = layer; - layer->lower_layer = prev; - } - // Make sure all layers contain layer region objects for all regions. - for (size_t region_id = 0; region_id < this->region_volumes.size(); ++ region_id) - layer->add_region(this->print()->regions()[region_id]); - prev = layer; - } - } - - // Count model parts and modifier meshes, check whether the model parts are of the same region. - int all_volumes_single_region = -2; // not set yet - bool has_z_ranges = false; - size_t num_volumes = 0; - size_t num_modifiers = 0; - for (int region_id = 0; region_id < (int)this->region_volumes.size(); ++ region_id) { - int last_volume_id = -1; - for (const std::pair<t_layer_height_range, int> &volume_and_range : this->region_volumes[region_id]) { - const int volume_id = volume_and_range.second; - const ModelVolume *model_volume = this->model_object()->volumes[volume_id]; - if (model_volume->is_model_part()) { - if (last_volume_id == volume_id) { - has_z_ranges = true; - } else { - last_volume_id = volume_id; - if (all_volumes_single_region == -2) - // first model volume met - all_volumes_single_region = region_id; - else if (all_volumes_single_region != region_id) - // multiple volumes met and they are not equal - all_volumes_single_region = -1; - ++ num_volumes; - } - } else if (model_volume->is_modifier()) - ++ num_modifiers; - } - } - assert(num_volumes > 0); - - // Slice all non-modifier volumes. - bool clipped = false; - bool upscaled = false; - bool spiral_vase = this->print()->config().spiral_vase; - auto slicing_mode = spiral_vase ? SlicingMode::PositiveLargestContour : SlicingMode::Regular; - if (! has_z_ranges && (! m_config.clip_multipart_objects.value || all_volumes_single_region >= 0)) { - // Cheap path: Slice regions without mutual clipping. - // The cheap path is possible if no clipping is allowed or if slicing volumes of just a single region. - for (size_t region_id = 0; region_id < this->region_volumes.size(); ++ region_id) { - BOOST_LOG_TRIVIAL(debug) << "Slicing objects - region " << region_id; - // slicing in parallel - size_t slicing_mode_normal_below_layer = 0; - if (spiral_vase) { - // Slice the bottom layers with SlicingMode::Regular. - // This needs to be in sync with LayerRegion::make_perimeters() spiral_vase! - const PrintRegionConfig &config = this->print()->regions()[region_id]->config(); - slicing_mode_normal_below_layer = size_t(config.bottom_solid_layers.value); - for (; slicing_mode_normal_below_layer < slice_zs.size() && slice_zs[slicing_mode_normal_below_layer] < config.bottom_solid_min_thickness - EPSILON; - ++ slicing_mode_normal_below_layer); - } - std::vector<ExPolygons> expolygons_by_layer = this->slice_region(region_id, slice_zs, slicing_mode, slicing_mode_normal_below_layer, SlicingMode::Regular); - m_print->throw_if_canceled(); - BOOST_LOG_TRIVIAL(debug) << "Slicing objects - append slices " << region_id << " start"; - for (size_t layer_id = 0; layer_id < expolygons_by_layer.size(); ++ layer_id) - m_layers[layer_id]->regions()[region_id]->slices.append(std::move(expolygons_by_layer[layer_id]), stInternal); - m_print->throw_if_canceled(); - BOOST_LOG_TRIVIAL(debug) << "Slicing objects - append slices " << region_id << " end"; - } - } else { - // Expensive path: Slice one volume after the other in the order they are presented at the user interface, - // clip the last volumes with the first. - // First slice the volumes. - struct SlicedVolume { - SlicedVolume(int volume_id, int region_id, std::vector<ExPolygons> &&expolygons_by_layer) : - volume_id(volume_id), region_id(region_id), expolygons_by_layer(std::move(expolygons_by_layer)) {} - int volume_id; - int region_id; - std::vector<ExPolygons> expolygons_by_layer; - }; - std::vector<SlicedVolume> sliced_volumes; - sliced_volumes.reserve(num_volumes); - for (size_t region_id = 0; region_id < this->region_volumes.size(); ++ region_id) { - const std::vector<std::pair<t_layer_height_range, int>> &volumes_and_ranges = this->region_volumes[region_id]; - for (size_t i = 0; i < volumes_and_ranges.size(); ) { - int volume_id = volumes_and_ranges[i].second; - const ModelVolume *model_volume = this->model_object()->volumes[volume_id]; - if (model_volume->is_model_part()) { - BOOST_LOG_TRIVIAL(debug) << "Slicing objects - volume " << volume_id; - // Find the ranges of this volume. Ranges in volumes_and_ranges must not overlap for a single volume. - std::vector<t_layer_height_range> ranges; - ranges.emplace_back(volumes_and_ranges[i].first); - size_t j = i + 1; - for (; j < volumes_and_ranges.size() && volume_id == volumes_and_ranges[j].second; ++ j) - if (! ranges.empty() && std::abs(ranges.back().second - volumes_and_ranges[j].first.first) < EPSILON) - ranges.back().second = volumes_and_ranges[j].first.second; - else - ranges.emplace_back(volumes_and_ranges[j].first); - // slicing in parallel - sliced_volumes.emplace_back(volume_id, (int)region_id, this->slice_volume(slice_zs, ranges, slicing_mode, *model_volume)); - i = j; - } else - ++ i; - } - } - // Second clip the volumes in the order they are presented at the user interface. - BOOST_LOG_TRIVIAL(debug) << "Slicing objects - parallel clipping - start"; - tbb::parallel_for( - tbb::blocked_range<size_t>(0, slice_zs.size()), - [this, &sliced_volumes, num_modifiers](const tbb::blocked_range<size_t>& range) { - float delta = float(scale_(m_config.xy_size_compensation.value)); - // Only upscale together with clipping if there are no modifiers, as the modifiers shall be applied before upscaling - // (upscaling may grow the object outside of the modifier mesh). - bool upscale = delta > 0 && num_modifiers == 0; - for (size_t layer_id = range.begin(); layer_id < range.end(); ++ layer_id) { - m_print->throw_if_canceled(); - // Trim volumes in a single layer, one by the other, possibly apply upscaling. - { - Polygons processed; - for (SlicedVolume &sliced_volume : sliced_volumes) - if (! sliced_volume.expolygons_by_layer.empty()) { - ExPolygons slices = std::move(sliced_volume.expolygons_by_layer[layer_id]); - if (upscale) - slices = offset_ex(std::move(slices), delta); - if (! processed.empty()) - // Trim by the slices of already processed regions. - slices = diff_ex(to_polygons(std::move(slices)), processed); - if (size_t(&sliced_volume - &sliced_volumes.front()) + 1 < sliced_volumes.size()) - // Collect the already processed regions to trim the to be processed regions. - polygons_append(processed, slices); - sliced_volume.expolygons_by_layer[layer_id] = std::move(slices); - } - } - // Collect and union volumes of a single region. - for (int region_id = 0; region_id < (int)this->region_volumes.size(); ++ region_id) { - ExPolygons expolygons; - size_t num_volumes = 0; - for (SlicedVolume &sliced_volume : sliced_volumes) - if (sliced_volume.region_id == region_id && ! sliced_volume.expolygons_by_layer.empty() && ! sliced_volume.expolygons_by_layer[layer_id].empty()) { - ++ num_volumes; - append(expolygons, std::move(sliced_volume.expolygons_by_layer[layer_id])); - } - if (num_volumes > 1) - // Merge the islands using a positive / negative offset. - expolygons = offset_ex(offset_ex(expolygons, float(scale_(EPSILON))), -float(scale_(EPSILON))); - m_layers[layer_id]->regions()[region_id]->slices.append(std::move(expolygons), stInternal); - } - } - }); - BOOST_LOG_TRIVIAL(debug) << "Slicing objects - parallel clipping - end"; - clipped = true; - upscaled = m_config.xy_size_compensation.value > 0 && num_modifiers == 0; - } - - // Slice all modifier volumes. - if (this->region_volumes.size() > 1) { - for (size_t region_id = 0; region_id < this->region_volumes.size(); ++ region_id) { - BOOST_LOG_TRIVIAL(debug) << "Slicing modifier volumes - region " << region_id; - // slicing in parallel - std::vector<ExPolygons> expolygons_by_layer = this->slice_modifiers(region_id, slice_zs); - m_print->throw_if_canceled(); - if (expolygons_by_layer.empty()) - continue; - // loop through the other regions and 'steal' the slices belonging to this one - BOOST_LOG_TRIVIAL(debug) << "Slicing modifier volumes - stealing " << region_id << " start"; - tbb::parallel_for( - tbb::blocked_range<size_t>(0, m_layers.size()), - [this, &expolygons_by_layer, region_id](const tbb::blocked_range<size_t>& range) { - for (size_t layer_id = range.begin(); layer_id < range.end(); ++ layer_id) { - for (size_t other_region_id = 0; other_region_id < this->region_volumes.size(); ++ other_region_id) { - if (region_id == other_region_id) - continue; - Layer *layer = m_layers[layer_id]; - LayerRegion *layerm = layer->m_regions[region_id]; - LayerRegion *other_layerm = layer->m_regions[other_region_id]; - if (layerm == nullptr || other_layerm == nullptr || other_layerm->slices.empty() || expolygons_by_layer[layer_id].empty()) - continue; - Polygons other_slices = to_polygons(other_layerm->slices); - ExPolygons my_parts = intersection_ex(other_slices, to_polygons(expolygons_by_layer[layer_id])); - if (my_parts.empty()) - continue; - // Remove such parts from original region. - other_layerm->slices.set(diff_ex(other_slices, to_polygons(my_parts)), stInternal); - // Append new parts to our region. - layerm->slices.append(std::move(my_parts), stInternal); - } - } - }); - m_print->throw_if_canceled(); - BOOST_LOG_TRIVIAL(debug) << "Slicing modifier volumes - stealing " << region_id << " end"; - } - } - - BOOST_LOG_TRIVIAL(debug) << "Slicing objects - removing top empty layers"; - while (! m_layers.empty()) { - const Layer *layer = m_layers.back(); - if (! layer->empty()) - goto end; - delete layer; - m_layers.pop_back(); - if (! m_layers.empty()) - m_layers.back()->upper_layer = nullptr; - } - m_print->throw_if_canceled(); -end: - ; - - BOOST_LOG_TRIVIAL(debug) << "Slicing objects - make_slices in parallel - begin"; - { - // Compensation value, scaled. - const float xy_compensation_scaled = float(scale_(m_config.xy_size_compensation.value)); - const float elephant_foot_compensation_scaled = (m_config.raft_layers == 0) ? - // Only enable Elephant foot compensation if printing directly on the print bed. - float(scale_(m_config.elefant_foot_compensation.value)) : - 0.f; - // Uncompensated slices for the first layer in case the Elephant foot compensation is applied. - ExPolygons lslices_1st_layer; - tbb::parallel_for( - tbb::blocked_range<size_t>(0, m_layers.size()), - [this, upscaled, clipped, xy_compensation_scaled, elephant_foot_compensation_scaled, &lslices_1st_layer] - (const tbb::blocked_range<size_t>& range) { - for (size_t layer_id = range.begin(); layer_id < range.end(); ++ layer_id) { - m_print->throw_if_canceled(); - Layer *layer = m_layers[layer_id]; - // Apply size compensation and perform clipping of multi-part objects. - float elfoot = (layer_id == 0) ? elephant_foot_compensation_scaled : 0.f; - if (layer->m_regions.size() == 1) { - assert(! upscaled); - assert(! clipped); - // Optimized version for a single region layer. - // Single region, growing or shrinking. - LayerRegion *layerm = layer->m_regions.front(); - if (elfoot > 0) { - // Apply the elephant foot compensation and store the 1st layer slices without the Elephant foot compensation applied. - lslices_1st_layer = to_expolygons(std::move(layerm->slices.surfaces)); - float delta = xy_compensation_scaled; - if (delta > elfoot) { - delta -= elfoot; - elfoot = 0.f; - } else if (delta > 0) - elfoot -= delta; - layerm->slices.set( - union_ex( - Slic3r::elephant_foot_compensation( - (delta == 0.f) ? lslices_1st_layer : offset_ex(lslices_1st_layer, delta), - layerm->flow(frExternalPerimeter), unscale<double>(elfoot))), - stInternal); - if (xy_compensation_scaled != 0.f) - lslices_1st_layer = offset_ex(std::move(lslices_1st_layer), xy_compensation_scaled); - } else if (xy_compensation_scaled != 0.f) { - // Apply the XY compensation. - layerm->slices.set( - offset_ex(to_expolygons(std::move(layerm->slices.surfaces)), xy_compensation_scaled), - stInternal); - } - } else { - bool upscale = ! upscaled && xy_compensation_scaled > 0.f; - bool clip = ! clipped && m_config.clip_multipart_objects.value; - if (upscale || clip) { - // Multiple regions, growing or just clipping one region by the other. - // When clipping the regions, priority is given to the first regions. - Polygons processed; - for (size_t region_id = 0; region_id < layer->m_regions.size(); ++ region_id) { - LayerRegion *layerm = layer->m_regions[region_id]; - ExPolygons slices = to_expolygons(std::move(layerm->slices.surfaces)); - if (upscale) - slices = offset_ex(std::move(slices), xy_compensation_scaled); - if (region_id > 0 && clip) - // Trim by the slices of already processed regions. - slices = diff_ex(to_polygons(std::move(slices)), processed); - if (clip && (region_id + 1 < layer->m_regions.size())) - // Collect the already processed regions to trim the to be processed regions. - polygons_append(processed, slices); - layerm->slices.set(std::move(slices), stInternal); - } - } - if (xy_compensation_scaled < 0.f || elfoot > 0.f) { - // Apply the negative XY compensation. - Polygons trimming; - static const float eps = float(scale_(m_config.slice_closing_radius.value) * 1.5); - if (elfoot > 0.f) { - lslices_1st_layer = offset_ex(layer->merged(eps), std::min(xy_compensation_scaled, 0.f) - eps); - trimming = to_polygons(Slic3r::elephant_foot_compensation(lslices_1st_layer, - layer->m_regions.front()->flow(frExternalPerimeter), unscale<double>(elfoot))); - } else - trimming = offset(layer->merged(float(SCALED_EPSILON)), xy_compensation_scaled - float(SCALED_EPSILON)); - for (size_t region_id = 0; region_id < layer->m_regions.size(); ++ region_id) - layer->m_regions[region_id]->trim_surfaces(trimming); - } - } - // Merge all regions' slices to get islands, chain them by a shortest path. - layer->make_slices(); - } - }); - if (elephant_foot_compensation_scaled > 0.f && ! m_layers.empty()) { - // The Elephant foot has been compensated, therefore the 1st layer's lslices are shrank with the Elephant foot compensation value. - // Store the uncompensated value there. - assert(m_layers.front()->id() == 0); - m_layers.front()->lslices = std::move(lslices_1st_layer); - } - } - - m_print->throw_if_canceled(); - BOOST_LOG_TRIVIAL(debug) << "Slicing objects - make_slices in parallel - end"; -} - -// To be used only if there are no layer span specific configurations applied, which would lead to z ranges being generated for this region. -std::vector<ExPolygons> PrintObject::slice_region(size_t region_id, const std::vector<float> &z, SlicingMode mode, size_t slicing_mode_normal_below_layer, SlicingMode mode_below) const -{ - std::vector<const ModelVolume*> volumes; - if (region_id < this->region_volumes.size()) { - for (const std::pair<t_layer_height_range, int> &volume_and_range : this->region_volumes[region_id]) { - const ModelVolume *volume = this->model_object()->volumes[volume_and_range.second]; - if (volume->is_model_part()) - volumes.emplace_back(volume); - } - } - return this->slice_volumes(z, mode, slicing_mode_normal_below_layer, mode_below, volumes); -} - -// Z ranges are not applicable to modifier meshes, therefore a single volume will be found in volume_and_range at most once. -std::vector<ExPolygons> PrintObject::slice_modifiers(size_t region_id, const std::vector<float> &slice_zs) const -{ - std::vector<ExPolygons> out; - if (region_id < this->region_volumes.size()) - { - std::vector<std::vector<t_layer_height_range>> volume_ranges; - const std::vector<std::pair<t_layer_height_range, int>> &volumes_and_ranges = this->region_volumes[region_id]; - volume_ranges.reserve(volumes_and_ranges.size()); - for (size_t i = 0; i < volumes_and_ranges.size(); ) { - int volume_id = volumes_and_ranges[i].second; - const ModelVolume *model_volume = this->model_object()->volumes[volume_id]; - if (model_volume->is_modifier()) { - std::vector<t_layer_height_range> ranges; - ranges.emplace_back(volumes_and_ranges[i].first); - size_t j = i + 1; - for (; j < volumes_and_ranges.size() && volume_id == volumes_and_ranges[j].second; ++ j) { - if (! ranges.empty() && std::abs(ranges.back().second - volumes_and_ranges[j].first.first) < EPSILON) - ranges.back().second = volumes_and_ranges[j].first.second; - else - ranges.emplace_back(volumes_and_ranges[j].first); - } - volume_ranges.emplace_back(std::move(ranges)); - i = j; - } else - ++ i; - } - - if (! volume_ranges.empty()) - { - bool equal_ranges = true; - for (size_t i = 1; i < volume_ranges.size(); ++ i) { - assert(! volume_ranges[i].empty()); - if (volume_ranges.front() != volume_ranges[i]) { - equal_ranges = false; - break; - } - } - - if (equal_ranges && volume_ranges.front().size() == 1 && volume_ranges.front().front() == t_layer_height_range(0, DBL_MAX)) { - // No modifier in this region was split to layer spans. - std::vector<const ModelVolume*> volumes; - for (const std::pair<t_layer_height_range, int> &volume_and_range : this->region_volumes[region_id]) { - const ModelVolume *volume = this->model_object()->volumes[volume_and_range.second]; - if (volume->is_modifier()) - volumes.emplace_back(volume); - } - out = this->slice_volumes(slice_zs, SlicingMode::Regular, volumes); - } else { - // Some modifier in this region was split to layer spans. - std::vector<char> merge; - for (size_t region_id = 0; region_id < this->region_volumes.size(); ++ region_id) { - const std::vector<std::pair<t_layer_height_range, int>> &volumes_and_ranges = this->region_volumes[region_id]; - for (size_t i = 0; i < volumes_and_ranges.size(); ) { - int volume_id = volumes_and_ranges[i].second; - const ModelVolume *model_volume = this->model_object()->volumes[volume_id]; - if (model_volume->is_modifier()) { - BOOST_LOG_TRIVIAL(debug) << "Slicing modifiers - volume " << volume_id; - // Find the ranges of this volume. Ranges in volumes_and_ranges must not overlap for a single volume. - std::vector<t_layer_height_range> ranges; - ranges.emplace_back(volumes_and_ranges[i].first); - size_t j = i + 1; - for (; j < volumes_and_ranges.size() && volume_id == volumes_and_ranges[j].second; ++ j) - ranges.emplace_back(volumes_and_ranges[j].first); - // slicing in parallel - std::vector<ExPolygons> this_slices = this->slice_volume(slice_zs, ranges, SlicingMode::Regular, *model_volume); - // Variable this_slices could be empty if no value of slice_zs is within any of the ranges of this volume. - if (out.empty()) { - out = std::move(this_slices); - merge.assign(out.size(), false); - } else if (!this_slices.empty()) { - assert(out.size() == this_slices.size()); - for (size_t i = 0; i < out.size(); ++ i) - if (! this_slices[i].empty()) { - if (! out[i].empty()) { - append(out[i], this_slices[i]); - merge[i] = true; - } else - out[i] = std::move(this_slices[i]); - } - } - i = j; - } else - ++ i; - } - } - for (size_t i = 0; i < merge.size(); ++ i) - if (merge[i]) - out[i] = union_ex(out[i]); - } - } - } - - return out; -} - -std::vector<ExPolygons> PrintObject::slice_support_volumes(const ModelVolumeType &model_volume_type) const -{ - std::vector<const ModelVolume*> volumes; - for (const ModelVolume *volume : this->model_object()->volumes) - if (volume->type() == model_volume_type) - volumes.emplace_back(volume); - std::vector<float> zs; - zs.reserve(this->layers().size()); - for (const Layer *l : this->layers()) - zs.emplace_back((float)l->slice_z); - return this->slice_volumes(zs, SlicingMode::Regular, volumes); -} - -//FIXME The admesh repair function may break the face connectivity, rather refresh it here as the slicing code relies on it. -static void fix_mesh_connectivity(TriangleMesh &mesh) -{ - auto nr_degenerated = mesh.stl.stats.degenerate_facets; - stl_check_facets_exact(&mesh.stl); - if (nr_degenerated != mesh.stl.stats.degenerate_facets) - // stl_check_facets_exact() removed some newly degenerated faces. Some faces could become degenerate after some mesh transformation. - stl_generate_shared_vertices(&mesh.stl, mesh.its); -} - -std::vector<ExPolygons> PrintObject::slice_volumes( - const std::vector<float> &z, - SlicingMode mode, size_t slicing_mode_normal_below_layer, SlicingMode mode_below, - const std::vector<const ModelVolume*> &volumes) const -{ - std::vector<ExPolygons> layers; - if (! volumes.empty()) { - // Compose mesh. - //FIXME better to perform slicing over each volume separately and then to use a Boolean operation to merge them. - TriangleMesh mesh(volumes.front()->mesh()); - mesh.transform(volumes.front()->get_matrix(), true); - assert(mesh.repaired); - if (volumes.size() == 1 && mesh.repaired) - fix_mesh_connectivity(mesh); - for (size_t idx_volume = 1; idx_volume < volumes.size(); ++ idx_volume) { - const ModelVolume &model_volume = *volumes[idx_volume]; - TriangleMesh vol_mesh(model_volume.mesh()); - vol_mesh.transform(model_volume.get_matrix(), true); - mesh.merge(vol_mesh); - } - if (mesh.stl.stats.number_of_facets > 0) { - mesh.transform(m_trafo, true); - // apply XY shift - mesh.translate(- unscale<float>(m_center_offset.x()), - unscale<float>(m_center_offset.y()), 0); - // perform actual slicing - const Print *print = this->print(); - auto callback = TriangleMeshSlicer::throw_on_cancel_callback_type([print](){print->throw_if_canceled();}); - // TriangleMeshSlicer needs shared vertices, also this calls the repair() function. - mesh.require_shared_vertices(); - TriangleMeshSlicer mslicer; - mslicer.init(&mesh, callback); - mslicer.slice(z, mode, slicing_mode_normal_below_layer, mode_below, float(m_config.slice_closing_radius.value), &layers, callback); - m_print->throw_if_canceled(); - } - } - return layers; -} - -std::vector<ExPolygons> PrintObject::slice_volume(const std::vector<float> &z, SlicingMode mode, const ModelVolume &volume) const -{ - std::vector<ExPolygons> layers; - if (! z.empty()) { - // Compose mesh. - //FIXME better to split the mesh into separate shells, perform slicing over each shell separately and then to use a Boolean operation to merge them. - TriangleMesh mesh(volume.mesh()); - mesh.transform(volume.get_matrix(), true); - if (mesh.repaired) - fix_mesh_connectivity(mesh); - if (mesh.stl.stats.number_of_facets > 0) { - mesh.transform(m_trafo, true); - // apply XY shift - mesh.translate(- unscale<float>(m_center_offset.x()), - unscale<float>(m_center_offset.y()), 0); - // perform actual slicing - TriangleMeshSlicer mslicer; - const Print *print = this->print(); - auto callback = TriangleMeshSlicer::throw_on_cancel_callback_type([print](){print->throw_if_canceled();}); - // TriangleMeshSlicer needs the shared vertices. - mesh.require_shared_vertices(); - mslicer.init(&mesh, callback); - mslicer.slice(z, mode, float(m_config.slice_closing_radius.value), &layers, callback); - m_print->throw_if_canceled(); - } - } - return layers; -} - -// Filter the zs not inside the ranges. The ranges are closed at the bottom and open at the top, they are sorted lexicographically and non overlapping. -std::vector<ExPolygons> PrintObject::slice_volume(const std::vector<float> &z, const std::vector<t_layer_height_range> &ranges, SlicingMode mode, const ModelVolume &volume) const -{ - std::vector<ExPolygons> out; - if (! z.empty() && ! ranges.empty()) { - if (ranges.size() == 1 && z.front() >= ranges.front().first && z.back() < ranges.front().second) { - // All layers fit into a single range. - out = this->slice_volume(z, mode, volume); - } else { - std::vector<float> z_filtered; - std::vector<std::pair<size_t, size_t>> n_filtered; - z_filtered.reserve(z.size()); - n_filtered.reserve(2 * ranges.size()); - size_t i = 0; - for (const t_layer_height_range &range : ranges) { - for (; i < z.size() && z[i] < range.first; ++ i) ; - size_t first = i; - for (; i < z.size() && z[i] < range.second; ++ i) - z_filtered.emplace_back(z[i]); - if (i > first) - n_filtered.emplace_back(std::make_pair(first, i)); - } - if (! n_filtered.empty()) { - std::vector<ExPolygons> layers = this->slice_volume(z_filtered, mode, volume); - out.assign(z.size(), ExPolygons()); - i = 0; - for (const std::pair<size_t, size_t> &span : n_filtered) - for (size_t j = span.first; j < span.second; ++ j) - out[j] = std::move(layers[i ++]); - } - } - } - return out; -} - -std::string PrintObject::_fix_slicing_errors() -{ - // Collect layers with slicing errors. - // These layers will be fixed in parallel. - std::vector<size_t> buggy_layers; - buggy_layers.reserve(m_layers.size()); - for (size_t idx_layer = 0; idx_layer < m_layers.size(); ++ idx_layer) - if (m_layers[idx_layer]->slicing_errors) - buggy_layers.push_back(idx_layer); - - BOOST_LOG_TRIVIAL(debug) << "Slicing objects - fixing slicing errors in parallel - begin"; - tbb::parallel_for( - tbb::blocked_range<size_t>(0, buggy_layers.size()), - [this, &buggy_layers](const tbb::blocked_range<size_t>& range) { - for (size_t buggy_layer_idx = range.begin(); buggy_layer_idx < range.end(); ++ buggy_layer_idx) { - m_print->throw_if_canceled(); - size_t idx_layer = buggy_layers[buggy_layer_idx]; - Layer *layer = m_layers[idx_layer]; - assert(layer->slicing_errors); - // Try to repair the layer surfaces by merging all contours and all holes from neighbor layers. - // BOOST_LOG_TRIVIAL(trace) << "Attempting to repair layer" << idx_layer; - for (size_t region_id = 0; region_id < layer->m_regions.size(); ++ region_id) { - LayerRegion *layerm = layer->m_regions[region_id]; - // Find the first valid layer below / above the current layer. - const Surfaces *upper_surfaces = nullptr; - const Surfaces *lower_surfaces = nullptr; - for (size_t j = idx_layer + 1; j < m_layers.size(); ++ j) - if (! m_layers[j]->slicing_errors) { - upper_surfaces = &m_layers[j]->regions()[region_id]->slices.surfaces; - break; - } - for (int j = int(idx_layer) - 1; j >= 0; -- j) - if (! m_layers[j]->slicing_errors) { - lower_surfaces = &m_layers[j]->regions()[region_id]->slices.surfaces; - break; - } - // Collect outer contours and holes from the valid layers above & below. - Polygons outer; - outer.reserve( - ((upper_surfaces == nullptr) ? 0 : upper_surfaces->size()) + - ((lower_surfaces == nullptr) ? 0 : lower_surfaces->size())); - size_t num_holes = 0; - if (upper_surfaces) - for (const auto &surface : *upper_surfaces) { - outer.push_back(surface.expolygon.contour); - num_holes += surface.expolygon.holes.size(); - } - if (lower_surfaces) - for (const auto &surface : *lower_surfaces) { - outer.push_back(surface.expolygon.contour); - num_holes += surface.expolygon.holes.size(); - } - Polygons holes; - holes.reserve(num_holes); - if (upper_surfaces) - for (const auto &surface : *upper_surfaces) - polygons_append(holes, surface.expolygon.holes); - if (lower_surfaces) - for (const auto &surface : *lower_surfaces) - polygons_append(holes, surface.expolygon.holes); - layerm->slices.set(diff_ex(union_(outer), holes, false), stInternal); - } - // Update layer slices after repairing the single regions. - layer->make_slices(); - } - }); - m_print->throw_if_canceled(); - BOOST_LOG_TRIVIAL(debug) << "Slicing objects - fixing slicing errors in parallel - end"; - - // remove empty layers from bottom - while (! m_layers.empty() && (m_layers.front()->lslices.empty() || m_layers.front()->empty())) { - delete m_layers.front(); - m_layers.erase(m_layers.begin()); - m_layers.front()->lower_layer = nullptr; - for (size_t i = 0; i < m_layers.size(); ++ i) - m_layers[i]->set_id(m_layers[i]->id() - 1); - } - - return buggy_layers.empty() ? "" : - "The model has overlapping or self-intersecting facets. I tried to repair it, " - "however you might want to check the results or repair the input file and retry.\n"; -} - -// Simplify the sliced model, if "resolution" configuration parameter > 0. -// The simplification is problematic, because it simplifies the slices independent from each other, -// which makes the simplified discretization visible on the object surface. -void PrintObject::simplify_slices(double distance) -{ - BOOST_LOG_TRIVIAL(debug) << "Slicing objects - siplifying slices in parallel - begin"; - tbb::parallel_for( - tbb::blocked_range<size_t>(0, m_layers.size()), - [this, distance](const tbb::blocked_range<size_t>& range) { - for (size_t layer_idx = range.begin(); layer_idx < range.end(); ++ layer_idx) { - m_print->throw_if_canceled(); - Layer *layer = m_layers[layer_idx]; - for (size_t region_idx = 0; region_idx < layer->m_regions.size(); ++ region_idx) - layer->m_regions[region_idx]->slices.simplify(distance); - { - ExPolygons simplified; - for (const ExPolygon &expoly : layer->lslices) - expoly.simplify(distance, &simplified); - layer->lslices = std::move(simplified); - } - } - }); - BOOST_LOG_TRIVIAL(debug) << "Slicing objects - siplifying slices in parallel - end"; -} - -======= ->>>>>>> master // Only active if config->infill_only_where_needed. This step trims the sparse infill, // so it acts as an internal support. It maintains all other infill types intact. // Here the internal surfaces and perimeters have to be supported by the sparse infill. diff --git a/src/libslic3r/ShortestPath.cpp b/src/libslic3r/ShortestPath.cpp index 47d638054..449ff45b5 100644 --- a/src/libslic3r/ShortestPath.cpp +++ b/src/libslic3r/ShortestPath.cpp @@ -1766,10 +1766,6 @@ static inline std::pair<double, size_t> minimum_crossover_cost( return std::make_pair(cost_min, flip_min); } -<<<<<<< HEAD -#if 0 -======= ->>>>>>> master // Currently not used, too slow. static inline void reorder_by_three_exchanges_with_segment_flipping2(std::vector<FlipEdge> &edges) { diff --git a/src/libslic3r/Technologies.hpp b/src/libslic3r/Technologies.hpp index 0ca2b9410..3f9dac82a 100644 --- a/src/libslic3r/Technologies.hpp +++ b/src/libslic3r/Technologies.hpp @@ -47,14 +47,4 @@ #define ENABLE_Z_OFFSET_CORRECTION (1 && ENABLE_2_4_1_RC) - -//==================== -// 2.3.1.alpha1 techs -//==================== -#define ENABLE_2_3_1_ALPHA1 1 - -#define ENABLE_SPLITTED_VERTEX_BUFFER (1 && ENABLE_2_3_1_ALPHA1) -#define ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS (1 && ENABLE_SPLITTED_VERTEX_BUFFER) - - #endif // _prusaslicer_technologies_h_ diff --git a/src/libslic3r/utils.cpp b/src/libslic3r/utils.cpp index 78d7735f5..e00b6e71c 100644 --- a/src/libslic3r/utils.cpp +++ b/src/libslic3r/utils.cpp @@ -567,11 +567,7 @@ bool copy_file_linux(const boost::filesystem::path &from, const boost::filesyste err = errno; goto fail; } -<<<<<<< HEAD - -======= ->>>>>>> master const mode_t from_mode = from_stat.st_mode; if (!S_ISREG(from_mode)) { err = ENOSYS; @@ -648,10 +644,7 @@ bool copy_file_linux(const boost::filesystem::path &from, const boost::filesyste offset += sz; } } -<<<<<<< HEAD -======= ->>>>>>> master // If we created a new file with an explicitly added S_IWUSR permission, // we may need to update its mode bits to match the source file. if (to_mode != from_mode && ::fchmod(outfile.fd, from_mode) != 0) { @@ -993,10 +986,7 @@ unsigned get_current_pid() #endif } -<<<<<<< HEAD -======= //FIXME this has potentially O(n^2) time complexity! ->>>>>>> master std::string xml_escape(std::string text, bool is_marked/* = false*/) { std::string::size_type pos = 0; diff --git a/src/slic3r/Config/Snapshot.cpp b/src/slic3r/Config/Snapshot.cpp index 86699522e..a0f386339 100644 --- a/src/slic3r/Config/Snapshot.cpp +++ b/src/slic3r/Config/Snapshot.cpp @@ -22,10 +22,7 @@ #include "../GUI/GUI_App.hpp" #include "../GUI/I18N.hpp" #include "../GUI/MainFrame.hpp" -<<<<<<< HEAD -======= #include "../GUI/MsgDialog.hpp" ->>>>>>> master #include <wx/richmsgdlg.h> @@ -589,15 +586,6 @@ const Snapshot* take_config_snapshot_report_error(const AppConfig &app_config, S } } -<<<<<<< HEAD -bool take_config_snapshot_cancel_on_error(const AppConfig &app_config, Snapshot::Reason reason, const std::string &comment, const std::string &message) -{ - try { - SnapshotDB::singleton().take_snapshot(app_config, reason, comment); - return true; - } catch (std::exception &err) { - wxRichMessageDialog dlg(static_cast<wxWindow*>(wxGetApp().mainframe), -======= bool take_config_snapshot_cancel_on_error(const AppConfig &app_config, Snapshot::Reason reason, const std::string &comment, const std::string &message, Snapshot const **psnapshot) { try { @@ -607,7 +595,6 @@ bool take_config_snapshot_cancel_on_error(const AppConfig &app_config, Snapshot: return true; } catch (std::exception &err) { RichMessageDialog dlg(static_cast<wxWindow*>(wxGetApp().mainframe), ->>>>>>> master _L("PrusaSlicer has encountered an error while taking a configuration snapshot.") + "\n\n" + from_u8(err.what()) + "\n\n" + from_u8(message), _L("PrusaSlicer error"), wxYES_NO); diff --git a/src/slic3r/Config/Snapshot.hpp b/src/slic3r/Config/Snapshot.hpp index 006c886be..5793aa548 100644 --- a/src/slic3r/Config/Snapshot.hpp +++ b/src/slic3r/Config/Snapshot.hpp @@ -132,11 +132,7 @@ const Snapshot* take_config_snapshot_report_error(const AppConfig &app_config, S // Take snapshot on SnapshotDB::singleton(). If taking snapshot fails, report "message", and present a "Continue" or "Abort" buttons to respond. // Return true on success and on "Continue" to continue with the process (for example installation of presets). -<<<<<<< HEAD -bool take_config_snapshot_cancel_on_error(const AppConfig &app_config, Snapshot::Reason reason, const std::string &comment, const std::string &message); -======= bool take_config_snapshot_cancel_on_error(const AppConfig &app_config, Snapshot::Reason reason, const std::string &comment, const std::string &message, Snapshot const **psnapshot = nullptr); ->>>>>>> master } // namespace Config } // namespace GUI diff --git a/src/slic3r/GUI/ConfigWizard.cpp b/src/slic3r/GUI/ConfigWizard.cpp index 2f709c8eb..dadf5d8ca 100644 --- a/src/slic3r/GUI/ConfigWizard.cpp +++ b/src/slic3r/GUI/ConfigWizard.cpp @@ -74,10 +74,7 @@ bool Bundle::load(fs::path source_path, bool ais_in_resources, bool ais_prusa_bu // Throw when parsing invalid configuration. Only valid configuration is supposed to be provided over the air. auto [config_substitutions, presets_loaded] = preset_bundle->load_configbundle( path_string, PresetBundle::LoadConfigBundleAttribute::LoadSystem, ForwardCompatibilitySubstitutionRule::Disable); -<<<<<<< HEAD -======= UNUSED(config_substitutions); ->>>>>>> master // No substitutions shall be reported when loading a system config bundle, no substitutions are allowed. assert(config_substitutions.empty()); auto first_vendor = preset_bundle->vendors.begin(); @@ -2493,9 +2490,6 @@ bool ConfigWizard::priv::check_and_install_missing_materials(Technology technolo return true; } -<<<<<<< HEAD -bool ConfigWizard::priv::apply_config(AppConfig *app_config, PresetBundle *preset_bundle, const PresetUpdater *updater) -======= static std::set<std::string> get_new_added_presets(const std::map<std::string, std::string>& old_data, const std::map<std::string, std::string>& new_data) { auto get_aliases = [](const std::map<std::string, std::string>& data) { @@ -2525,7 +2519,6 @@ static std::string get_first_added_preset(const std::map<std::string, std::strin } bool ConfigWizard::priv::apply_config(AppConfig *app_config, PresetBundle *preset_bundle, const PresetUpdater *updater, bool& apply_keeped_changes) ->>>>>>> master { wxString header, caption = _L("Configuration is edited in ConfigWizard"); const auto enabled_vendors = appconfig_new.vendors(); @@ -2629,15 +2622,11 @@ bool ConfigWizard::priv::apply_config(AppConfig *app_config, PresetBundle *prese break; } -<<<<<<< HEAD - if (snapshot && ! take_config_snapshot_cancel_on_error(*app_config, snapshot_reason, "", _u8L("Continue with applying configuration changes?"))) -======= if (snapshot && ! take_config_snapshot_cancel_on_error(*app_config, snapshot_reason, "", _u8L("Do you want to continue changing the configuration?"))) return false; if (check_unsaved_preset_changes && !wxGetApp().check_and_keep_current_preset_changes(caption, header, act_btns, &apply_keeped_changes)) ->>>>>>> master return false; if (install_bundles.size() > 0) { @@ -2778,31 +2767,11 @@ bool ConfigWizard::priv::apply_config(AppConfig *app_config, PresetBundle *prese preset_bundle->load_presets(*app_config, ForwardCompatibilitySubstitutionRule::EnableSilentDisableSystem, {preferred_model, preferred_variant, first_added_filament, first_added_sla_material}); -<<<<<<< HEAD - const auto config = enabled_vendors.find(bundle.first); - if (config == enabled_vendors.end()) { continue; } - for (const auto &model : bundle.second.vendor_profile->models) { - const auto model_it = config->second.find(model.id); - if (model_it != config->second.end() && model_it->second.size() > 0) { - preferred_model = model.id; - break; - } - } - } - } - - // Reloading the configs after some modifications were done to PrusaSlicer.ini. - // Just perform the substitutions silently, as the substitutions were already presented to the user on application start-up - // and the Wizard shall not create any new values that would require substitution. - // Throw on substitutions in system profiles, as the system profiles provided over the air should be compatible with this PrusaSlicer version. - preset_bundle->load_presets(*app_config, ForwardCompatibilitySubstitutionRule::EnableSilentDisableSystem, preferred_model); -======= if (!only_sla_mode && page_custom->custom_wanted()) { // if unsaved changes was not cheched till this moment if (!check_unsaved_preset_changes && !wxGetApp().check_and_keep_current_preset_changes(caption, _L("Custom printer was installed and it will be activated."), act_btns, &apply_keeped_changes)) return false; ->>>>>>> master page_firmware->apply_custom_config(*custom_config); page_bed->apply_custom_config(*custom_config); @@ -2815,12 +2784,6 @@ bool ConfigWizard::priv::apply_config(AppConfig *app_config, PresetBundle *prese // Update the selections from the compatibilty. preset_bundle->export_selections(*app_config); -<<<<<<< HEAD - - return true; -} -======= ->>>>>>> master return true; } @@ -3045,10 +3008,6 @@ bool ConfigWizard::run(RunReason reason, StartPage start_page) p->set_start_page(start_page); if (ShowModal() == wxID_OK) { -<<<<<<< HEAD - if (! p->apply_config(app.app_config, app.preset_bundle, app.preset_updater)) - return false; -======= bool apply_keeped_changes = false; if (! p->apply_config(app.app_config, app.preset_bundle, app.preset_updater, apply_keeped_changes)) return false; @@ -3056,7 +3015,6 @@ bool ConfigWizard::run(RunReason reason, StartPage start_page) if (apply_keeped_changes) app.apply_keeped_preset_modifications(); ->>>>>>> master app.app_config->set_legacy_datadir(false); app.update_mode(); app.obj_manipul()->update_ui_from_settings(); diff --git a/src/slic3r/GUI/ConfigWizard_private.hpp b/src/slic3r/GUI/ConfigWizard_private.hpp index d689de128..c822a2be8 100644 --- a/src/slic3r/GUI/ConfigWizard_private.hpp +++ b/src/slic3r/GUI/ConfigWizard_private.hpp @@ -616,11 +616,7 @@ struct ConfigWizard::priv bool on_bnt_finish(); bool check_and_install_missing_materials(Technology technology, const std::string &only_for_model_id = std::string()); -<<<<<<< HEAD - bool apply_config(AppConfig *app_config, PresetBundle *preset_bundle, const PresetUpdater *updater); -======= bool apply_config(AppConfig *app_config, PresetBundle *preset_bundle, const PresetUpdater *updater, bool& apply_keeped_changes); ->>>>>>> master // #ys_FIXME_alise void update_presets_in_config(const std::string& section, const std::string& alias_key, bool add); #ifdef __linux__ diff --git a/src/slic3r/GUI/DoubleSlider.cpp b/src/slic3r/GUI/DoubleSlider.cpp index 93887fe19..3d914d5b6 100644 --- a/src/slic3r/GUI/DoubleSlider.cpp +++ b/src/slic3r/GUI/DoubleSlider.cpp @@ -174,11 +174,8 @@ void Control::msw_rescale() void Control::sys_color_changed() { -<<<<<<< HEAD -======= GUI::wxGetApp().UpdateDarkUI(GetParent()); ->>>>>>> master m_bmp_add_tick_on .msw_rescale(); m_bmp_add_tick_off.msw_rescale(); m_bmp_del_tick_on .msw_rescale(); @@ -757,11 +754,7 @@ wxString Control::get_label(int tick, LabelType label_type/* = ltHeightWithLayer }; if (m_draw_mode == dmSequentialGCodeView) -<<<<<<< HEAD - return wxString::Format("%lu", static_cast<unsigned long>(m_values[value])); -======= return wxString::Format("%lu", static_cast<unsigned long>(m_alternate_values[value])); ->>>>>>> master else { if (label_type == ltEstimatedTime) { if (m_is_wipe_tower) { diff --git a/src/slic3r/GUI/ExtraRenderers.cpp b/src/slic3r/GUI/ExtraRenderers.cpp index 5ad433a29..d72e1dd32 100644 --- a/src/slic3r/GUI/ExtraRenderers.cpp +++ b/src/slic3r/GUI/ExtraRenderers.cpp @@ -322,20 +322,11 @@ wxWindow* BitmapChoiceRenderer::CreateEditorCtrl(wxWindow* parent, wxRect labelR #ifdef __linux__ c_editor->Bind(wxEVT_COMBOBOX, [this](wxCommandEvent& evt) { -<<<<<<< HEAD - evt.StopPropagation(); -#ifdef __linux__ - // FinishEditing grabs new selection and triggers config update. We better call - // it explicitly, automatic update on KILL_FOCUS didn't work on Linux. - this->FinishEditing(); -#endif -======= // to avoid event propagation to other sidebar items evt.StopPropagation(); // FinishEditing grabs new selection and triggers config update. We better call // it explicitly, automatic update on KILL_FOCUS didn't work on Linux. this->FinishEditing(); ->>>>>>> master }); #else // to avoid event propagation to other sidebar items diff --git a/src/slic3r/GUI/Field.cpp b/src/slic3r/GUI/Field.cpp index 893205293..6b210a708 100644 --- a/src/slic3r/GUI/Field.cpp +++ b/src/slic3r/GUI/Field.cpp @@ -1234,31 +1234,12 @@ boost::any& Choice::get_value() if (m_opt.type == coEnum) { -<<<<<<< HEAD - int ret_enum = field->GetSelection(); - if (m_opt_id.compare("host_type") == 0 && - m_opt.enum_values.size() > field->GetCount()) // for case, when PrusaLink isn't used as a HostType - ret_enum++; - - if (m_opt_id == "top_fill_pattern" || m_opt_id == "bottom_fill_pattern" || m_opt_id == "fill_pattern") - { - if (!m_opt.enum_values.empty()) { - std::string key = m_opt.enum_values[ret_enum]; - t_config_enum_values map_names = ConfigOptionEnum<InfillPattern>::get_enum_values(); - int value = map_names.at(key); - - m_value = static_cast<InfillPattern>(value); - } - else - m_value = static_cast<InfillPattern>(0); -======= if (m_opt_id.compare("host_type") == 0 && m_opt.enum_values.size() > field->GetCount()) { // for case, when PrusaLink isn't used as a HostType m_value = field->GetSelection()+1; } else if (m_opt_id == "top_fill_pattern" || m_opt_id == "bottom_fill_pattern" || m_opt_id == "fill_pattern") { const std::string& key = m_opt.enum_values[field->GetSelection()]; m_value = int(ConfigOptionEnum<InfillPattern>::get_enum_values().at(key)); ->>>>>>> master } else m_value = field->GetSelection(); diff --git a/src/slic3r/GUI/GCodeViewer.cpp b/src/slic3r/GUI/GCodeViewer.cpp index 876fedcf9..75ebd9255 100644 --- a/src/slic3r/GUI/GCodeViewer.cpp +++ b/src/slic3r/GUI/GCodeViewer.cpp @@ -88,7 +88,6 @@ static float round_to_bin(const float value) return std::round(value * scale[i]) * invscale[i]; } -#if ENABLE_SPLITTED_VERTEX_BUFFER void GCodeViewer::VBuffer::reset() { // release gpu memory @@ -99,18 +98,6 @@ void GCodeViewer::VBuffer::reset() sizes.clear(); count = 0; } -#else -void GCodeViewer::VBuffer::reset() -{ - // release gpu memory - if (!vbos.empty()) { - glsafe(::glDeleteBuffers(static_cast<GLsizei>(vbos.size()), static_cast<const GLuint*>(vbos.data()))); - vbos.clear(); - } - sizes.clear(); - count = 0; -} -#endif // ENABLE_SPLITTED_VERTEX_BUFFER void GCodeViewer::InstanceVBuffer::Ranges::reset() { @@ -132,27 +119,13 @@ void GCodeViewer::InstanceVBuffer::reset() void GCodeViewer::IBuffer::reset() { -#if ENABLE_SPLITTED_VERTEX_BUFFER // release gpu memory if (ibo > 0) { glsafe(::glDeleteBuffers(1, &ibo)); ibo = 0; } -#else - // release gpu memory - if (ibo > 0) { - glsafe(::glDeleteBuffers(1, &ibo)); - ibo = 0; - } -#endif // ENABLE_SPLITTED_VERTEX_BUFFER -<<<<<<< HEAD -#if ENABLE_SPLITTED_VERTEX_BUFFER vbo = 0; -#endif // ENABLE_SPLITTED_VERTEX_BUFFER -======= - vbo = 0; ->>>>>>> master count = 0; } @@ -173,37 +146,10 @@ bool GCodeViewer::Path::matches(const GCodeProcessorResult::MoveVertex& move) co case EMoveType::Seam: case EMoveType::Extrude: { // use rounding to reduce the number of generated paths -<<<<<<< HEAD -#if ENABLE_SPLITTED_VERTEX_BUFFER -#if ENABLE_TOOLPATHS_WIDTH_HEIGHT_FROM_GCODE - return type == move.type && extruder_id == move.extruder_id && cp_color_id == move.cp_color_id && role == move.extrusion_role && - move.position[2] <= sub_paths.front().first.position[2] && feedrate == move.feedrate && fan_speed == move.fan_speed && - height == round_to_nearest(move.height, 2) && width == round_to_nearest(move.width, 2) && - matches_percent(volumetric_rate, move.volumetric_rate(), 0.05f); -#else - return type == move.type && move.position[2] <= sub_paths.front().position[2] && role == move.extrusion_role && height == round_to_nearest(move.height, 2) && - width == round_to_nearest(move.width, 2) && feedrate == move.feedrate && fan_speed == move.fan_speed && - volumetric_rate == round_to_nearest(move.volumetric_rate(), 2) && extruder_id == move.extruder_id && - cp_color_id == move.cp_color_id; -#endif // ENABLE_TOOLPATHS_WIDTH_HEIGHT_FROM_GCODE -#else -#if ENABLE_TOOLPATHS_WIDTH_HEIGHT_FROM_GCODE -======= ->>>>>>> master return type == move.type && extruder_id == move.extruder_id && cp_color_id == move.cp_color_id && role == move.extrusion_role && move.position.z() <= sub_paths.front().first.position.z() && feedrate == move.feedrate && fan_speed == move.fan_speed && height == round_to_bin(move.height) && width == round_to_bin(move.width) && matches_percent(volumetric_rate, move.volumetric_rate(), 0.05f); -<<<<<<< HEAD -#else - return type == move.type && move.position[2] <= first.position[2] && role == move.extrusion_role && height == round_to_nearest(move.height, 2) && - width == round_to_nearest(move.width, 2) && feedrate == move.feedrate && fan_speed == move.fan_speed && - volumetric_rate == round_to_nearest(move.volumetric_rate(), 2) && extruder_id == move.extruder_id && - cp_color_id == move.cp_color_id; -#endif // ENABLE_TOOLPATHS_WIDTH_HEIGHT_FROM_GCODE -#endif // ENABLE_SPLITTED_VERTEX_BUFFER -======= ->>>>>>> master } case EMoveType::Travel: { return type == move.type && feedrate == move.feedrate && extruder_id == move.extruder_id && cp_color_id == move.cp_color_id; @@ -234,34 +180,10 @@ void GCodeViewer::TBuffer::add_path(const GCodeProcessorResult::MoveVertex& move { Path::Endpoint endpoint = { b_id, i_id, s_id, move.position }; // use rounding to reduce the number of generated paths -<<<<<<< HEAD -#if ENABLE_SPLITTED_VERTEX_BUFFER -#if ENABLE_TOOLPATHS_WIDTH_HEIGHT_FROM_GCODE - paths.push_back({ move.type, move.extrusion_role, move.delta_extruder, - round_to_nearest(move.height, 2), round_to_nearest(move.width, 2), move.feedrate, move.fan_speed, - move.volumetric_rate(), move.extruder_id, move.cp_color_id, { { endpoint, endpoint } } }); -#else - paths.push_back({ move.type, move.extrusion_role, move.delta_extruder, - round_to_nearest(move.height, 2), round_to_nearest(move.width, 2), move.feedrate, move.fan_speed, - round_to_nearest(move.volumetric_rate(), 2), move.extruder_id, move.cp_color_id, { { endpoint, endpoint } } }); -#endif // ENABLE_TOOLPATHS_WIDTH_HEIGHT_FROM_GCODE -#else -#if ENABLE_TOOLPATHS_WIDTH_HEIGHT_FROM_GCODE - paths.push_back({ move.type, move.extrusion_role, endpoint, endpoint, move.delta_extruder, - round_to_nearest(move.height, 2), round_to_nearest(move.width, 2), move.feedrate, move.fan_speed, - move.volumetric_rate(), move.extruder_id, move.cp_color_id }); -#else - paths.push_back({ move.type, move.extrusion_role, endpoint, endpoint, move.delta_extruder, - round_to_nearest(move.height, 2), round_to_nearest(move.width, 2), move.feedrate, move.fan_speed, - round_to_nearest(move.volumetric_rate(), 2), move.extruder_id, move.cp_color_id }); -#endif // ENABLE_TOOLPATHS_WIDTH_HEIGHT_FROM_GCODE -#endif // ENABLE_SPLITTED_VERTEX_BUFFER -======= paths.push_back({ move.type, move.extrusion_role, move.delta_extruder, round_to_bin(move.height), round_to_bin(move.width), move.feedrate, move.fan_speed, move.temperature, move.volumetric_rate(), move.extruder_id, move.cp_color_id, { { endpoint, endpoint } } }); ->>>>>>> master } GCodeViewer::Color GCodeViewer::Extrusions::Range::get_color_at(float value) const @@ -287,10 +209,6 @@ GCodeViewer::Color GCodeViewer::Extrusions::Range::get_color_at(float value) con return ret; } -<<<<<<< HEAD -#if ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS -======= ->>>>>>> master GCodeViewer::SequentialRangeCap::~SequentialRangeCap() { if (ibo > 0) glsafe(::glDeleteBuffers(1, &ibo)); @@ -303,14 +221,8 @@ void GCodeViewer::SequentialRangeCap::reset() { buffer = nullptr; ibo = 0; vbo = 0; -<<<<<<< HEAD - color = { 0.0f, 0.0f, 0.0f }; -} -#endif // ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS -======= color = { 0.0f, 0.0f, 0.0f, 1.0f }; } ->>>>>>> master void GCodeViewer::SequentialView::Marker::init() { @@ -652,15 +564,6 @@ GCodeViewer::GCodeViewer() { m_extrusions.reset_role_visibility_flags(); -<<<<<<< HEAD -GCodeViewer::GCodeViewer() -{ - // initializes non OpenGL data of TBuffers - // OpenGL data are initialized into render().init_gl_data() - for (size_t i = 0; i < m_buffers.size(); ++i) { - TBuffer& buffer = m_buffers[i]; - switch (buffer_type(i)) -======= // m_sequential_view.skip_invisible_moves = true; } @@ -674,7 +577,6 @@ void GCodeViewer::init() TBuffer& buffer = m_buffers[i]; EMoveType type = buffer_type(i); switch (type) ->>>>>>> master { default: { break; } case EMoveType::Tool_change: @@ -682,11 +584,6 @@ void GCodeViewer::init() case EMoveType::Pause_Print: case EMoveType::Custom_GCode: case EMoveType::Retract: -<<<<<<< HEAD - case EMoveType::Unretract: { - buffer.render_primitive_type = TBuffer::ERenderPrimitiveType::Point; - buffer.vertices.format = VBuffer::EFormat::Position; -======= case EMoveType::Unretract: case EMoveType::Seam: { // if (wxGetApp().is_gl_version_greater_or_equal_to(3, 3)) { @@ -705,34 +602,17 @@ void GCodeViewer::init() buffer.model.color = option_color(type); buffer.model.instances.format = InstanceVBuffer::EFormat::BatchedModel; // } ->>>>>>> master break; } case EMoveType::Wipe: case EMoveType::Extrude: { buffer.render_primitive_type = TBuffer::ERenderPrimitiveType::Triangle; buffer.vertices.format = VBuffer::EFormat::PositionNormal3; -<<<<<<< HEAD -======= buffer.shader = "gouraud_light"; ->>>>>>> master break; } case EMoveType::Travel: { buffer.render_primitive_type = TBuffer::ERenderPrimitiveType::Line; -<<<<<<< HEAD - buffer.vertices.format = VBuffer::EFormat::PositionNormal1; - break; - } - } - } - - set_toolpath_move_type_visible(EMoveType::Extrude, true); -// m_sequential_view.skip_invisible_moves = true; -} - -void GCodeViewer::load(const GCodeProcessor::Result& gcode_result, const Print& print, bool initialized) -======= buffer.vertices.format = VBuffer::EFormat::PositionNormal3; buffer.shader = "toolpaths_lines"; break; @@ -754,7 +634,6 @@ void GCodeViewer::load(const GCodeProcessor::Result& gcode_result, const Print& } void GCodeViewer::load(const GCodeProcessorResult& gcode_result, const Print& print, bool initialized) ->>>>>>> master { // avoid processing if called with the same gcode_result if (m_last_result_id == gcode_result.id) @@ -942,52 +821,9 @@ void GCodeViewer::reset() void GCodeViewer::render() { -<<<<<<< HEAD - auto init_gl_data = [this]() { - // initializes opengl data of TBuffers - for (size_t i = 0; i < m_buffers.size(); ++i) { - TBuffer& buffer = const_cast<TBuffer&>(m_buffers[i]); - switch (buffer_type(i)) - { - default: { break; } - case EMoveType::Tool_change: - case EMoveType::Color_change: - case EMoveType::Pause_Print: - case EMoveType::Custom_GCode: - case EMoveType::Retract: - case EMoveType::Unretract: { - buffer.shader = wxGetApp().is_glsl_version_greater_or_equal_to(1, 20) ? "options_120" : "options_110"; - break; - } - case EMoveType::Wipe: - case EMoveType::Extrude: { - buffer.shader = "gouraud_light"; - break; - } - case EMoveType::Travel: { - buffer.shader = "toolpaths_lines"; - break; - } - } - } - - // initializes tool marker - const_cast<SequentialView*>(&m_sequential_view)->marker.init(); - - // initializes point sizes - std::array<int, 2> point_sizes; - ::glGetIntegerv(GL_ALIASED_POINT_SIZE_RANGE, point_sizes.data()); - *const_cast<std::array<float, 2>*>(&m_detected_point_sizes) = { static_cast<float>(point_sizes[0]), static_cast<float>(point_sizes[1]) }; - *const_cast<bool*>(&m_gl_data_initialized) = true; - }; - -#if ENABLE_GCODE_VIEWER_STATISTICS - const_cast<Statistics*>(&m_statistics)->reset_opengl(); -======= #if ENABLE_GCODE_VIEWER_STATISTICS m_statistics.reset_opengl(); m_statistics.total_instances_gpu_size = 0; ->>>>>>> master #endif // ENABLE_GCODE_VIEWER_STATISTICS if (m_roles.empty()) @@ -995,12 +831,6 @@ void GCodeViewer::render() glsafe(::glEnable(GL_DEPTH_TEST)); render_toolpaths(); -<<<<<<< HEAD - SequentialView* sequential_view = const_cast<SequentialView*>(&m_sequential_view); - if (sequential_view->current.last != sequential_view->endpoints.last) { - sequential_view->marker.set_world_position(sequential_view->current_position); - sequential_view->marker.render(); -======= render_shells(); float legend_height = 0.0f; render_legend(legend_height); @@ -1008,25 +838,16 @@ void GCodeViewer::render() m_sequential_view.marker.set_world_position(m_sequential_view.current_position); m_sequential_view.marker.set_world_offset(m_sequential_view.current_offset); m_sequential_view.render(legend_height); ->>>>>>> master } #if ENABLE_GCODE_VIEWER_STATISTICS render_statistics(); #endif // ENABLE_GCODE_VIEWER_STATISTICS } -<<<<<<< HEAD -#if ENABLE_SPLITTED_VERTEX_BUFFER -======= ->>>>>>> master bool GCodeViewer::can_export_toolpaths() const { return has_data() && m_buffers[buffer_id(EMoveType::Extrude)].render_primitive_type == TBuffer::ERenderPrimitiveType::Triangle; } -<<<<<<< HEAD -#endif // ENABLE_SPLITTED_VERTEX_BUFFER -======= ->>>>>>> master void GCodeViewer::update_sequential_view_current(unsigned int first, unsigned int last) { @@ -1034,17 +855,8 @@ void GCodeViewer::update_sequential_view_current(unsigned int first, unsigned in for (const TBuffer& buffer : m_buffers) { if (buffer.visible) { for (const Path& path : buffer.paths) { -<<<<<<< HEAD -#if ENABLE_SPLITTED_VERTEX_BUFFER - if (path.sub_paths.front().first.s_id <= id && id <= path.sub_paths.back().last.s_id) -#else - if (path.first.s_id <= id && id <= path.last.s_id) -#endif // ENABLE_SPLITTED_VERTEX_BUFFER - return true; -======= if (path.sub_paths.front().first.s_id <= id && id <= path.sub_paths.back().last.s_id) return true; ->>>>>>> master } } } @@ -1160,32 +972,17 @@ void GCodeViewer::export_toolpaths_to_obj(const char* filename) const // the data needed is contained into the Extrude TBuffer const TBuffer& t_buffer = m_buffers[buffer_id(EMoveType::Extrude)]; if (!t_buffer.has_data()) -<<<<<<< HEAD -======= return; if (t_buffer.render_primitive_type != TBuffer::ERenderPrimitiveType::Triangle) ->>>>>>> master return; -#if ENABLE_SPLITTED_VERTEX_BUFFER - if (t_buffer.render_primitive_type != TBuffer::ERenderPrimitiveType::Triangle) - return; -#endif // ENABLE_SPLITTED_VERTEX_BUFFER - // collect color information to generate materials std::vector<Color> colors; for (const RenderPath& path : t_buffer.render_paths) { colors.push_back(path.color); } -<<<<<<< HEAD -#if ENABLE_SPLITTED_VERTEX_BUFFER - std::sort(colors.begin(), colors.end()); - colors.erase(std::unique(colors.begin(), colors.end()), colors.end()); -#endif // ENABLE_SPLITTED_VERTEX_BUFFER -======= sort_remove_duplicates(colors); ->>>>>>> master // save materials file boost::filesystem::path mat_filename(filename); @@ -1223,112 +1020,7 @@ void GCodeViewer::export_toolpaths_to_obj(const char* filename) const fprintf(fp, "# Generated by %s-%s based on Slic3r\n", SLIC3R_APP_NAME, SLIC3R_VERSION); fprintf(fp, "\nmtllib ./%s\n", mat_filename.filename().string().c_str()); -<<<<<<< HEAD -#if ENABLE_SPLITTED_VERTEX_BUFFER - const size_t floats_per_vertex = t_buffer.vertices.vertex_size_floats(); - - std::vector<Vec3f> out_vertices; - std::vector<Vec3f> out_normals; - - struct VerticesOffset - { - unsigned int vbo; - size_t offset; - }; - std::vector<VerticesOffset> vertices_offsets; - vertices_offsets.push_back({ t_buffer.vertices.vbos.front(), 0 }); - - // get vertices/normals data from vertex buffers on gpu - for (size_t i = 0; i < t_buffer.vertices.vbos.size(); ++i) { - const size_t floats_count = t_buffer.vertices.sizes[i] / sizeof(float); - VertexBuffer vertices(floats_count); - glsafe(::glBindBuffer(GL_ARRAY_BUFFER, t_buffer.vertices.vbos[i])); - glsafe(::glGetBufferSubData(GL_ARRAY_BUFFER, 0, static_cast<GLsizeiptr>(t_buffer.vertices.sizes[i]), static_cast<void*>(vertices.data()))); - glsafe(::glBindBuffer(GL_ARRAY_BUFFER, 0)); - const size_t vertices_count = floats_count / floats_per_vertex; - for (size_t j = 0; j < vertices_count; ++j) { - const size_t base = j * floats_per_vertex; - out_vertices.push_back({ vertices[base + 0], vertices[base + 1], vertices[base + 2] }); - out_normals.push_back({ vertices[base + 3], vertices[base + 4], vertices[base + 5] }); - } - - if (i < t_buffer.vertices.vbos.size() - 1) - vertices_offsets.push_back({ t_buffer.vertices.vbos[i + 1], vertices_offsets.back().offset + vertices_count }); - } - - // save vertices to file - fprintf(fp, "\n# vertices\n"); - for (const Vec3f& v : out_vertices) { - fprintf(fp, "v %g %g %g\n", v[0], v[1], v[2]); - } - - // save normals to file - fprintf(fp, "\n# normals\n"); - for (const Vec3f& n : out_normals) { - fprintf(fp, "vn %g %g %g\n", n[0], n[1], n[2]); - } - - size_t i = 0; - for (const Color& color : colors) { - // save material triangles to file - fprintf(fp, "\nusemtl material_%zu\n", i + 1); - fprintf(fp, "# triangles material %zu\n", i + 1); - - for (const RenderPath& render_path : t_buffer.render_paths) { - if (render_path.color != color) - continue; - - const IBuffer& ibuffer = t_buffer.indices[render_path.ibuffer_id]; - size_t vertices_offset = 0; - for (size_t j = 0; j < vertices_offsets.size(); ++j) { - const VerticesOffset& offset = vertices_offsets[j]; - if (offset.vbo == ibuffer.vbo) { - vertices_offset = offset.offset; - break; - } - } - - // get indices data from index buffer on gpu - glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, ibuffer.ibo)); - for (size_t j = 0; j < render_path.sizes.size(); ++j) { - IndexBuffer indices(render_path.sizes[j]); - glsafe(::glGetBufferSubData(GL_ELEMENT_ARRAY_BUFFER, static_cast<GLintptr>(render_path.offsets[j]), - static_cast<GLsizeiptr>(render_path.sizes[j] * sizeof(IBufferType)), static_cast<void*>(indices.data()))); - - const size_t triangles_count = render_path.sizes[j] / 3; - for (size_t k = 0; k < triangles_count; ++k) { - const size_t base = k * 3; - const size_t v1 = 1 + static_cast<size_t>(indices[base + 0]) + vertices_offset; - const size_t v2 = 1 + static_cast<size_t>(indices[base + 1]) + vertices_offset; - const size_t v3 = 1 + static_cast<size_t>(indices[base + 2]) + vertices_offset; - if (v1 != v2) - // do not export dummy triangles - fprintf(fp, "f %zu//%zu %zu//%zu %zu//%zu\n", v1, v1, v2, v2, v3, v3); - } - } - glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0)); - } - ++i; - } -#else - // get vertices data from vertex buffer on gpu - size_t floats_per_vertex = t_buffer.vertices.vertex_size_floats(); - VertexBuffer vertices = VertexBuffer(t_buffer.vertices.count * floats_per_vertex); - glsafe(::glBindBuffer(GL_ARRAY_BUFFER, t_buffer.vertices.id)); - glsafe(::glGetBufferSubData(GL_ARRAY_BUFFER, 0, t_buffer.vertices.data_size_bytes(), vertices.data())); - glsafe(::glBindBuffer(GL_ARRAY_BUFFER, 0)); - - // get indices data from index buffer on gpu - MultiIndexBuffer indices; - for (size_t i = 0; i < t_buffer.indices.size(); ++i) { - indices.push_back(IndexBuffer(t_buffer.indices[i].count)); - glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, t_buffer.indices[i].id)); - glsafe(::glGetBufferSubData(GL_ELEMENT_ARRAY_BUFFER, 0, static_cast<GLsizeiptr>(indices.back().size() * sizeof(unsigned int)), indices.back().data())); - glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0)); - } -======= const size_t floats_per_vertex = t_buffer.vertices.vertex_size_floats(); ->>>>>>> master std::vector<Vec3f> out_vertices; std::vector<Vec3f> out_normals; @@ -1359,41 +1051,6 @@ void GCodeViewer::export_toolpaths_to_obj(const char* filename) const vertices_offsets.push_back({ t_buffer.vertices.vbos[i + 1], vertices_offsets.back().offset + vertices_count }); } -<<<<<<< HEAD - size_t out_vertices_count = 0; - unsigned int indices_per_segment = t_buffer.indices_per_segment(); - unsigned int start_vertex_offset = t_buffer.start_segment_vertex_offset(); - unsigned int end_vertex_offset = t_buffer.end_segment_vertex_offset(); - - size_t i = 0; - for (const RenderPath& render_path : t_buffer.render_paths) { - // get paths segments from buffer paths - const IndexBuffer& ibuffer = indices[render_path.ibuffer_id]; - const Path& path = t_buffer.paths[render_path.path_id]; - - float half_width = 0.5f * path.width; - // clamp height to avoid artifacts due to z-fighting when importing the obj file into blender and similar - float half_height = std::max(0.5f * path.height, 0.005f); - - // generates vertices/normals/triangles - std::vector<Vec3f> out_vertices; - std::vector<Vec3f> out_normals; - using Triangle = std::array<size_t, 3>; - std::vector<Triangle> out_triangles; - for (size_t j = 0; j < render_path.offsets.size(); ++j) { - unsigned int start = static_cast<unsigned int>(render_path.offsets[j] / sizeof(unsigned int)); - unsigned int end = start + render_path.sizes[j]; - - for (size_t k = start; k < end; k += static_cast<size_t>(indices_per_segment)) { - Segment curr = generate_segment(ibuffer[k + start_vertex_offset], ibuffer[k + end_vertex_offset], half_width, half_height); - if (k == start) { - // starting endpoint vertices/normals - out_vertices.push_back(curr.v1 + curr.rl_displacement); out_normals.push_back(curr.right); // right - out_vertices.push_back(curr.v1 + curr.tb_displacement); out_normals.push_back(curr.up); // top - out_vertices.push_back(curr.v1 - curr.rl_displacement); out_normals.push_back(-curr.right); // left - out_vertices.push_back(curr.v1 - curr.tb_displacement); out_normals.push_back(-curr.up); // bottom - out_vertices_count += 4; -======= // save vertices to file fprintf(fp, "\n# vertices\n"); for (const Vec3f& v : out_vertices) { @@ -1405,7 +1062,6 @@ void GCodeViewer::export_toolpaths_to_obj(const char* filename) const for (const Vec3f& n : out_normals) { fprintf(fp, "vn %g %g %g\n", n.x(), n.y(), n.z()); } ->>>>>>> master size_t i = 0; for (const Color& color : colors) { @@ -1449,17 +1105,11 @@ void GCodeViewer::export_toolpaths_to_obj(const char* filename) const } ++i; } -#endif // ENABLE_SPLITTED_VERTEX_BUFFER fclose(fp); } -<<<<<<< HEAD -#if ENABLE_SPLITTED_VERTEX_BUFFER -void GCodeViewer::load_toolpaths(const GCodeProcessor::Result& gcode_result) -======= void GCodeViewer::load_toolpaths(const GCodeProcessorResult& gcode_result) ->>>>>>> master { // max index buffer size, in bytes static const size_t IBUFFER_THRESHOLD_BYTES = 64 * 1024 * 1024; @@ -1481,40 +1131,18 @@ void GCodeViewer::load_toolpaths(const GCodeProcessorResult& gcode_result) }; // format data into the buffers to be rendered as points -<<<<<<< HEAD - auto add_vertices_as_point = [](const GCodeProcessor::MoveVertex& curr, VertexBuffer& vertices) { - vertices.push_back(curr.position[0]); - vertices.push_back(curr.position[1]); - vertices.push_back(curr.position[2]); - }; - auto add_indices_as_point = [](const GCodeProcessor::MoveVertex& curr, TBuffer& buffer, -======= auto add_vertices_as_point = [](const GCodeProcessorResult::MoveVertex& curr, VertexBuffer& vertices) { vertices.push_back(curr.position.x()); vertices.push_back(curr.position.y()); vertices.push_back(curr.position.z()); }; auto add_indices_as_point = [](const GCodeProcessorResult::MoveVertex& curr, TBuffer& buffer, ->>>>>>> master unsigned int ibuffer_id, IndexBuffer& indices, size_t move_id) { buffer.add_path(curr, ibuffer_id, indices.size(), move_id); indices.push_back(static_cast<IBufferType>(indices.size())); }; // format data into the buffers to be rendered as lines -<<<<<<< HEAD - auto add_vertices_as_line = [](const GCodeProcessor::MoveVertex& prev, const GCodeProcessor::MoveVertex& curr, VertexBuffer& vertices) { - // x component of the normal to the current segment (the normal is parallel to the XY plane) - float normal_x = (curr.position - prev.position).normalized()[1]; - - auto add_vertex = [&vertices, normal_x](const GCodeProcessor::MoveVertex& vertex) { - // add position - vertices.push_back(vertex.position[0]); - vertices.push_back(vertex.position[1]); - vertices.push_back(vertex.position[2]); - // add normal x component - vertices.push_back(normal_x); -======= auto add_vertices_as_line = [](const GCodeProcessorResult::MoveVertex& prev, const GCodeProcessorResult::MoveVertex& curr, VertexBuffer& vertices) { // x component of the normal to the current segment (the normal is parallel to the XY plane) const Vec3f dir = (curr.position - prev.position).normalized(); @@ -1530,7 +1158,6 @@ void GCodeViewer::load_toolpaths(const GCodeProcessorResult& gcode_result) vertices.push_back(normal.x()); vertices.push_back(normal.y()); vertices.push_back(normal.z()); ->>>>>>> master }; // add previous vertex @@ -1538,19 +1165,11 @@ void GCodeViewer::load_toolpaths(const GCodeProcessorResult& gcode_result) // add current vertex add_vertex(curr); }; -<<<<<<< HEAD - auto add_indices_as_line = [](const GCodeProcessor::MoveVertex& prev, const GCodeProcessor::MoveVertex& curr, TBuffer& buffer, - unsigned int ibuffer_id, IndexBuffer& indices, size_t move_id) { - if (prev.type != curr.type || !buffer.paths.back().matches(curr)) { - // add starting index - indices.push_back(static_cast<unsigned int>(indices.size())); -======= auto add_indices_as_line = [](const GCodeProcessorResult::MoveVertex& prev, const GCodeProcessorResult::MoveVertex& curr, TBuffer& buffer, unsigned int ibuffer_id, IndexBuffer& indices, size_t move_id) { if (buffer.paths.empty() || prev.type != curr.type || !buffer.paths.back().matches(curr)) { // add starting index indices.push_back(static_cast<IBufferType>(indices.size())); ->>>>>>> master buffer.add_path(curr, ibuffer_id, indices.size() - 1, move_id - 1); buffer.paths.back().sub_paths.front().first.position = prev.position; } @@ -1558,38 +1177,15 @@ void GCodeViewer::load_toolpaths(const GCodeProcessorResult& gcode_result) Path& last_path = buffer.paths.back(); if (last_path.sub_paths.front().first.i_id != last_path.sub_paths.back().last.i_id) { // add previous index -<<<<<<< HEAD - indices.push_back(static_cast<unsigned int>(indices.size())); - } - - // add current index - indices.push_back(static_cast<unsigned int>(indices.size())); -======= indices.push_back(static_cast<IBufferType>(indices.size())); } // add current index indices.push_back(static_cast<IBufferType>(indices.size())); ->>>>>>> master last_path.sub_paths.back().last = { ibuffer_id, indices.size() - 1, move_id, curr.position }; }; // format data into the buffers to be rendered as solid -<<<<<<< HEAD - auto add_vertices_as_solid = [](const GCodeProcessor::MoveVertex& prev, const GCodeProcessor::MoveVertex& curr, TBuffer& buffer, unsigned int vbuffer_id, VertexBuffer& vertices, size_t move_id) { - auto store_vertex = [](VertexBuffer& vertices, const Vec3f& position, const Vec3f& normal) { - // append position - vertices.push_back(position[0]); - vertices.push_back(position[1]); - vertices.push_back(position[2]); - // append normal - vertices.push_back(normal[0]); - vertices.push_back(normal[1]); - vertices.push_back(normal[2]); - }; - - if (prev.type != curr.type || !buffer.paths.back().matches(curr)) { -======= auto add_vertices_as_solid = [](const GCodeProcessorResult::MoveVertex& prev, const GCodeProcessorResult::MoveVertex& curr, TBuffer& buffer, unsigned int vbuffer_id, VertexBuffer& vertices, size_t move_id) { auto store_vertex = [](VertexBuffer& vertices, const Vec3f& position, const Vec3f& normal) { // append position @@ -1603,28 +1199,12 @@ void GCodeViewer::load_toolpaths(const GCodeProcessorResult& gcode_result) }; if (buffer.paths.empty() || prev.type != curr.type || !buffer.paths.back().matches(curr)) { ->>>>>>> master buffer.add_path(curr, vbuffer_id, vertices.size(), move_id - 1); buffer.paths.back().sub_paths.back().first.position = prev.position; } Path& last_path = buffer.paths.back(); -<<<<<<< HEAD - Vec3f dir = (curr.position - prev.position).normalized(); - Vec3f right = Vec3f(dir[1], -dir[0], 0.0f).normalized(); - Vec3f left = -right; - Vec3f up = right.cross(dir); - Vec3f down = -up; - float half_width = 0.5f * last_path.width; - float half_height = 0.5f * last_path.height; - Vec3f prev_pos = prev.position - half_height * up; - Vec3f curr_pos = curr.position - half_height * up; - Vec3f d_up = half_height * up; - Vec3f d_down = -half_height * up; - Vec3f d_right = half_width * right; - Vec3f d_left = -half_width * right; -======= const Vec3f dir = (curr.position - prev.position).normalized(); const Vec3f right = Vec3f(dir.y(), -dir.x(), 0.0f).normalized(); const Vec3f left = -right; @@ -1638,7 +1218,6 @@ void GCodeViewer::load_toolpaths(const GCodeProcessorResult& gcode_result) const Vec3f d_down = -half_height * up; const Vec3f d_right = half_width * right; const Vec3f d_left = -half_width * right; ->>>>>>> master // vertices 1st endpoint if (last_path.vertices_count() == 1 || vertices.empty()) { @@ -1664,18 +1243,8 @@ void GCodeViewer::load_toolpaths(const GCodeProcessorResult& gcode_result) last_path.sub_paths.back().last = { vbuffer_id, vertices.size(), move_id, curr.position }; }; -<<<<<<< HEAD -#if ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS - auto add_indices_as_solid = [&](const GCodeProcessor::MoveVertex& prev, const GCodeProcessor::MoveVertex& curr, const GCodeProcessor::MoveVertex* next, - TBuffer& buffer, size_t& vbuffer_size, unsigned int ibuffer_id, IndexBuffer& indices, size_t move_id) { -#else - auto add_indices_as_solid = [](const GCodeProcessor::MoveVertex& prev, const GCodeProcessor::MoveVertex& curr, TBuffer& buffer, - size_t& vbuffer_size, unsigned int ibuffer_id, IndexBuffer& indices, size_t move_id) { -#endif // ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS -======= auto add_indices_as_solid = [&](const GCodeProcessorResult::MoveVertex& prev, const GCodeProcessorResult::MoveVertex& curr, const GCodeProcessorResult::MoveVertex* next, TBuffer& buffer, size_t& vbuffer_size, unsigned int ibuffer_id, IndexBuffer& indices, size_t move_id) { ->>>>>>> master static Vec3f prev_dir; static Vec3f prev_up; static float sq_prev_length; @@ -1683,13 +1252,11 @@ void GCodeViewer::load_toolpaths(const GCodeProcessorResult& gcode_result) indices.push_back(i1); indices.push_back(i2); indices.push_back(i3); -<<<<<<< HEAD }; auto append_dummy_cap = [store_triangle](IndexBuffer& indices, IBufferType id) { store_triangle(indices, id, id, id); store_triangle(indices, id, id, id); }; -#if ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS auto convert_vertices_offset = [](size_t vbuffer_size, const std::array<int, 8>& v_offsets) { std::array<IBufferType, 8> ret = { static_cast<IBufferType>(static_cast<int>(vbuffer_size) + v_offsets[0]), @@ -1721,101 +1288,14 @@ void GCodeViewer::load_toolpaths(const GCodeProcessorResult& gcode_result) store_triangle(indices, v_offsets[4], v_offsets[6], v_offsets[7]); store_triangle(indices, v_offsets[4], v_offsets[5], v_offsets[6]); }; -#else - auto append_stem_triangles = [&](IndexBuffer& indices, size_t vbuffer_size, const std::array<int, 8>& v_offsets) { - std::array<IBufferType, 8> v_ids; - for (size_t i = 0; i < v_ids.size(); ++i) { - v_ids[i] = static_cast<IBufferType>(static_cast<int>(vbuffer_size) + v_offsets[i]); - } - // triangles starting cap - store_triangle(indices, v_ids[0], v_ids[2], v_ids[1]); - store_triangle(indices, v_ids[0], v_ids[3], v_ids[2]); - - // triangles sides - store_triangle(indices, v_ids[0], v_ids[1], v_ids[4]); - store_triangle(indices, v_ids[1], v_ids[5], v_ids[4]); - store_triangle(indices, v_ids[1], v_ids[2], v_ids[5]); - store_triangle(indices, v_ids[2], v_ids[6], v_ids[5]); - store_triangle(indices, v_ids[2], v_ids[3], v_ids[6]); - store_triangle(indices, v_ids[3], v_ids[7], v_ids[6]); - store_triangle(indices, v_ids[3], v_ids[0], v_ids[7]); - store_triangle(indices, v_ids[0], v_ids[4], v_ids[7]); - - // triangles ending cap - store_triangle(indices, v_ids[4], v_ids[6], v_ids[7]); - store_triangle(indices, v_ids[4], v_ids[5], v_ids[6]); -======= - }; - auto append_dummy_cap = [store_triangle](IndexBuffer& indices, IBufferType id) { - store_triangle(indices, id, id, id); - store_triangle(indices, id, id, id); - }; - auto convert_vertices_offset = [](size_t vbuffer_size, const std::array<int, 8>& v_offsets) { - std::array<IBufferType, 8> ret = { - static_cast<IBufferType>(static_cast<int>(vbuffer_size) + v_offsets[0]), - static_cast<IBufferType>(static_cast<int>(vbuffer_size) + v_offsets[1]), - static_cast<IBufferType>(static_cast<int>(vbuffer_size) + v_offsets[2]), - static_cast<IBufferType>(static_cast<int>(vbuffer_size) + v_offsets[3]), - static_cast<IBufferType>(static_cast<int>(vbuffer_size) + v_offsets[4]), - static_cast<IBufferType>(static_cast<int>(vbuffer_size) + v_offsets[5]), - static_cast<IBufferType>(static_cast<int>(vbuffer_size) + v_offsets[6]), - static_cast<IBufferType>(static_cast<int>(vbuffer_size) + v_offsets[7]) - }; - return ret; - }; - auto append_starting_cap_triangles = [&](IndexBuffer& indices, const std::array<IBufferType, 8>& v_offsets) { - store_triangle(indices, v_offsets[0], v_offsets[2], v_offsets[1]); - store_triangle(indices, v_offsets[0], v_offsets[3], v_offsets[2]); - }; - auto append_stem_triangles = [&](IndexBuffer& indices, const std::array<IBufferType, 8>& v_offsets) { - store_triangle(indices, v_offsets[0], v_offsets[1], v_offsets[4]); - store_triangle(indices, v_offsets[1], v_offsets[5], v_offsets[4]); - store_triangle(indices, v_offsets[1], v_offsets[2], v_offsets[5]); - store_triangle(indices, v_offsets[2], v_offsets[6], v_offsets[5]); - store_triangle(indices, v_offsets[2], v_offsets[3], v_offsets[6]); - store_triangle(indices, v_offsets[3], v_offsets[7], v_offsets[6]); - store_triangle(indices, v_offsets[3], v_offsets[0], v_offsets[7]); - store_triangle(indices, v_offsets[0], v_offsets[4], v_offsets[7]); - }; - auto append_ending_cap_triangles = [&](IndexBuffer& indices, const std::array<IBufferType, 8>& v_offsets) { - store_triangle(indices, v_offsets[4], v_offsets[6], v_offsets[7]); - store_triangle(indices, v_offsets[4], v_offsets[5], v_offsets[6]); ->>>>>>> master - }; -#endif // ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS - -<<<<<<< HEAD - if (prev.type != curr.type || !buffer.paths.back().matches(curr)) { -======= if (buffer.paths.empty() || prev.type != curr.type || !buffer.paths.back().matches(curr)) { ->>>>>>> master buffer.add_path(curr, ibuffer_id, indices.size(), move_id - 1); buffer.paths.back().sub_paths.back().first.position = prev.position; } Path& last_path = buffer.paths.back(); -<<<<<<< HEAD - Vec3f dir = (curr.position - prev.position).normalized(); - Vec3f right = Vec3f(dir[1], -dir[0], 0.0f).normalized(); - Vec3f up = right.cross(dir); - float sq_length = (curr.position - prev.position).squaredNorm(); - -#if ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS - const std::array<IBufferType, 8> first_seg_v_offsets = convert_vertices_offset(vbuffer_size, { 0, 1, 2, 3, 4, 5, 6, 7 }); - const std::array<IBufferType, 8> non_first_seg_v_offsets = convert_vertices_offset(vbuffer_size, { -4, 0, -2, 1, 2, 3, 4, 5 }); -#endif // ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS - - if (last_path.vertices_count() == 1 || vbuffer_size == 0) { - // 1st segment or restart into a new vertex buffer - // =============================================== -#if ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS - if (last_path.vertices_count() == 1) - // starting cap triangles - append_starting_cap_triangles(indices, first_seg_v_offsets); -#endif // ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS -======= const Vec3f dir = (curr.position - prev.position).normalized(); const Vec3f right = Vec3f(dir.y(), -dir.x(), 0.0f).normalized(); const Vec3f up = right.cross(dir); @@ -1830,20 +1310,11 @@ void GCodeViewer::load_toolpaths(const GCodeProcessorResult& gcode_result) if (is_first_segment) // starting cap triangles append_starting_cap_triangles(indices, first_seg_v_offsets); ->>>>>>> master // dummy triangles outer corner cap append_dummy_cap(indices, vbuffer_size); // stem triangles -<<<<<<< HEAD -#if ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS append_stem_triangles(indices, first_seg_v_offsets); -#else - append_stem_triangles(indices, vbuffer_size, { 0, 1, 2, 3, 4, 5, 6, 7 }); -#endif // ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS -======= - append_stem_triangles(indices, first_seg_v_offsets); ->>>>>>> master vbuffer_size += 8; } @@ -1854,17 +1325,6 @@ void GCodeViewer::load_toolpaths(const GCodeProcessorResult& gcode_result) const float cos_dir = prev_dir.dot(dir); if (cos_dir > -0.9998477f) { // if the angle between adjacent segments is smaller than 179 degrees -<<<<<<< HEAD - Vec3f med_dir = (prev_dir + dir).normalized(); - float half_width = 0.5f * last_path.width; - displacement = half_width * ::tan(::acos(std::clamp(dir.dot(med_dir), -1.0f, 1.0f))); - } - - float sq_displacement = sqr(displacement); - bool can_displace = displacement > 0.0f && sq_displacement < sq_prev_length && sq_displacement < sq_length; - - bool is_right_turn = prev_up.dot(prev_dir.cross(dir)) <= 0.0f; -======= const Vec3f med_dir = (prev_dir + dir).normalized(); const float half_width = 0.5f * last_path.width; displacement = half_width * ::tan(::acos(std::clamp(dir.dot(med_dir), -1.0f, 1.0f))); @@ -1874,7 +1334,6 @@ void GCodeViewer::load_toolpaths(const GCodeProcessorResult& gcode_result) const bool can_displace = displacement > 0.0f && sq_displacement < sq_prev_length && sq_displacement < sq_length; const bool is_right_turn = prev_up.dot(prev_dir.cross(dir)) <= 0.0f; ->>>>>>> master // whether the angle between adjacent segments is greater than 45 degrees const bool is_sharp = cos_dir < 0.7071068f; @@ -1887,84 +1346,6 @@ void GCodeViewer::load_toolpaths(const GCodeProcessorResult& gcode_result) else right_displaced = true; } -<<<<<<< HEAD - - // triangles outer corner cap - if (is_right_turn) { - if (left_displaced) - // dummy triangles - append_dummy_cap(indices, vbuffer_size); - else { - store_triangle(indices, vbuffer_size - 4, vbuffer_size + 1, vbuffer_size - 1); - store_triangle(indices, vbuffer_size + 1, vbuffer_size - 2, vbuffer_size - 1); - } - } - else { - if (right_displaced) - // dummy triangles - append_dummy_cap(indices, vbuffer_size); - else { - store_triangle(indices, vbuffer_size - 4, vbuffer_size - 3, vbuffer_size + 0); - store_triangle(indices, vbuffer_size - 3, vbuffer_size - 2, vbuffer_size + 0); - } - } - - // stem triangles -#if ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS - append_stem_triangles(indices, non_first_seg_v_offsets); -#else - append_stem_triangles(indices, vbuffer_size, { -4, 0, -2, 1, 2, 3, 4, 5 }); -#endif // ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS - - vbuffer_size += 6; - } - -#if ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS - if (next != nullptr && (curr.type != next->type || !last_path.matches(*next))) - // ending cap triangles - append_ending_cap_triangles(indices, non_first_seg_v_offsets); -#endif // ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS - - last_path.sub_paths.back().last = { ibuffer_id, indices.size() - 1, move_id, curr.position }; - prev_dir = dir; - prev_up = up; - sq_prev_length = sq_length; - }; - -#if ENABLE_GCODE_VIEWER_STATISTICS - auto start_time = std::chrono::high_resolution_clock::now(); - m_statistics.results_size = SLIC3R_STDVEC_MEMSIZE(gcode_result.moves, GCodeProcessor::MoveVertex); - m_statistics.results_time = gcode_result.time; -#endif // ENABLE_GCODE_VIEWER_STATISTICS - - m_moves_count = gcode_result.moves.size(); - if (m_moves_count == 0) - return; - - unsigned int progress_count = 0; - static const unsigned int progress_threshold = 1000; - wxProgressDialog* progress_dialog = wxGetApp().is_gcode_viewer() ? - new wxProgressDialog(_L("Generating toolpaths"), "...", - 100, wxGetApp().plater(), wxPD_AUTO_HIDE | wxPD_APP_MODAL) : nullptr; - - wxBusyCursor busy; - - // extract approximate paths bounding box from result - for (const GCodeProcessor::MoveVertex& move : gcode_result.moves) { - if (wxGetApp().is_gcode_viewer()) - // for the gcode viewer we need to take in account all moves to correctly size the printbed - m_paths_bounding_box.merge(move.position.cast<double>()); - else { - if (move.type == EMoveType::Extrude && move.width != 0.0f && move.height != 0.0f) - m_paths_bounding_box.merge(move.position.cast<double>()); - } - } - - // set approximate max bounding box (take in account also the tool marker) - m_max_bounding_box = m_paths_bounding_box; - m_max_bounding_box.merge(m_paths_bounding_box.max + m_sequential_view.marker.get_bounding_box().size()[2] * Vec3d::UnitZ()); - -======= // triangles outer corner cap if (is_right_turn) { @@ -2103,7 +1484,6 @@ void GCodeViewer::load_toolpaths(const GCodeProcessorResult& gcode_result) m_sequential_view.gcode_ids.push_back(move.gcode_id); } ->>>>>>> master std::vector<MultiVertexBuffer> vertices(m_buffers.size()); std::vector<MultiIndexBuffer> indices(m_buffers.size()); std::vector<InstanceBuffer> instances(m_buffers.size()); @@ -2116,9 +1496,6 @@ void GCodeViewer::load_toolpaths(const GCodeProcessorResult& gcode_result) // toolpaths data -> extract vertices from result for (size_t i = 0; i < m_moves_count; ++i) { -<<<<<<< HEAD - const GCodeProcessor::MoveVertex& curr = gcode_result.moves[i]; -======= const GCodeProcessorResult::MoveVertex& curr = gcode_result.moves[i]; if (curr.type == EMoveType::Seam) { ++seams_count; @@ -2126,17 +1503,12 @@ void GCodeViewer::load_toolpaths(const GCodeProcessorResult& gcode_result) } size_t move_id = i - seams_count; ->>>>>>> master // skip first vertex if (i == 0) continue; -<<<<<<< HEAD - const GCodeProcessor::MoveVertex& prev = gcode_result.moves[i - 1]; -======= const GCodeProcessorResult::MoveVertex& prev = gcode_result.moves[i - 1]; ->>>>>>> master // update progress dialog ++progress_count; @@ -2147,18 +1519,12 @@ void GCodeViewer::load_toolpaths(const GCodeProcessorResult& gcode_result) progress_count = 0; } -<<<<<<< HEAD - unsigned char id = buffer_id(curr.type); - TBuffer& t_buffer = m_buffers[id]; - MultiVertexBuffer& v_multibuffer = vertices[id]; -======= const unsigned char id = buffer_id(curr.type); TBuffer& t_buffer = m_buffers[id]; MultiVertexBuffer& v_multibuffer = vertices[id]; InstanceBuffer& inst_buffer = instances[id]; InstanceIdBuffer& inst_id_buffer = instances_ids[id]; InstancesOffsets& inst_offsets = instances_offsets[id]; ->>>>>>> master // ensure there is at least one vertex buffer if (v_multibuffer.empty()) @@ -2166,186 +1532,22 @@ void GCodeViewer::load_toolpaths(const GCodeProcessorResult& gcode_result) // if adding the vertices for the current segment exceeds the threshold size of the current vertex buffer // add another vertex buffer -<<<<<<< HEAD - if (v_multibuffer.back().size() * sizeof(float) > t_buffer.vertices.max_size_bytes() - t_buffer.max_vertices_per_segment_size_bytes()) { -======= size_t vertices_size_to_add = (t_buffer.render_primitive_type == TBuffer::ERenderPrimitiveType::BatchedModel) ? t_buffer.model.data.vertices_size_bytes() : t_buffer.max_vertices_per_segment_size_bytes(); if (v_multibuffer.back().size() * sizeof(float) > t_buffer.vertices.max_size_bytes() - vertices_size_to_add) { ->>>>>>> master v_multibuffer.push_back(VertexBuffer()); if (t_buffer.render_primitive_type == TBuffer::ERenderPrimitiveType::Triangle) { Path& last_path = t_buffer.paths.back(); if (prev.type == curr.type && last_path.matches(curr)) -<<<<<<< HEAD - last_path.add_sub_path(prev, static_cast<unsigned int>(v_multibuffer.size()) - 1, 0, i - 1); - } - } - - VertexBuffer& v_buffer = v_multibuffer.back(); - -======= last_path.add_sub_path(prev, static_cast<unsigned int>(v_multibuffer.size()) - 1, 0, move_id - 1); } } VertexBuffer& v_buffer = v_multibuffer.back(); ->>>>>>> master switch (t_buffer.render_primitive_type) { case TBuffer::ERenderPrimitiveType::Point: { add_vertices_as_point(curr, v_buffer); break; } case TBuffer::ERenderPrimitiveType::Line: { add_vertices_as_line(prev, curr, v_buffer); break; } -<<<<<<< HEAD - case TBuffer::ERenderPrimitiveType::Triangle: { add_vertices_as_solid(prev, curr, t_buffer, static_cast<unsigned int>(v_multibuffer.size()) - 1, v_buffer, i); break; } - } - - // collect options zs for later use - if (curr.type == EMoveType::Pause_Print || curr.type == EMoveType::Custom_GCode) { - const float* const last_z = options_zs.empty() ? nullptr : &options_zs.back(); - if (last_z == nullptr || curr.position[2] < *last_z - EPSILON || *last_z + EPSILON < curr.position[2]) - options_zs.emplace_back(curr.position[2]); - } - } - - // smooth toolpaths corners for the given TBuffer using triangles - auto smooth_triangle_toolpaths_corners = [&gcode_result](const TBuffer& t_buffer, MultiVertexBuffer& v_multibuffer) { - auto extract_position_at = [](const VertexBuffer& vertices, size_t offset) { - return Vec3f(vertices[offset + 0], vertices[offset + 1], vertices[offset + 2]); - }; - auto update_position_at = [](VertexBuffer& vertices, size_t offset, const Vec3f& position) { - vertices[offset + 0] = position[0]; - vertices[offset + 1] = position[1]; - vertices[offset + 2] = position[2]; - }; - auto match_right_vertices = [&](const Path::Sub_Path& prev_sub_path, const Path::Sub_Path& next_sub_path, - size_t curr_s_id, size_t vertex_size_floats, const Vec3f& displacement_vec) { - if (&prev_sub_path == &next_sub_path) { // previous and next segment are both contained into to the same vertex buffer - VertexBuffer& vbuffer = v_multibuffer[prev_sub_path.first.b_id]; - // offset into the vertex buffer of the next segment 1st vertex - size_t next_1st_offset = (prev_sub_path.last.s_id - curr_s_id) * 6 * vertex_size_floats; - // offset into the vertex buffer of the right vertex of the previous segment - size_t prev_right_offset = prev_sub_path.last.i_id - next_1st_offset - 3 * vertex_size_floats; - // new position of the right vertices - Vec3f shared_vertex = extract_position_at(vbuffer, prev_right_offset) + displacement_vec; - // update previous segment - update_position_at(vbuffer, prev_right_offset, shared_vertex); - // offset into the vertex buffer of the right vertex of the next segment - size_t next_right_offset = next_sub_path.last.i_id - next_1st_offset; - // update next segment - update_position_at(vbuffer, next_right_offset, shared_vertex); - } - else { // previous and next segment are contained into different vertex buffers - VertexBuffer& prev_vbuffer = v_multibuffer[prev_sub_path.first.b_id]; - VertexBuffer& next_vbuffer = v_multibuffer[next_sub_path.first.b_id]; - // offset into the previous vertex buffer of the right vertex of the previous segment - size_t prev_right_offset = prev_sub_path.last.i_id - 3 * vertex_size_floats; - // new position of the right vertices - Vec3f shared_vertex = extract_position_at(prev_vbuffer, prev_right_offset) + displacement_vec; - // update previous segment - update_position_at(prev_vbuffer, prev_right_offset, shared_vertex); - // offset into the next vertex buffer of the right vertex of the next segment - size_t next_right_offset = next_sub_path.first.i_id + 1 * vertex_size_floats; - // update next segment - update_position_at(next_vbuffer, next_right_offset, shared_vertex); - } - }; - auto match_left_vertices = [&](const Path::Sub_Path& prev_sub_path, const Path::Sub_Path& next_sub_path, - size_t curr_s_id, size_t vertex_size_floats, const Vec3f& displacement_vec) { - if (&prev_sub_path == &next_sub_path) { // previous and next segment are both contained into to the same vertex buffer - VertexBuffer& vbuffer = v_multibuffer[prev_sub_path.first.b_id]; - // offset into the vertex buffer of the next segment 1st vertex - size_t next_1st_offset = (prev_sub_path.last.s_id - curr_s_id) * 6 * vertex_size_floats; - // offset into the vertex buffer of the left vertex of the previous segment - size_t prev_left_offset = prev_sub_path.last.i_id - next_1st_offset - 1 * vertex_size_floats; - // new position of the left vertices - Vec3f shared_vertex = extract_position_at(vbuffer, prev_left_offset) + displacement_vec; - // update previous segment - update_position_at(vbuffer, prev_left_offset, shared_vertex); - // offset into the vertex buffer of the left vertex of the next segment - size_t next_left_offset = next_sub_path.last.i_id - next_1st_offset + 1 * vertex_size_floats; - // update next segment - update_position_at(vbuffer, next_left_offset, shared_vertex); - } - else { // previous and next segment are contained into different vertex buffers - VertexBuffer& prev_vbuffer = v_multibuffer[prev_sub_path.first.b_id]; - VertexBuffer& next_vbuffer = v_multibuffer[next_sub_path.first.b_id]; - // offset into the previous vertex buffer of the left vertex of the previous segment - size_t prev_left_offset = prev_sub_path.last.i_id - 1 * vertex_size_floats; - // new position of the left vertices - Vec3f shared_vertex = extract_position_at(prev_vbuffer, prev_left_offset) + displacement_vec; - // update previous segment - update_position_at(prev_vbuffer, prev_left_offset, shared_vertex); - // offset into the next vertex buffer of the left vertex of the next segment - size_t next_left_offset = next_sub_path.first.i_id + 3 * vertex_size_floats; - // update next segment - update_position_at(next_vbuffer, next_left_offset, shared_vertex); - } - }; - - size_t vertex_size_floats = t_buffer.vertices.vertex_size_floats(); - for (const Path& path : t_buffer.paths) { - // the two segments of the path sharing the current vertex may belong - // to two different vertex buffers - size_t prev_sub_path_id = 0; - size_t next_sub_path_id = 0; - size_t path_vertices_count = path.vertices_count(); - float half_width = 0.5f * path.width; - for (size_t j = 1; j < path_vertices_count - 1; ++j) { - size_t curr_s_id = path.sub_paths.front().first.s_id + j; - const Vec3f& prev = gcode_result.moves[curr_s_id - 1].position; - const Vec3f& curr = gcode_result.moves[curr_s_id].position; - const Vec3f& next = gcode_result.moves[curr_s_id + 1].position; - - // select the subpaths which contains the previous/next segments - if (!path.sub_paths[prev_sub_path_id].contains(curr_s_id)) - ++prev_sub_path_id; - if (!path.sub_paths[next_sub_path_id].contains(curr_s_id + 1)) - ++next_sub_path_id; - const Path::Sub_Path& prev_sub_path = path.sub_paths[prev_sub_path_id]; - const Path::Sub_Path& next_sub_path = path.sub_paths[next_sub_path_id]; - - Vec3f prev_dir = (curr - prev).normalized(); - Vec3f prev_right = Vec3f(prev_dir[1], -prev_dir[0], 0.0f).normalized(); - Vec3f prev_up = prev_right.cross(prev_dir); - - Vec3f next_dir = (next - curr).normalized(); - - bool is_right_turn = prev_up.dot(prev_dir.cross(next_dir)) <= 0.0f; - float cos_dir = prev_dir.dot(next_dir); - // whether the angle between adjacent segments is greater than 45 degrees - bool is_sharp = cos_dir < 0.7071068f; - - float displacement = 0.0f; - if (cos_dir > -0.9998477f) { - // if the angle between adjacent segments is smaller than 179 degrees - Vec3f med_dir = (prev_dir + next_dir).normalized(); - displacement = half_width * ::tan(::acos(std::clamp(next_dir.dot(med_dir), -1.0f, 1.0f))); - } - - float sq_prev_length = (curr - prev).squaredNorm(); - float sq_next_length = (next - curr).squaredNorm(); - float sq_displacement = sqr(displacement); - bool can_displace = displacement > 0.0f && sq_displacement < sq_prev_length && sq_displacement < sq_next_length; - - if (can_displace) { - // displacement to apply to the vertices to match - Vec3f displacement_vec = displacement * prev_dir; - // matches inner corner vertices - if (is_right_turn) - match_right_vertices(prev_sub_path, next_sub_path, curr_s_id, vertex_size_floats, -displacement_vec); - else - match_left_vertices(prev_sub_path, next_sub_path, curr_s_id, vertex_size_floats, -displacement_vec); - - if (!is_sharp) { - // matches outer corner vertices - if (is_right_turn) - match_left_vertices(prev_sub_path, next_sub_path, curr_s_id, vertex_size_floats, displacement_vec); - else - match_right_vertices(prev_sub_path, next_sub_path, curr_s_id, vertex_size_floats, displacement_vec); - } - } - } -======= case TBuffer::ERenderPrimitiveType::Triangle: { add_vertices_as_solid(prev, curr, t_buffer, static_cast<unsigned int>(v_multibuffer.size()) - 1, v_buffer, move_id); break; } case TBuffer::ERenderPrimitiveType::InstancedModel: { @@ -2364,63 +1566,9 @@ void GCodeViewer::load_toolpaths(const GCodeProcessorResult& gcode_result) ++m_statistics.batched_count; #endif // ENABLE_GCODE_VIEWER_STATISTICS break; ->>>>>>> master - } - }; - -#if ENABLE_GCODE_VIEWER_STATISTICS - auto load_vertices_time = std::chrono::high_resolution_clock::now(); - m_statistics.load_vertices = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::high_resolution_clock::now() - start_time).count(); -#endif // ENABLE_GCODE_VIEWER_STATISTICS - - // smooth toolpaths corners for TBuffers using triangles - for (size_t i = 0; i < m_buffers.size(); ++i) { - const TBuffer& t_buffer = m_buffers[i]; - if (t_buffer.render_primitive_type == TBuffer::ERenderPrimitiveType::Triangle) { - smooth_triangle_toolpaths_corners(t_buffer, vertices[i]); - } - } - -<<<<<<< HEAD - for (MultiVertexBuffer& v_multibuffer : vertices) { - for (VertexBuffer& v_buffer : v_multibuffer) { - v_buffer.shrink_to_fit(); } - } - - // move the wipe toolpaths half height up to render them on proper position - MultiVertexBuffer& wipe_vertices = vertices[buffer_id(EMoveType::Wipe)]; - for (VertexBuffer& v_buffer : wipe_vertices) { - for (size_t i = 2; i < v_buffer.size(); i += 3) { - v_buffer[i] += 0.5f * GCodeProcessor::Wipe_Height; } - } - // send vertices data to gpu - for (size_t i = 0; i < m_buffers.size(); ++i) { - TBuffer& t_buffer = m_buffers[i]; - - const MultiVertexBuffer& v_multibuffer = vertices[i]; - for (const VertexBuffer& v_buffer : v_multibuffer) { - size_t size_elements = v_buffer.size(); - size_t size_bytes = size_elements * sizeof(float); - size_t vertices_count = size_elements / t_buffer.vertices.vertex_size_floats(); - t_buffer.vertices.count += vertices_count; - -#if ENABLE_GCODE_VIEWER_STATISTICS - m_statistics.total_vertices_gpu_size += static_cast<int64_t>(size_bytes); - m_statistics.max_vbuffer_gpu_size = std::max(m_statistics.max_vbuffer_gpu_size, static_cast<int64_t>(size_bytes)); - ++m_statistics.vbuffers_count; -#endif // ENABLE_GCODE_VIEWER_STATISTICS - - GLuint id = 0; - glsafe(::glGenBuffers(1, &id)); - t_buffer.vertices.vbos.push_back(static_cast<unsigned int>(id)); - t_buffer.vertices.sizes.push_back(size_bytes); - glsafe(::glBindBuffer(GL_ARRAY_BUFFER, id)); - glsafe(::glBufferData(GL_ARRAY_BUFFER, size_bytes, v_buffer.data(), GL_STATIC_DRAW)); - glsafe(::glBindBuffer(GL_ARRAY_BUFFER, 0)); -======= // collect options zs for later use if (curr.type == EMoveType::Pause_Print || curr.type == EMoveType::Custom_GCode) { const float* const last_z = options_zs.empty() ? nullptr : &options_zs.back(); @@ -2656,7 +1804,6 @@ void GCodeViewer::load_toolpaths(const GCodeProcessorResult& gcode_result) t_buffer.vertices.vbos.push_back(static_cast<unsigned int>(id)); t_buffer.vertices.sizes.push_back(size_bytes); } ->>>>>>> master } } @@ -2668,11 +1815,8 @@ void GCodeViewer::load_toolpaths(const GCodeProcessorResult& gcode_result) // dismiss vertices data, no more needed std::vector<MultiVertexBuffer>().swap(vertices); -<<<<<<< HEAD -======= std::vector<InstanceBuffer>().swap(instances); std::vector<InstanceIdBuffer>().swap(instances_ids); ->>>>>>> master // toolpaths data -> extract indices from result // paths may have been filled while extracting vertices, @@ -2688,11 +1832,6 @@ void GCodeViewer::load_toolpaths(const GCodeProcessorResult& gcode_result) // variable used to keep track of the vertex buffers ids using VboIndexList = std::vector<unsigned int>; std::vector<VboIndexList> vbo_indices(m_buffers.size()); -<<<<<<< HEAD - - for (size_t i = 0; i < m_moves_count; ++i) { - const GCodeProcessor::MoveVertex& curr = gcode_result.moves[i]; -======= seams_count = 0; @@ -2702,25 +1841,15 @@ void GCodeViewer::load_toolpaths(const GCodeProcessorResult& gcode_result) ++seams_count; size_t move_id = i - seams_count; ->>>>>>> master // skip first vertex if (i == 0) continue; -<<<<<<< HEAD - const GCodeProcessor::MoveVertex& prev = gcode_result.moves[i - 1]; -#if ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS - const GCodeProcessor::MoveVertex* next = nullptr; - if (i < m_moves_count - 1) - next = &gcode_result.moves[i + 1]; -#endif // ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS -======= const GCodeProcessorResult::MoveVertex& prev = gcode_result.moves[i - 1]; const GCodeProcessorResult::MoveVertex* next = nullptr; if (i < m_moves_count - 1) next = &gcode_result.moves[i + 1]; ->>>>>>> master ++progress_count; if (progress_dialog != nullptr && progress_count % progress_threshold == 0) { @@ -2730,11 +1859,7 @@ void GCodeViewer::load_toolpaths(const GCodeProcessorResult& gcode_result) progress_count = 0; } -<<<<<<< HEAD - unsigned char id = buffer_id(curr.type); -======= const unsigned char id = buffer_id(curr.type); ->>>>>>> master TBuffer& t_buffer = m_buffers[id]; MultiIndexBuffer& i_multibuffer = indices[id]; CurrVertexBuffer& curr_vertex_buffer = curr_vertex_buffers[id]; @@ -2743,46 +1868,12 @@ void GCodeViewer::load_toolpaths(const GCodeProcessorResult& gcode_result) // ensure there is at least one index buffer if (i_multibuffer.empty()) { i_multibuffer.push_back(IndexBuffer()); -<<<<<<< HEAD - vbo_index_list.push_back(t_buffer.vertices.vbos[curr_vertex_buffer.first]); -======= if (!t_buffer.vertices.vbos.empty()) vbo_index_list.push_back(t_buffer.vertices.vbos[curr_vertex_buffer.first]); ->>>>>>> master } // if adding the indices for the current segment exceeds the threshold size of the current index buffer // create another index buffer -<<<<<<< HEAD -#if ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS - if (i_multibuffer.back().size() * sizeof(IBufferType) >= IBUFFER_THRESHOLD_BYTES - t_buffer.max_indices_per_segment_size_bytes()) { -#else - if (i_multibuffer.back().size() * sizeof(IBufferType) >= IBUFFER_THRESHOLD_BYTES - t_buffer.indices_per_segment_size_bytes()) { -#endif // ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS - i_multibuffer.push_back(IndexBuffer()); - vbo_index_list.push_back(t_buffer.vertices.vbos[curr_vertex_buffer.first]); - if (t_buffer.render_primitive_type != TBuffer::ERenderPrimitiveType::Point) { - Path& last_path = t_buffer.paths.back(); - last_path.add_sub_path(prev, static_cast<unsigned int>(i_multibuffer.size()) - 1, 0, i - 1); - } - } - - // if adding the vertices for the current segment exceeds the threshold size of the current vertex buffer - // create another index buffer - if (curr_vertex_buffer.second * t_buffer.vertices.vertex_size_bytes() > t_buffer.vertices.max_size_bytes() - t_buffer.max_vertices_per_segment_size_bytes()) { - i_multibuffer.push_back(IndexBuffer()); - - ++curr_vertex_buffer.first; - curr_vertex_buffer.second = 0; - vbo_index_list.push_back(t_buffer.vertices.vbos[curr_vertex_buffer.first]); - - if (t_buffer.render_primitive_type != TBuffer::ERenderPrimitiveType::Point) { - Path& last_path = t_buffer.paths.back(); - last_path.add_sub_path(prev, static_cast<unsigned int>(i_multibuffer.size()) - 1, 0, i - 1); - } - } - -======= size_t indiced_size_to_add = (t_buffer.render_primitive_type == TBuffer::ERenderPrimitiveType::BatchedModel) ? t_buffer.model.data.indices_size_bytes() : t_buffer.max_indices_per_segment_size_bytes(); if (i_multibuffer.back().size() * sizeof(IBufferType) >= IBUFFER_THRESHOLD_BYTES - indiced_size_to_add) { i_multibuffer.push_back(IndexBuffer()); @@ -2811,39 +1902,22 @@ void GCodeViewer::load_toolpaths(const GCodeProcessorResult& gcode_result) } } ->>>>>>> master IndexBuffer& i_buffer = i_multibuffer.back(); switch (t_buffer.render_primitive_type) { case TBuffer::ERenderPrimitiveType::Point: { -<<<<<<< HEAD - add_indices_as_point(curr, t_buffer, static_cast<unsigned int>(i_multibuffer.size()) - 1, i_buffer, i); -======= add_indices_as_point(curr, t_buffer, static_cast<unsigned int>(i_multibuffer.size()) - 1, i_buffer, move_id); ->>>>>>> master curr_vertex_buffer.second += t_buffer.max_vertices_per_segment(); break; } case TBuffer::ERenderPrimitiveType::Line: { -<<<<<<< HEAD - add_indices_as_line(prev, curr, t_buffer, static_cast<unsigned int>(i_multibuffer.size()) - 1, i_buffer, i); -======= add_indices_as_line(prev, curr, t_buffer, static_cast<unsigned int>(i_multibuffer.size()) - 1, i_buffer, move_id); ->>>>>>> master curr_vertex_buffer.second += t_buffer.max_vertices_per_segment(); break; } case TBuffer::ERenderPrimitiveType::Triangle: { -<<<<<<< HEAD -#if ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS - add_indices_as_solid(prev, curr, next, t_buffer, curr_vertex_buffer.second, static_cast<unsigned int>(i_multibuffer.size()) - 1, i_buffer, i); -#else - add_indices_as_solid(prev, curr, t_buffer, curr_vertex_buffer.second, static_cast<unsigned int>(i_multibuffer.size()) - 1, i_buffer, i); -#endif // ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS -======= add_indices_as_solid(prev, curr, next, t_buffer, curr_vertex_buffer.second, static_cast<unsigned int>(i_multibuffer.size()) - 1, i_buffer, move_id); ->>>>>>> master break; } case TBuffer::ERenderPrimitiveType::BatchedModel: { @@ -2864,29 +1938,6 @@ void GCodeViewer::load_toolpaths(const GCodeProcessorResult& gcode_result) // toolpaths data -> send indices data to gpu for (size_t i = 0; i < m_buffers.size(); ++i) { TBuffer& t_buffer = m_buffers[i]; -<<<<<<< HEAD - const MultiIndexBuffer& i_multibuffer = indices[i]; - for (const IndexBuffer& i_buffer : i_multibuffer) { - size_t size_elements = i_buffer.size(); - size_t size_bytes = size_elements * sizeof(IBufferType); - - // stores index buffer informations into TBuffer - t_buffer.indices.push_back(IBuffer()); - IBuffer& ibuf = t_buffer.indices.back(); - ibuf.count = size_elements; - ibuf.vbo = vbo_indices[i][t_buffer.indices.size() - 1]; - -#if ENABLE_GCODE_VIEWER_STATISTICS - m_statistics.total_indices_gpu_size += static_cast<int64_t>(size_bytes); - m_statistics.max_ibuffer_gpu_size = std::max(m_statistics.max_ibuffer_gpu_size, static_cast<int64_t>(size_bytes)); - ++m_statistics.ibuffers_count; -#endif // ENABLE_GCODE_VIEWER_STATISTICS - - glsafe(::glGenBuffers(1, &ibuf.ibo)); - glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, ibuf.ibo)); - glsafe(::glBufferData(GL_ELEMENT_ARRAY_BUFFER, size_bytes, i_buffer.data(), GL_STATIC_DRAW)); - glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0)); -======= if (t_buffer.render_primitive_type != TBuffer::ERenderPrimitiveType::InstancedModel) { const MultiIndexBuffer& i_multibuffer = indices[i]; for (const IndexBuffer& i_buffer : i_multibuffer) { @@ -2910,7 +1961,6 @@ void GCodeViewer::load_toolpaths(const GCodeProcessorResult& gcode_result) glsafe(::glBufferData(GL_ELEMENT_ARRAY_BUFFER, size_bytes, i_buffer.data(), GL_STATIC_DRAW)); glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0)); } ->>>>>>> master } } @@ -2927,10 +1977,6 @@ void GCodeViewer::load_toolpaths(const GCodeProcessorResult& gcode_result) auto update_segments_count = [&](EMoveType type, int64_t& count) { unsigned int id = buffer_id(type); const MultiIndexBuffer& buffers = indices[id]; -<<<<<<< HEAD -#if ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS -======= ->>>>>>> master int64_t indices_count = 0; for (const IndexBuffer& buffer : buffers) { indices_count += buffer.size(); @@ -2940,14 +1986,6 @@ void GCodeViewer::load_toolpaths(const GCodeProcessorResult& gcode_result) indices_count -= static_cast<int64_t>(12 * t_buffer.paths.size()); // remove the starting + ending caps = 4 triangles count += indices_count / t_buffer.indices_per_segment(); -<<<<<<< HEAD -#else - for (const IndexBuffer& buffer : buffers) { - count += buffer.size() / m_buffers[id].indices_per_segment(); - } -#endif // ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS -======= ->>>>>>> master }; update_segments_count(EMoveType::Travel, m_statistics.travel_segments_count); @@ -3010,665 +2048,7 @@ void GCodeViewer::load_toolpaths(const GCodeProcessorResult& gcode_result) m_layers.append(layer.first, { layer.second.first, layer.second.second }); } } -<<<<<<< HEAD - - // roles -> remove duplicates - std::sort(m_roles.begin(), m_roles.end()); - m_roles.erase(std::unique(m_roles.begin(), m_roles.end()), m_roles.end()); - m_roles.shrink_to_fit(); - - // extruder ids -> remove duplicates - std::sort(m_extruder_ids.begin(), m_extruder_ids.end()); - m_extruder_ids.erase(std::unique(m_extruder_ids.begin(), m_extruder_ids.end()), m_extruder_ids.end()); - m_extruder_ids.shrink_to_fit(); - - // set layers z range - if (!m_layers.empty()) - m_layers_z_range = { 0, static_cast<unsigned int>(m_layers.size() - 1) }; - - // change color of paths whose layer contains option points - if (!options_zs.empty()) { - TBuffer& extrude_buffer = m_buffers[buffer_id(EMoveType::Extrude)]; - for (Path& path : extrude_buffer.paths) { - float z = path.sub_paths.front().first.position[2]; - if (std::find_if(options_zs.begin(), options_zs.end(), [z](float f) { return f - EPSILON <= z && z <= f + EPSILON; }) != options_zs.end()) - path.cp_color_id = 255 - path.cp_color_id; - } - } - -#if ENABLE_GCODE_VIEWER_STATISTICS - m_statistics.load_time = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::high_resolution_clock::now() - start_time).count(); -#endif // ENABLE_GCODE_VIEWER_STATISTICS - - if (progress_dialog != nullptr) - progress_dialog->Destroy(); -} -#else -void GCodeViewer::load_toolpaths(const GCodeProcessor::Result& gcode_result) -{ -#if ENABLE_GCODE_VIEWER_STATISTICS - auto start_time = std::chrono::high_resolution_clock::now(); - m_statistics.results_size = SLIC3R_STDVEC_MEMSIZE(gcode_result.moves, GCodeProcessor::MoveVertex); - m_statistics.results_time = gcode_result.time; -#endif // ENABLE_GCODE_VIEWER_STATISTICS - - // vertices data - m_moves_count = gcode_result.moves.size(); - if (m_moves_count == 0) - return; - - unsigned int progress_count = 0; - static const unsigned int progress_threshold = 1000; - wxProgressDialog* progress_dialog = wxGetApp().is_gcode_viewer() ? - new wxProgressDialog(_L("Generating toolpaths"), "...", - 100, wxGetApp().plater(), wxPD_AUTO_HIDE | wxPD_APP_MODAL) : nullptr; - - m_extruders_count = gcode_result.extruders_count; - - for (size_t i = 0; i < m_moves_count; ++i) { - const GCodeProcessor::MoveVertex& move = gcode_result.moves[i]; - if (wxGetApp().is_gcode_viewer()) - // for the gcode viewer we need all moves to correctly size the printbed - m_paths_bounding_box.merge(move.position.cast<double>()); - else { - if (move.type == EMoveType::Extrude && move.width != 0.0f && move.height != 0.0f) - m_paths_bounding_box.merge(move.position.cast<double>()); - } - } - - // max bounding box (account for tool marker) - m_max_bounding_box = m_paths_bounding_box; - m_max_bounding_box.merge(m_paths_bounding_box.max + m_sequential_view.marker.get_bounding_box().size()[2] * Vec3d::UnitZ()); - - auto log_memory_usage = [this](const std::string& label, const std::vector<VertexBuffer>& vertices, const std::vector<MultiIndexBuffer>& indices) { - int64_t vertices_size = 0; - for (size_t i = 0; i < vertices.size(); ++i) { - vertices_size += SLIC3R_STDVEC_MEMSIZE(vertices[i], float); - } - int64_t indices_size = 0; - for (size_t i = 0; i < indices.size(); ++i) { - for (size_t j = 0; j < indices[i].size(); ++j) { - indices_size += SLIC3R_STDVEC_MEMSIZE(indices[i][j], unsigned int); - } - } - log_memory_used(label, vertices_size + indices_size); - }; - - // format data into the buffers to be rendered as points - auto add_vertices_as_point = [](const GCodeProcessor::MoveVertex& curr, VertexBuffer& vertices) { - vertices.push_back(curr.position[0]); - vertices.push_back(curr.position[1]); - vertices.push_back(curr.position[2]); - }; - auto add_indices_as_point = [](const GCodeProcessor::MoveVertex& curr, TBuffer& buffer, - unsigned int ibuffer_id, IndexBuffer& indices, size_t move_id) { - buffer.add_path(curr, ibuffer_id, indices.size(), move_id); - indices.push_back(static_cast<unsigned int>(indices.size())); - }; - - // format data into the buffers to be rendered as lines - auto add_vertices_as_line = [](const GCodeProcessor::MoveVertex& prev, const GCodeProcessor::MoveVertex& curr, - VertexBuffer& vertices) { - // x component of the normal to the current segment (the normal is parallel to the XY plane) - float normal_x = (curr.position - prev.position).normalized()[1]; - - auto add_vertex = [&vertices, normal_x](const GCodeProcessor::MoveVertex& vertex) { - // add position - vertices.push_back(vertex.position[0]); - vertices.push_back(vertex.position[1]); - vertices.push_back(vertex.position[2]); - // add normal x component - vertices.push_back(normal_x); - }; - - // add previous vertex - add_vertex(prev); - // add current vertex - add_vertex(curr); - }; - auto add_indices_as_line = [](const GCodeProcessor::MoveVertex& prev, const GCodeProcessor::MoveVertex& curr, TBuffer& buffer, - unsigned int ibuffer_id, IndexBuffer& indices, size_t move_id) { - if (prev.type != curr.type || !buffer.paths.back().matches(curr)) { - // add starting index - indices.push_back(static_cast<unsigned int>(indices.size())); - buffer.add_path(curr, ibuffer_id, indices.size() - 1, move_id - 1); - buffer.paths.back().first.position = prev.position; - } - - Path& last_path = buffer.paths.back(); - if (last_path.first.i_id != last_path.last.i_id) { - // add previous index - indices.push_back(static_cast<unsigned int>(indices.size())); - } - - // add current index - indices.push_back(static_cast<unsigned int>(indices.size())); - last_path.last = { ibuffer_id, indices.size() - 1, move_id, curr.position }; - }; - - // format data into the buffers to be rendered as solid - auto add_vertices_as_solid = [](const GCodeProcessor::MoveVertex& prev, const GCodeProcessor::MoveVertex& curr, TBuffer& buffer, - VertexBuffer& vertices, size_t move_id) { - static Vec3f prev_dir; - static Vec3f prev_up; - static float prev_length; - auto store_vertex = [](VertexBuffer& vertices, const Vec3f& position, const Vec3f& normal) { - // append position - vertices.push_back(position[0]); - vertices.push_back(position[1]); - vertices.push_back(position[2]); - // append normal - vertices.push_back(normal[0]); - vertices.push_back(normal[1]); - vertices.push_back(normal[2]); - }; - auto extract_position_at = [](const VertexBuffer& vertices, size_t id) { - return Vec3f(vertices[id + 0], vertices[id + 1], vertices[id + 2]); - }; - auto update_position_at = [](VertexBuffer& vertices, size_t id, const Vec3f& position) { - vertices[id + 0] = position[0]; - vertices[id + 1] = position[1]; - vertices[id + 2] = position[2]; - }; - - if (prev.type != curr.type || !buffer.paths.back().matches(curr)) { - buffer.add_path(curr, 0, 0, move_id - 1); - buffer.paths.back().first.position = prev.position; - } - - unsigned int starting_vertices_size = static_cast<unsigned int>(vertices.size() / buffer.vertices.vertex_size_floats()); - - Vec3f dir = (curr.position - prev.position).normalized(); - Vec3f right = (std::abs(std::abs(dir.dot(Vec3f::UnitZ())) - 1.0f) < EPSILON) ? -Vec3f::UnitY() : Vec3f(dir[1], -dir[0], 0.0f).normalized(); - Vec3f left = -right; - Vec3f up = right.cross(dir); - Vec3f down = -up; - - Path& last_path = buffer.paths.back(); - - float half_width = 0.5f * last_path.width; - float half_height = 0.5f * last_path.height; - - Vec3f prev_pos = prev.position - half_height * up; - Vec3f curr_pos = curr.position - half_height * up; - - float length = (curr_pos - prev_pos).norm(); - if (last_path.vertices_count() == 1) { - // 1st segment - - // vertices 1st endpoint - store_vertex(vertices, prev_pos + half_height * up, up); - store_vertex(vertices, prev_pos + half_width * right, right); - store_vertex(vertices, prev_pos + half_height * down, down); - store_vertex(vertices, prev_pos + half_width * left, left); - - // vertices 2nd endpoint - store_vertex(vertices, curr_pos + half_height * up, up); - store_vertex(vertices, curr_pos + half_width * right, right); - store_vertex(vertices, curr_pos + half_height * down, down); - store_vertex(vertices, curr_pos + half_width * left, left); - } - else { - // any other segment - float displacement = 0.0f; - float cos_dir = prev_dir.dot(dir); - if (cos_dir > -0.9998477f) { - // if the angle between adjacent segments is smaller than 179 degrees - Vec3f med_dir = (prev_dir + dir).normalized(); - displacement = half_width * ::tan(::acos(std::clamp(dir.dot(med_dir), -1.0f, 1.0f))); - } - - Vec3f displacement_vec = displacement * prev_dir; - bool can_displace = displacement > 0.0f && displacement < prev_length&& displacement < length; - - size_t prev_right_id = (starting_vertices_size - 3) * buffer.vertices.vertex_size_floats(); - size_t prev_left_id = (starting_vertices_size - 1) * buffer.vertices.vertex_size_floats(); - Vec3f prev_right_pos = extract_position_at(vertices, prev_right_id); - Vec3f prev_left_pos = extract_position_at(vertices, prev_left_id); - - bool is_right_turn = prev_up.dot(prev_dir.cross(dir)) <= 0.0f; - // whether the angle between adjacent segments is greater than 45 degrees - bool is_sharp = cos_dir < 0.7071068f; - - bool right_displaced = false; - bool left_displaced = false; - - // displace the vertex (inner with respect to the corner) of the previous segment 2nd enpoint, if possible - if (can_displace) { - if (is_right_turn) { - prev_right_pos -= displacement_vec; - update_position_at(vertices, prev_right_id, prev_right_pos); - right_displaced = true; - } - else { - prev_left_pos -= displacement_vec; - update_position_at(vertices, prev_left_id, prev_left_pos); - left_displaced = true; - } - } - - if (!is_sharp) { - // displace the vertex (outer with respect to the corner) of the previous segment 2nd enpoint, if possible - if (can_displace) { - if (is_right_turn) { - prev_left_pos += displacement_vec; - update_position_at(vertices, prev_left_id, prev_left_pos); - left_displaced = true; - } - else { - prev_right_pos += displacement_vec; - update_position_at(vertices, prev_right_id, prev_right_pos); - right_displaced = true; - } - } - - // vertices 1st endpoint (top and bottom are from previous segment 2nd endpoint) - // vertices position matches that of the previous segment 2nd endpoint, if displaced - store_vertex(vertices, right_displaced ? prev_right_pos : prev_pos + half_width * right, right); - store_vertex(vertices, left_displaced ? prev_left_pos : prev_pos + half_width * left, left); - } - else { - // vertices 1st endpoint (top and bottom are from previous segment 2nd endpoint) - // the inner corner vertex position matches that of the previous segment 2nd endpoint, if displaced - if (is_right_turn) { - store_vertex(vertices, right_displaced ? prev_right_pos : prev_pos + half_width * right, right); - store_vertex(vertices, prev_pos + half_width * left, left); - } - else { - store_vertex(vertices, prev_pos + half_width * right, right); - store_vertex(vertices, left_displaced ? prev_left_pos : prev_pos + half_width * left, left); - } - } - - // vertices 2nd endpoint - store_vertex(vertices, curr_pos + half_height * up, up); - store_vertex(vertices, curr_pos + half_width * right, right); - store_vertex(vertices, curr_pos + half_height * down, down); - store_vertex(vertices, curr_pos + half_width * left, left); - } - - last_path.last = { 0, 0, move_id, curr.position }; - prev_dir = dir; - prev_up = up; - prev_length = length; - }; - auto add_indices_as_solid = [](const GCodeProcessor::MoveVertex& prev, const GCodeProcessor::MoveVertex& curr, TBuffer& buffer, - size_t& buffer_vertices_size, unsigned int ibuffer_id, IndexBuffer& indices, size_t move_id) { - static Vec3f prev_dir; - static Vec3f prev_up; - static float prev_length; - auto store_triangle = [](IndexBuffer& indices, unsigned int i1, unsigned int i2, unsigned int i3) { - indices.push_back(i1); - indices.push_back(i2); - indices.push_back(i3); - }; - auto append_dummy_cap = [store_triangle](IndexBuffer& indices, unsigned int id) { - store_triangle(indices, id, id, id); - store_triangle(indices, id, id, id); - }; - - if (prev.type != curr.type || !buffer.paths.back().matches(curr)) { - buffer.add_path(curr, ibuffer_id, indices.size(), move_id - 1); - buffer.paths.back().first.position = prev.position; - } - - Vec3f dir = (curr.position - prev.position).normalized(); - Vec3f right = (std::abs(std::abs(dir.dot(Vec3f::UnitZ())) - 1.0f) < EPSILON) ? -Vec3f::UnitY() : Vec3f(dir[1], -dir[0], 0.0f).normalized(); - Vec3f up = right.cross(dir); - - Path& last_path = buffer.paths.back(); - - float half_width = 0.5f * last_path.width; - float half_height = 0.5f * last_path.height; - - Vec3f prev_pos = prev.position - half_height * up; - Vec3f curr_pos = curr.position - half_height * up; - - float length = (curr_pos - prev_pos).norm(); - if (last_path.vertices_count() == 1) { - // 1st segment - - // triangles starting cap - store_triangle(indices, buffer_vertices_size + 0, buffer_vertices_size + 2, buffer_vertices_size + 1); - store_triangle(indices, buffer_vertices_size + 0, buffer_vertices_size + 3, buffer_vertices_size + 2); - - // dummy triangles outer corner cap - append_dummy_cap(indices, buffer_vertices_size); - - // triangles sides - store_triangle(indices, buffer_vertices_size + 0, buffer_vertices_size + 1, buffer_vertices_size + 4); - store_triangle(indices, buffer_vertices_size + 1, buffer_vertices_size + 5, buffer_vertices_size + 4); - store_triangle(indices, buffer_vertices_size + 1, buffer_vertices_size + 2, buffer_vertices_size + 5); - store_triangle(indices, buffer_vertices_size + 2, buffer_vertices_size + 6, buffer_vertices_size + 5); - store_triangle(indices, buffer_vertices_size + 2, buffer_vertices_size + 3, buffer_vertices_size + 6); - store_triangle(indices, buffer_vertices_size + 3, buffer_vertices_size + 7, buffer_vertices_size + 6); - store_triangle(indices, buffer_vertices_size + 3, buffer_vertices_size + 0, buffer_vertices_size + 7); - store_triangle(indices, buffer_vertices_size + 0, buffer_vertices_size + 4, buffer_vertices_size + 7); - - // triangles ending cap - store_triangle(indices, buffer_vertices_size + 4, buffer_vertices_size + 6, buffer_vertices_size + 7); - store_triangle(indices, buffer_vertices_size + 4, buffer_vertices_size + 5, buffer_vertices_size + 6); - - buffer_vertices_size += 8; - } - else { - // any other segment - float displacement = 0.0f; - float cos_dir = prev_dir.dot(dir); - if (cos_dir > -0.9998477f) { - // if the angle between adjacent segments is smaller than 179 degrees - Vec3f med_dir = (prev_dir + dir).normalized(); - displacement = half_width * ::tan(::acos(std::clamp(dir.dot(med_dir), -1.0f, 1.0f))); - } - - Vec3f displacement_vec = displacement * prev_dir; - bool can_displace = displacement > 0.0f && displacement < prev_length && displacement < length; - - bool is_right_turn = prev_up.dot(prev_dir.cross(dir)) <= 0.0f; - // whether the angle between adjacent segments is greater than 45 degrees - bool is_sharp = cos_dir < 0.7071068f; - - bool right_displaced = false; - bool left_displaced = false; - - if (!is_sharp) { - if (can_displace) { - if (is_right_turn) - left_displaced = true; - else - right_displaced = true; - } - } - - // triangles starting cap - store_triangle(indices, buffer_vertices_size - 4, buffer_vertices_size - 2, buffer_vertices_size + 0); - store_triangle(indices, buffer_vertices_size - 4, buffer_vertices_size + 1, buffer_vertices_size - 2); - - // triangles outer corner cap - if (is_right_turn) { - if (left_displaced) - // dummy triangles - append_dummy_cap(indices, buffer_vertices_size); - else { - store_triangle(indices, buffer_vertices_size - 4, buffer_vertices_size + 1, buffer_vertices_size - 1); - store_triangle(indices, buffer_vertices_size + 1, buffer_vertices_size - 2, buffer_vertices_size - 1); - } - } - else { - if (right_displaced) - // dummy triangles - append_dummy_cap(indices, buffer_vertices_size); - else { - store_triangle(indices, buffer_vertices_size - 4, buffer_vertices_size - 3, buffer_vertices_size + 0); - store_triangle(indices, buffer_vertices_size - 3, buffer_vertices_size - 2, buffer_vertices_size + 0); - } - } - - // triangles sides - store_triangle(indices, buffer_vertices_size - 4, buffer_vertices_size + 0, buffer_vertices_size + 2); - store_triangle(indices, buffer_vertices_size + 0, buffer_vertices_size + 3, buffer_vertices_size + 2); - store_triangle(indices, buffer_vertices_size + 0, buffer_vertices_size - 2, buffer_vertices_size + 3); - store_triangle(indices, buffer_vertices_size - 2, buffer_vertices_size + 4, buffer_vertices_size + 3); - store_triangle(indices, buffer_vertices_size - 2, buffer_vertices_size + 1, buffer_vertices_size + 4); - store_triangle(indices, buffer_vertices_size + 1, buffer_vertices_size + 5, buffer_vertices_size + 4); - store_triangle(indices, buffer_vertices_size + 1, buffer_vertices_size - 4, buffer_vertices_size + 5); - store_triangle(indices, buffer_vertices_size - 4, buffer_vertices_size + 2, buffer_vertices_size + 5); - - // triangles ending cap - store_triangle(indices, buffer_vertices_size + 2, buffer_vertices_size + 4, buffer_vertices_size + 5); - store_triangle(indices, buffer_vertices_size + 2, buffer_vertices_size + 3, buffer_vertices_size + 4); - - buffer_vertices_size += 6; - } - - last_path.last = { ibuffer_id, indices.size() - 1, move_id, curr.position }; - prev_dir = dir; - prev_up = up; - prev_length = length; - }; - - wxBusyCursor busy; - - // to reduce the peak in memory usage, we split the generation of the vertex and index buffers in two steps. - // the data are deleted as soon as they are sent to the gpu. - std::vector<VertexBuffer> vertices(m_buffers.size()); - std::vector<MultiIndexBuffer> indices(m_buffers.size()); - std::vector<float> options_zs; - - // toolpaths data -> extract vertices from result - for (size_t i = 0; i < m_moves_count; ++i) { - // skip first vertex - if (i == 0) - continue; - - ++progress_count; - if (progress_dialog != nullptr && progress_count % progress_threshold == 0) { - progress_dialog->Update(int(100.0f * float(i) / (2.0f * float(m_moves_count))), - _L("Generating vertex buffer") + ": " + wxNumberFormatter::ToString(100.0 * double(i) / double(m_moves_count), 0, wxNumberFormatter::Style_None) + "%"); - progress_dialog->Fit(); - progress_count = 0; - } - - const GCodeProcessor::MoveVertex& prev = gcode_result.moves[i - 1]; - const GCodeProcessor::MoveVertex& curr = gcode_result.moves[i]; - - unsigned char id = buffer_id(curr.type); - TBuffer& buffer = m_buffers[id]; - VertexBuffer& buffer_vertices = vertices[id]; - - switch (buffer.render_primitive_type) - { - case TBuffer::ERenderPrimitiveType::Point: { - add_vertices_as_point(curr, buffer_vertices); - break; - } - case TBuffer::ERenderPrimitiveType::Line: { - add_vertices_as_line(prev, curr, buffer_vertices); - break; - } - case TBuffer::ERenderPrimitiveType::Triangle: { - add_vertices_as_solid(prev, curr, buffer, buffer_vertices, i); - break; - } - } - - if (curr.type == EMoveType::Pause_Print || curr.type == EMoveType::Custom_GCode) { - const float* const last_z = options_zs.empty() ? nullptr : &options_zs.back(); - if (last_z == nullptr || curr.position[2] < *last_z - EPSILON || *last_z + EPSILON < curr.position[2]) - options_zs.emplace_back(curr.position[2]); - } - } - - // move the wipe toolpaths half height up to render them on proper position - VertexBuffer& wipe_vertices = vertices[buffer_id(EMoveType::Wipe)]; - for (size_t i = 2; i < wipe_vertices.size(); i += 3) { - wipe_vertices[i] += 0.5f * GCodeProcessor::Wipe_Height; - } - - log_memory_usage("Loaded G-code generated vertex buffers, ", vertices, indices); - - // toolpaths data -> send vertices data to gpu - for (size_t i = 0; i < m_buffers.size(); ++i) { - TBuffer& buffer = m_buffers[i]; - - const VertexBuffer& buffer_vertices = vertices[i]; - buffer.vertices.count = buffer_vertices.size() / buffer.vertices.vertex_size_floats(); -#if ENABLE_GCODE_VIEWER_STATISTICS - m_statistics.total_vertices_gpu_size += buffer_vertices.size() * sizeof(float); - m_statistics.max_vbuffer_gpu_size = std::max(m_statistics.max_vbuffer_gpu_size, static_cast<int64_t>(buffer_vertices.size() * sizeof(float))); -#endif // ENABLE_GCODE_VIEWER_STATISTICS - - if (buffer.vertices.count > 0) { -#if ENABLE_GCODE_VIEWER_STATISTICS - ++m_statistics.vbuffers_count; -#endif // ENABLE_GCODE_VIEWER_STATISTICS - glsafe(::glGenBuffers(1, &buffer.vertices.id)); - glsafe(::glBindBuffer(GL_ARRAY_BUFFER, buffer.vertices.id)); - glsafe(::glBufferData(GL_ARRAY_BUFFER, buffer_vertices.size() * sizeof(float), buffer_vertices.data(), GL_STATIC_DRAW)); - glsafe(::glBindBuffer(GL_ARRAY_BUFFER, 0)); - } - } - - // dismiss vertices data, no more needed - std::vector<VertexBuffer>().swap(vertices); - - // toolpaths data -> extract indices from result - // paths may have been filled while extracting vertices, - // so reset them, they will be filled again while extracting indices - for (TBuffer& buffer : m_buffers) { - buffer.paths.clear(); - } - - // max index buffer size - const size_t IBUFFER_THRESHOLD = 1024 * 1024 * 32; - - // variable used to keep track of the current size (in vertices) of the vertex buffer - std::vector<size_t> curr_buffer_vertices_size(m_buffers.size(), 0); - for (size_t i = 0; i < m_moves_count; ++i) { - // skip first vertex - if (i == 0) - continue; - - ++progress_count; - if (progress_dialog != nullptr && progress_count % progress_threshold == 0) { - progress_dialog->Update(int(100.0f * float(m_moves_count + i) / (2.0f * float(m_moves_count))), - _L("Generating index buffers") + ": " + wxNumberFormatter::ToString(100.0 * double(i) / double(m_moves_count), 0, wxNumberFormatter::Style_None) + "%"); - progress_dialog->Fit(); - progress_count = 0; - } - - const GCodeProcessor::MoveVertex& prev = gcode_result.moves[i - 1]; - const GCodeProcessor::MoveVertex& curr = gcode_result.moves[i]; - - unsigned char id = buffer_id(curr.type); - TBuffer& buffer = m_buffers[id]; - MultiIndexBuffer& buffer_indices = indices[id]; - if (buffer_indices.empty()) - buffer_indices.push_back(IndexBuffer()); - - // if adding the indices for the current segment exceeds the threshold size of the current index buffer - // create another index buffer, and move the current path indices into it - if (buffer_indices.back().size() >= IBUFFER_THRESHOLD - static_cast<size_t>(buffer.indices_per_segment())) { - buffer_indices.push_back(IndexBuffer()); - if (buffer.render_primitive_type != TBuffer::ERenderPrimitiveType::Point) { - if (!(prev.type != curr.type || !buffer.paths.back().matches(curr))) { - Path& last_path = buffer.paths.back(); - size_t delta_id = last_path.last.i_id - last_path.first.i_id; - - // move indices of the last path from the previous into the new index buffer - IndexBuffer& src_buffer = buffer_indices[buffer_indices.size() - 2]; - IndexBuffer& dst_buffer = buffer_indices[buffer_indices.size() - 1]; - std::move(src_buffer.begin() + last_path.first.i_id, src_buffer.end(), std::back_inserter(dst_buffer)); - src_buffer.erase(src_buffer.begin() + last_path.first.i_id, src_buffer.end()); - - // updates path indices - last_path.first.b_id = buffer_indices.size() - 1; - last_path.first.i_id = 0; - last_path.last.b_id = buffer_indices.size() - 1; - last_path.last.i_id = delta_id; - } - } - } - - switch (buffer.render_primitive_type) - { - case TBuffer::ERenderPrimitiveType::Point: { - add_indices_as_point(curr, buffer, static_cast<unsigned int>(buffer_indices.size()) - 1, buffer_indices.back(), i); - break; - } - case TBuffer::ERenderPrimitiveType::Line: { - add_indices_as_line(prev, curr, buffer, static_cast<unsigned int>(buffer_indices.size()) - 1, buffer_indices.back(), i); - break; - } - case TBuffer::ERenderPrimitiveType::Triangle: { - add_indices_as_solid(prev, curr, buffer, curr_buffer_vertices_size[id], static_cast<unsigned int>(buffer_indices.size()) - 1, buffer_indices.back(), i); - break; - } - } - } - - if (progress_dialog != nullptr) { - progress_dialog->Update(100, ""); - progress_dialog->Fit(); - } - - log_memory_usage("Loaded G-code generated indices buffers, ", vertices, indices); - - // toolpaths data -> send indices data to gpu - for (size_t i = 0; i < m_buffers.size(); ++i) { - TBuffer& buffer = m_buffers[i]; - - for (size_t j = 0; j < indices[i].size(); ++j) { - const IndexBuffer& buffer_indices = indices[i][j]; - buffer.indices.push_back(IBuffer()); - IBuffer& ibuffer = buffer.indices.back(); - ibuffer.count = buffer_indices.size(); -#if ENABLE_GCODE_VIEWER_STATISTICS - m_statistics.total_indices_gpu_size += ibuffer.count * sizeof(unsigned int); - m_statistics.max_ibuffer_gpu_size = std::max(m_statistics.max_ibuffer_gpu_size, static_cast<int64_t>(ibuffer.count * sizeof(unsigned int))); -#endif // ENABLE_GCODE_VIEWER_STATISTICS - - if (ibuffer.count > 0) { -#if ENABLE_GCODE_VIEWER_STATISTICS - ++m_statistics.ibuffers_count; -#endif // ENABLE_GCODE_VIEWER_STATISTICS - glsafe(::glGenBuffers(1, &ibuffer.id)); - glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, ibuffer.id)); - glsafe(::glBufferData(GL_ELEMENT_ARRAY_BUFFER, buffer_indices.size() * sizeof(unsigned int), buffer_indices.data(), GL_STATIC_DRAW)); - glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0)); - } - } - } - -#if ENABLE_GCODE_VIEWER_STATISTICS - for (const TBuffer& buffer : m_buffers) { - m_statistics.paths_size += SLIC3R_STDVEC_MEMSIZE(buffer.paths, Path); - } - unsigned int travel_buffer_id = buffer_id(EMoveType::Travel); - const MultiIndexBuffer& travel_buffer_indices = indices[travel_buffer_id]; - for (size_t i = 0; i < travel_buffer_indices.size(); ++i) { - m_statistics.travel_segments_count += travel_buffer_indices[i].size() / m_buffers[travel_buffer_id].indices_per_segment(); - } - unsigned int wipe_buffer_id = buffer_id(EMoveType::Wipe); - const MultiIndexBuffer& wipe_buffer_indices = indices[wipe_buffer_id]; - for (size_t i = 0; i < wipe_buffer_indices.size(); ++i) { - m_statistics.wipe_segments_count += wipe_buffer_indices[i].size() / m_buffers[wipe_buffer_id].indices_per_segment(); - } - unsigned int extrude_buffer_id = buffer_id(EMoveType::Extrude); - const MultiIndexBuffer& extrude_buffer_indices = indices[extrude_buffer_id]; - for (size_t i = 0; i < extrude_buffer_indices.size(); ++i) { - m_statistics.extrude_segments_count += extrude_buffer_indices[i].size() / m_buffers[extrude_buffer_id].indices_per_segment(); - } -#endif // ENABLE_GCODE_VIEWER_STATISTICS - - // dismiss indices data, no more needed - std::vector<MultiIndexBuffer>().swap(indices); - - // layers zs / roles / extruder ids / cp color ids -> extract from result - size_t last_travel_s_id = 0; - for (size_t i = 0; i < m_moves_count; ++i) { - const GCodeProcessor::MoveVertex& move = gcode_result.moves[i]; - if (move.type == EMoveType::Extrude) { - // layers zs - const double* const last_z = m_layers.empty() ? nullptr : &m_layers.get_zs().back(); - double z = static_cast<double>(move.position[2]); - if (last_z == nullptr || z < *last_z - EPSILON || *last_z + EPSILON < z) - m_layers.append(z, { last_travel_s_id, i }); - else - m_layers.get_endpoints().back().last = i; - // extruder ids - m_extruder_ids.emplace_back(move.extruder_id); - // roles - if (i > 0) - m_roles.emplace_back(move.extrusion_role); - } - else if (move.type == EMoveType::Travel) { - if (i - last_travel_s_id > 1 && !m_layers.empty()) - m_layers.get_endpoints().back().last = i; - - last_travel_s_id = i; - } - } +#endif // ENABLE_SPIRAL_VASE_LAYERS // set layers z range if (!m_layers.empty()) @@ -3678,24 +2058,12 @@ void GCodeViewer::load_toolpaths(const GCodeProcessor::Result& gcode_result) if (!options_zs.empty()) { TBuffer& extrude_buffer = m_buffers[buffer_id(EMoveType::Extrude)]; for (Path& path : extrude_buffer.paths) { - float z = path.first.position[2]; + const float z = path.sub_paths.front().first.position.z(); if (std::find_if(options_zs.begin(), options_zs.end(), [z](float f) { return f - EPSILON <= z && z <= f + EPSILON; }) != options_zs.end()) path.cp_color_id = 255 - path.cp_color_id; } } - // roles -> remove duplicates - std::sort(m_roles.begin(), m_roles.end()); - m_roles.erase(std::unique(m_roles.begin(), m_roles.end()), m_roles.end()); - m_roles.shrink_to_fit(); - - // extruder ids -> remove duplicates - std::sort(m_extruder_ids.begin(), m_extruder_ids.end()); - m_extruder_ids.erase(std::unique(m_extruder_ids.begin(), m_extruder_ids.end()), m_extruder_ids.end()); - m_extruder_ids.shrink_to_fit(); - - log_memory_usage("Loaded G-code generated extrusion paths, ", vertices, indices); - #if ENABLE_GCODE_VIEWER_STATISTICS m_statistics.load_time = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::high_resolution_clock::now() - start_time).count(); #endif // ENABLE_GCODE_VIEWER_STATISTICS @@ -3703,7 +2071,6 @@ void GCodeViewer::load_toolpaths(const GCodeProcessor::Result& gcode_result) if (progress_dialog != nullptr) progress_dialog->Destroy(); } -#endif // ENABLE_SPLITTED_VERTEX_BUFFER void GCodeViewer::load_shells(const Print& print, bool initialized) { @@ -3721,23 +2088,30 @@ void GCodeViewer::load_shells(const Print& print, bool initialized) instance_ids[i] = i; } + size_t current_volumes_count = m_shells.volumes.volumes.size(); m_shells.volumes.load_object(model_obj, object_id, instance_ids, "object", initialized); + // adjust shells' z if raft is present + const SlicingParameters& slicing_parameters = obj->slicing_parameters(); + if (slicing_parameters.object_print_z_min != 0.0) { + const Vec3d z_offset = slicing_parameters.object_print_z_min * Vec3d::UnitZ(); + for (size_t i = current_volumes_count; i < m_shells.volumes.volumes.size(); ++i) { + GLVolume* v = m_shells.volumes.volumes[i]; + v->set_volume_offset(v->get_volume_offset() + z_offset); + } + } + ++object_id; } if (wxGetApp().preset_bundle->printers.get_edited_preset().printer_technology() == ptFFF) { // adds wipe tower's volume - double max_z = print.objects()[0]->model_object()->get_model()->bounding_box().max(2); + const double max_z = print.objects()[0]->model_object()->get_model()->bounding_box().max(2); const PrintConfig& config = print.config(); - size_t extruders_count = config.nozzle_diameter.size(); - if ((extruders_count > 1) && config.wipe_tower && !config.complete_objects) { - const DynamicPrintConfig& print_config = wxGetApp().preset_bundle->prints.get_edited_preset().config; - double layer_height = print_config.opt_float("layer_height"); - double first_layer_height = print_config.get_abs_value("first_layer_height", layer_height); - double nozzle_diameter = print.config().nozzle_diameter.values[0]; - float depth = print.wipe_tower_data(extruders_count, first_layer_height, nozzle_diameter).depth; - float brim_width = print.wipe_tower_data(extruders_count, first_layer_height, nozzle_diameter).brim_width; + const size_t extruders_count = config.nozzle_diameter.size(); + if (extruders_count > 1 && config.wipe_tower && !config.complete_objects) { + const float depth = print.wipe_tower_data(extruders_count).depth; + const float brim_width = print.wipe_tower_data(extruders_count).brim_width; m_shells.volumes.load_wipe_tower_preview(1000, config.wipe_tower_x, config.wipe_tower_y, config.wipe_tower_width, depth, max_z, config.wipe_tower_rotation_angle, !print.is_step_done(psWipeTower), brim_width, initialized); @@ -3763,512 +2137,6 @@ void GCodeViewer::load_shells(const Print& print, bool initialized) } } -#if ENABLE_SPLITTED_VERTEX_BUFFER -void GCodeViewer::refresh_render_paths(bool keep_sequential_current_first, bool keep_sequential_current_last) const -{ -#if ENABLE_GCODE_VIEWER_STATISTICS - auto start_time = std::chrono::high_resolution_clock::now(); -#endif // ENABLE_GCODE_VIEWER_STATISTICS - - auto extrusion_color = [this](const Path& path) { - Color color; - switch (m_view_type) - { - case EViewType::FeatureType: { color = Extrusion_Role_Colors[static_cast<unsigned int>(path.role)]; break; } - case EViewType::Height: { color = m_extrusions.ranges.height.get_color_at(path.height); break; } - case EViewType::Width: { color = m_extrusions.ranges.width.get_color_at(path.width); break; } - case EViewType::Feedrate: { color = m_extrusions.ranges.feedrate.get_color_at(path.feedrate); break; } - case EViewType::FanSpeed: { color = m_extrusions.ranges.fan_speed.get_color_at(path.fan_speed); break; } - case EViewType::VolumetricRate: { color = m_extrusions.ranges.volumetric_rate.get_color_at(path.volumetric_rate); break; } - case EViewType::Tool: { color = m_tool_colors[path.extruder_id]; break; } - case EViewType::ColorPrint: { - if (path.cp_color_id >= static_cast<unsigned char>(m_tool_colors.size())) { - color = { 0.5f, 0.5f, 0.5f }; -// // complementary color -// color = m_tool_colors[255 - path.cp_color_id]; -// color = { 1.0f - color[0], 1.0f - color[1], 1.0f - color[2] }; - } - else - color = m_tool_colors[path.cp_color_id]; - - break; - } - default: { color = { 1.0f, 1.0f, 1.0f }; break; } - } - - return color; - }; - - auto travel_color = [this](const Path& path) { - return (path.delta_extruder < 0.0f) ? Travel_Colors[2] /* Retract */ : - ((path.delta_extruder > 0.0f) ? Travel_Colors[1] /* Extrude */ : - Travel_Colors[0] /* Move */); - }; - - auto is_in_layers_range = [this](const Path& path, size_t min_id, size_t max_id) { - auto in_layers_range = [this, min_id, max_id](size_t id) { - return m_layers.get_endpoints_at(min_id).first <= id && id <= m_layers.get_endpoints_at(max_id).last; - }; - - return in_layers_range(path.sub_paths.front().first.s_id) || in_layers_range(path.sub_paths.back().last.s_id); - }; - - auto is_travel_in_layers_range = [this](size_t path_id, size_t min_id, size_t max_id) { - const TBuffer& buffer = m_buffers[buffer_id(EMoveType::Travel)]; - if (path_id >= buffer.paths.size()) - return false; - - Path path = buffer.paths[path_id]; - size_t first = path_id; - size_t last = path_id; - - // check adjacent paths - while (first > 0 && path.sub_paths.front().first.position.isApprox(buffer.paths[first - 1].sub_paths.back().last.position)) { - --first; - path.sub_paths.front().first = buffer.paths[first].sub_paths.front().first; - } - while (last < buffer.paths.size() - 1 && path.sub_paths.back().last.position.isApprox(buffer.paths[last + 1].sub_paths.front().first.position)) { - ++last; - path.sub_paths.back().last = buffer.paths[last].sub_paths.back().last; - } - - size_t min_s_id = m_layers.get_endpoints_at(min_id).first; - size_t max_s_id = m_layers.get_endpoints_at(max_id).last; - - return (min_s_id <= path.sub_paths.front().first.s_id && path.sub_paths.front().first.s_id <= max_s_id) || - (min_s_id <= path.sub_paths.back().last.s_id && path.sub_paths.back().last.s_id <= max_s_id); - }; - -#if ENABLE_GCODE_VIEWER_STATISTICS - Statistics* statistics = const_cast<Statistics*>(&m_statistics); - statistics->render_paths_size = 0; -#endif // ENABLE_GCODE_VIEWER_STATISTICS - - bool top_layer_only = get_app_config()->get("seq_top_layer_only") == "1"; - - SequentialView::Endpoints global_endpoints = { m_moves_count , 0 }; - SequentialView::Endpoints top_layer_endpoints = global_endpoints; - SequentialView* sequential_view = const_cast<SequentialView*>(&m_sequential_view); - if (top_layer_only || !keep_sequential_current_first) sequential_view->current.first = 0; - if (!keep_sequential_current_last) sequential_view->current.last = m_moves_count; - - // first pass: collect visible paths and update sequential view data -#if ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS - std::vector<std::tuple<unsigned char, unsigned int, unsigned int, unsigned int>> paths; -#else - std::vector<std::tuple<TBuffer*, unsigned int, unsigned int, unsigned int>> paths; -#endif // ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS - for (size_t b = 0; b < m_buffers.size(); ++b) { - TBuffer& buffer = const_cast<TBuffer&>(m_buffers[b]); - // reset render paths - buffer.render_paths.clear(); - - if (!buffer.visible) - continue; - - for (size_t i = 0; i < buffer.paths.size(); ++i) { - const Path& path = buffer.paths[i]; - if (path.type == EMoveType::Travel) { - if (!is_travel_in_layers_range(i, m_layers_z_range[0], m_layers_z_range[1])) - continue; - } - else if (!is_in_layers_range(path, m_layers_z_range[0], m_layers_z_range[1])) - continue; - - if (path.type == EMoveType::Extrude && !is_visible(path)) - continue; - - // store valid path - for (size_t j = 0; j < path.sub_paths.size(); ++j) { -#if ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS - paths.push_back({ static_cast<unsigned char>(b), path.sub_paths[j].first.b_id, static_cast<unsigned int>(i), static_cast<unsigned int>(j) }); -#else - paths.push_back({ &buffer, path.sub_paths[j].first.b_id, static_cast<unsigned int>(i), static_cast<unsigned int>(j) }); -#endif // ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS - } - - global_endpoints.first = std::min(global_endpoints.first, path.sub_paths.front().first.s_id); - global_endpoints.last = std::max(global_endpoints.last, path.sub_paths.back().last.s_id); - - if (top_layer_only) { - if (path.type == EMoveType::Travel) { - if (is_travel_in_layers_range(i, m_layers_z_range[1], m_layers_z_range[1])) { - top_layer_endpoints.first = std::min(top_layer_endpoints.first, path.sub_paths.front().first.s_id); - top_layer_endpoints.last = std::max(top_layer_endpoints.last, path.sub_paths.back().last.s_id); - } - } - else if (is_in_layers_range(path, m_layers_z_range[1], m_layers_z_range[1])) { - top_layer_endpoints.first = std::min(top_layer_endpoints.first, path.sub_paths.front().first.s_id); - top_layer_endpoints.last = std::max(top_layer_endpoints.last, path.sub_paths.back().last.s_id); - } - } - } - } - - // update current sequential position - sequential_view->current.first = !top_layer_only && keep_sequential_current_first ? std::clamp(sequential_view->current.first, global_endpoints.first, global_endpoints.last) : global_endpoints.first; - sequential_view->current.last = keep_sequential_current_last ? std::clamp(sequential_view->current.last, global_endpoints.first, global_endpoints.last) : global_endpoints.last; - - // get the world position from gpu - bool found = false; - for (const TBuffer& buffer : m_buffers) { - // searches the path containing the current position - for (const Path& path : buffer.paths) { - if (path.contains(m_sequential_view.current.last)) { - int sub_path_id = path.get_id_of_sub_path_containing(m_sequential_view.current.last); - if (sub_path_id != -1) { - const Path::Sub_Path& sub_path = path.sub_paths[sub_path_id]; - unsigned int offset = static_cast<unsigned int>(m_sequential_view.current.last - sub_path.first.s_id); - if (offset > 0) { - if (buffer.render_primitive_type == TBuffer::ERenderPrimitiveType::Line) - offset = 2 * offset - 1; - else if (buffer.render_primitive_type == TBuffer::ERenderPrimitiveType::Triangle) { - unsigned int indices_count = buffer.indices_per_segment(); -#if ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS - offset = indices_count * (offset - 1) + (indices_count - 2); - if (sub_path_id == 0) - offset += 6; // add 2 triangles for starting cap -#else - offset = indices_count * (offset - 1) + (indices_count - 6); -#endif // ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS - } - } - offset += static_cast<unsigned int>(sub_path.first.i_id); - - // gets the vertex index from the index buffer on gpu - const IBuffer& i_buffer = buffer.indices[sub_path.first.b_id]; - unsigned int index = 0; - glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, i_buffer.ibo)); - glsafe(::glGetBufferSubData(GL_ELEMENT_ARRAY_BUFFER, static_cast<GLintptr>(offset * sizeof(IBufferType)), static_cast<GLsizeiptr>(sizeof(IBufferType)), static_cast<void*>(&index))); - glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0)); - - // gets the position from the vertices buffer on gpu - glsafe(::glBindBuffer(GL_ARRAY_BUFFER, i_buffer.vbo)); - glsafe(::glGetBufferSubData(GL_ARRAY_BUFFER, static_cast<GLintptr>(index * buffer.vertices.vertex_size_bytes()), static_cast<GLsizeiptr>(3 * sizeof(float)), static_cast<void*>(sequential_view->current_position.data()))); - glsafe(::glBindBuffer(GL_ARRAY_BUFFER, 0)); - - found = true; - break; - } - } - } - - if (found) - break; - } - - // second pass: filter paths by sequential data and collect them by color - RenderPath* render_path = nullptr; -#if ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS - for (const auto& [tbuffer_id, ibuffer_id, path_id, sub_path_id] : paths) { - TBuffer& buffer = const_cast<TBuffer&>(m_buffers[tbuffer_id]); - const Path& path = buffer.paths[path_id]; -#else - for (const auto& [buffer, ibuffer_id, path_id, sub_path_id] : paths) { - const Path& path = buffer->paths[path_id]; -#endif // ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS - const Path::Sub_Path& sub_path = path.sub_paths[sub_path_id]; - if (m_sequential_view.current.last <= sub_path.first.s_id || sub_path.last.s_id <= m_sequential_view.current.first) - continue; - - Color color; - switch (path.type) - { - case EMoveType::Tool_change: { color = Options_Colors[static_cast<unsigned int>(EOptionsColors::ToolChanges)]; break; } - case EMoveType::Color_change: { color = Options_Colors[static_cast<unsigned int>(EOptionsColors::ColorChanges)]; break; } - case EMoveType::Pause_Print: { color = Options_Colors[static_cast<unsigned int>(EOptionsColors::PausePrints)]; break; } - case EMoveType::Custom_GCode: { color = Options_Colors[static_cast<unsigned int>(EOptionsColors::CustomGCodes)]; break; } - case EMoveType::Retract: { color = Options_Colors[static_cast<unsigned int>(EOptionsColors::Retractions)]; break; } - case EMoveType::Unretract: { color = Options_Colors[static_cast<unsigned int>(EOptionsColors::Unretractions)]; break; } - case EMoveType::Extrude: { - if (!top_layer_only || - m_sequential_view.current.last == global_endpoints.last || - is_in_layers_range(path, m_layers_z_range[1], m_layers_z_range[1])) - color = extrusion_color(path); - else - color = { 0.25f, 0.25f, 0.25f }; - - break; - } - case EMoveType::Travel: { - if (!top_layer_only || m_sequential_view.current.last == global_endpoints.last || is_travel_in_layers_range(path_id, m_layers_z_range[1], m_layers_z_range[1])) - color = (m_view_type == EViewType::Feedrate || m_view_type == EViewType::Tool || m_view_type == EViewType::ColorPrint) ? extrusion_color(path) : travel_color(path); - else - color = { 0.25f, 0.25f, 0.25f }; - - break; - } - case EMoveType::Wipe: { color = Wipe_Color; break; } - default: { color = { 0.0f, 0.0f, 0.0f }; break; } - } - -#if ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS - RenderPath key{ tbuffer_id, color, static_cast<unsigned int>(ibuffer_id), path_id }; - if (render_path == nullptr || !RenderPathPropertyEqual()(*render_path, key)) - render_path = const_cast<RenderPath*>(&(*buffer.render_paths.emplace(key).first)); - - unsigned int delta_1st = 0; - if (sub_path.first.s_id < m_sequential_view.current.first && m_sequential_view.current.first <= sub_path.last.s_id) - delta_1st = static_cast<unsigned int>(m_sequential_view.current.first - sub_path.first.s_id); -#else - RenderPath key{ color, static_cast<unsigned int>(ibuffer_id), path_id }; - if (render_path == nullptr || !RenderPathPropertyEqual()(*render_path, key)) - render_path = const_cast<RenderPath*>(&(*buffer->render_paths.emplace(key).first)); -#endif // ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS - - unsigned int size_in_indices = 0; -#if ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS - switch (buffer.render_primitive_type) -#else - switch (buffer->render_primitive_type) -#endif // ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS - { - case TBuffer::ERenderPrimitiveType::Point: { -#if ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS - size_in_indices = buffer.indices_per_segment(); -#else - size_in_indices = buffer->indices_per_segment(); -#endif // ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS - break; - } - case TBuffer::ERenderPrimitiveType::Line: - case TBuffer::ERenderPrimitiveType::Triangle: { - unsigned int segments_count = std::min(m_sequential_view.current.last, sub_path.last.s_id) - std::max(m_sequential_view.current.first, sub_path.first.s_id); -#if ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS - size_in_indices = buffer.indices_per_segment() * segments_count; -#else - size_in_indices = buffer->indices_per_segment() * segments_count; -#endif // ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS - break; - } - } -======= -#endif // ENABLE_SPIRAL_VASE_LAYERS ->>>>>>> master - -#if ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS - if (size_in_indices == 0) - continue; - -<<<<<<< HEAD - if (buffer.render_primitive_type == TBuffer::ERenderPrimitiveType::Triangle) { - if (sub_path_id == 0 && delta_1st == 0) - size_in_indices += 6; // add 2 triangles for starting cap - if (sub_path_id == path.sub_paths.size() - 1 && path.sub_paths.back().last.s_id <= m_sequential_view.current.last) - size_in_indices += 6; // add 2 triangles for ending cap - if (delta_1st > 0) - size_in_indices -= 6; // remove 2 triangles for corner cap -======= - // change color of paths whose layer contains option points - if (!options_zs.empty()) { - TBuffer& extrude_buffer = m_buffers[buffer_id(EMoveType::Extrude)]; - for (Path& path : extrude_buffer.paths) { - const float z = path.sub_paths.front().first.position.z(); - if (std::find_if(options_zs.begin(), options_zs.end(), [z](float f) { return f - EPSILON <= z && z <= f + EPSILON; }) != options_zs.end()) - path.cp_color_id = 255 - path.cp_color_id; ->>>>>>> master - } -#endif // ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS - -<<<<<<< HEAD - render_path->sizes.push_back(size_in_indices); - -#if !ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS - unsigned int delta_1st = 0; - if (sub_path.first.s_id < m_sequential_view.current.first && m_sequential_view.current.first <= sub_path.last.s_id) - delta_1st = m_sequential_view.current.first - sub_path.first.s_id; -#endif // !ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS - -#if ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS - if (buffer.render_primitive_type == TBuffer::ERenderPrimitiveType::Triangle) { - delta_1st *= buffer.indices_per_segment(); - if (delta_1st > 0) { - delta_1st += 6; // skip 2 triangles for corner cap - if (sub_path_id == 0) - delta_1st += 6; // skip 2 triangles for starting cap - } - } -#else - if (buffer->render_primitive_type == TBuffer::ERenderPrimitiveType::Triangle) - delta_1st *= buffer->indices_per_segment(); -#endif // ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS - - render_path->offsets.push_back(static_cast<size_t>((sub_path.first.i_id + delta_1st) * sizeof(IBufferType))); - -#if 0 - // check sizes and offsets against index buffer size on gpu - GLint buffer_size; - glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, buffer->indices[render_path->ibuffer_id].ibo)); - glsafe(::glGetBufferParameteriv(GL_ELEMENT_ARRAY_BUFFER, GL_BUFFER_SIZE, &buffer_size)); - glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0)); - if (render_path->offsets.back() + render_path->sizes.back() * sizeof(IBufferType) > buffer_size) - BOOST_LOG_TRIVIAL(error) << "GCodeViewer::refresh_render_paths: Invalid render path data"; -#endif - } -======= -#if ENABLE_GCODE_VIEWER_STATISTICS - m_statistics.load_time = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::high_resolution_clock::now() - start_time).count(); -#endif // ENABLE_GCODE_VIEWER_STATISTICS ->>>>>>> master - - // set sequential data to their final value - sequential_view->endpoints = top_layer_only ? top_layer_endpoints : global_endpoints; - sequential_view->current.first = !top_layer_only && keep_sequential_current_first ? std::clamp(sequential_view->current.first, sequential_view->endpoints.first, sequential_view->endpoints.last) : sequential_view->endpoints.first; - -#if ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS - // updates sequential range caps - std::array<SequentialRangeCap, 2>* sequential_range_caps = const_cast<std::array<SequentialRangeCap, 2>*>(&m_sequential_range_caps); - (*sequential_range_caps)[0].reset(); - (*sequential_range_caps)[1].reset(); - - if (m_sequential_view.current.first != m_sequential_view.current.last) { - for (const auto& [tbuffer_id, ibuffer_id, path_id, sub_path_id] : paths) { - TBuffer& buffer = const_cast<TBuffer&>(m_buffers[tbuffer_id]); - if (buffer.render_primitive_type != TBuffer::ERenderPrimitiveType::Triangle) - continue; - - const Path& path = buffer.paths[path_id]; - const Path::Sub_Path& sub_path = path.sub_paths[sub_path_id]; - if (m_sequential_view.current.last <= sub_path.first.s_id || sub_path.last.s_id <= m_sequential_view.current.first) - continue; - - // update cap for first endpoint of current range - if (m_sequential_view.current.first > sub_path.first.s_id) { - SequentialRangeCap& cap = (*sequential_range_caps)[0]; - const IBuffer& i_buffer = buffer.indices[ibuffer_id]; - cap.buffer = &buffer; - cap.vbo = i_buffer.vbo; - - // calculate offset into the index buffer - unsigned int offset = sub_path.first.i_id; - offset += 6; // add 2 triangles for corner cap - offset += static_cast<unsigned int>(m_sequential_view.current.first - sub_path.first.s_id) * buffer.indices_per_segment(); - if (sub_path_id == 0) - offset += 6; // add 2 triangles for starting cap - - // extract indices from index buffer - std::array<IBufferType, 6> indices{ 0, 0, 0, 0, 0, 0 }; - glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, i_buffer.ibo)); - glsafe(::glGetBufferSubData(GL_ELEMENT_ARRAY_BUFFER, static_cast<GLintptr>((offset + 0) * sizeof(IBufferType)), static_cast<GLsizeiptr>(sizeof(IBufferType)), static_cast<void*>(&indices[0]))); - glsafe(::glGetBufferSubData(GL_ELEMENT_ARRAY_BUFFER, static_cast<GLintptr>((offset + 7) * sizeof(IBufferType)), static_cast<GLsizeiptr>(sizeof(IBufferType)), static_cast<void*>(&indices[1]))); - glsafe(::glGetBufferSubData(GL_ELEMENT_ARRAY_BUFFER, static_cast<GLintptr>((offset + 1) * sizeof(IBufferType)), static_cast<GLsizeiptr>(sizeof(IBufferType)), static_cast<void*>(&indices[2]))); - glsafe(::glGetBufferSubData(GL_ELEMENT_ARRAY_BUFFER, static_cast<GLintptr>((offset + 13) * sizeof(IBufferType)), static_cast<GLsizeiptr>(sizeof(IBufferType)), static_cast<void*>(&indices[4]))); - glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0)); - indices[3] = indices[0]; - indices[5] = indices[1]; - - // send indices to gpu - glsafe(::glGenBuffers(1, &cap.ibo)); - glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, cap.ibo)); - glsafe(::glBufferData(GL_ELEMENT_ARRAY_BUFFER, indices.size() * sizeof(IBufferType), indices.data(), GL_STATIC_DRAW)); - glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0)); - -<<<<<<< HEAD - // extract color from render path - size_t offset_bytes = offset * sizeof(IBufferType); - for (const RenderPath& render_path : buffer.render_paths) { - if (render_path.ibuffer_id == ibuffer_id) { - for (size_t j = 0; j < render_path.offsets.size(); ++j) { - if (render_path.contains(offset_bytes)) { - cap.color = render_path.color; - break; - } - } - } - } - } - - // update cap for last endpoint of current range - if (m_sequential_view.current.last < sub_path.last.s_id) { - SequentialRangeCap& cap = (*sequential_range_caps)[1]; - const IBuffer& i_buffer = buffer.indices[ibuffer_id]; - cap.buffer = &buffer; - cap.vbo = i_buffer.vbo; - - // calculate offset into the index buffer - unsigned int offset = sub_path.first.i_id; - offset += 6; // add 2 triangles for corner cap - offset += static_cast<unsigned int>(m_sequential_view.current.last - 1 - sub_path.first.s_id) * buffer.indices_per_segment(); - if (sub_path_id == 0) - offset += 6; // add 2 triangles for starting cap - - // extract indices from index buffer - std::array<IBufferType, 6> indices{ 0, 0, 0, 0, 0, 0 }; - glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, i_buffer.ibo)); - glsafe(::glGetBufferSubData(GL_ELEMENT_ARRAY_BUFFER, static_cast<GLintptr>((offset + 2) * sizeof(IBufferType)), static_cast<GLsizeiptr>(sizeof(IBufferType)), static_cast<void*>(&indices[0]))); - glsafe(::glGetBufferSubData(GL_ELEMENT_ARRAY_BUFFER, static_cast<GLintptr>((offset + 4) * sizeof(IBufferType)), static_cast<GLsizeiptr>(sizeof(IBufferType)), static_cast<void*>(&indices[1]))); - glsafe(::glGetBufferSubData(GL_ELEMENT_ARRAY_BUFFER, static_cast<GLintptr>((offset + 10) * sizeof(IBufferType)), static_cast<GLsizeiptr>(sizeof(IBufferType)), static_cast<void*>(&indices[2]))); - glsafe(::glGetBufferSubData(GL_ELEMENT_ARRAY_BUFFER, static_cast<GLintptr>((offset + 16) * sizeof(IBufferType)), static_cast<GLsizeiptr>(sizeof(IBufferType)), static_cast<void*>(&indices[5]))); - glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0)); - indices[3] = indices[0]; - indices[4] = indices[2]; - - // send indices to gpu - glsafe(::glGenBuffers(1, &cap.ibo)); - glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, cap.ibo)); - glsafe(::glBufferData(GL_ELEMENT_ARRAY_BUFFER, 6 * sizeof(IBufferType), indices.data(), GL_STATIC_DRAW)); - glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0)); -======= - size_t current_volumes_count = m_shells.volumes.volumes.size(); - m_shells.volumes.load_object(model_obj, object_id, instance_ids, "object", initialized); - - // adjust shells' z if raft is present - const SlicingParameters& slicing_parameters = obj->slicing_parameters(); - if (slicing_parameters.object_print_z_min != 0.0) { - const Vec3d z_offset = slicing_parameters.object_print_z_min * Vec3d::UnitZ(); - for (size_t i = current_volumes_count; i < m_shells.volumes.volumes.size(); ++i) { - GLVolume* v = m_shells.volumes.volumes[i]; - v->set_volume_offset(v->get_volume_offset() + z_offset); - } - } - - ++object_id; - } - - if (wxGetApp().preset_bundle->printers.get_edited_preset().printer_technology() == ptFFF) { - // adds wipe tower's volume - const double max_z = print.objects()[0]->model_object()->get_model()->bounding_box().max(2); - const PrintConfig& config = print.config(); - const size_t extruders_count = config.nozzle_diameter.size(); - if (extruders_count > 1 && config.wipe_tower && !config.complete_objects) { - const float depth = print.wipe_tower_data(extruders_count).depth; - const float brim_width = print.wipe_tower_data(extruders_count).brim_width; ->>>>>>> master - - // extract color from render path - size_t offset_bytes = offset * sizeof(IBufferType); - for (const RenderPath& render_path : buffer.render_paths) { - if (render_path.ibuffer_id == ibuffer_id) { - for (size_t j = 0; j < render_path.offsets.size(); ++j) { - if (render_path.contains(offset_bytes)) { - cap.color = render_path.color; - break; - } - } - } - } - } - - if ((*sequential_range_caps)[0].is_renderable() && (*sequential_range_caps)[1].is_renderable()) - break; - } - } -#endif // ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS - - wxGetApp().plater()->enable_preview_moves_slider(!paths.empty()); - -#if ENABLE_GCODE_VIEWER_STATISTICS - for (const TBuffer& buffer : m_buffers) { - statistics->render_paths_size += SLIC3R_STDUNORDEREDSET_MEMSIZE(buffer.render_paths, RenderPath); - for (const RenderPath& path : buffer.render_paths) { - statistics->render_paths_size += SLIC3R_STDVEC_MEMSIZE(path.sizes, unsigned int); - statistics->render_paths_size += SLIC3R_STDVEC_MEMSIZE(path.offsets, size_t); - } - } - statistics->refresh_paths_time = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::high_resolution_clock::now() - start_time).count(); -#endif // ENABLE_GCODE_VIEWER_STATISTICS -} -#else void GCodeViewer::refresh_render_paths(bool keep_sequential_current_first, bool keep_sequential_current_last) const { #if ENABLE_GCODE_VIEWER_STATISTICS @@ -4344,10 +2212,7 @@ void GCodeViewer::refresh_render_paths(bool keep_sequential_current_first, bool #if ENABLE_GCODE_VIEWER_STATISTICS Statistics* statistics = const_cast<Statistics*>(&m_statistics); statistics->render_paths_size = 0; -<<<<<<< HEAD -======= statistics->models_instances_size = 0; ->>>>>>> master #endif // ENABLE_GCODE_VIEWER_STATISTICS const bool top_layer_only = get_app_config()->get("seq_top_layer_only") == "1"; @@ -4359,11 +2224,7 @@ void GCodeViewer::refresh_render_paths(bool keep_sequential_current_first, bool if (!keep_sequential_current_last) sequential_view->current.last = m_moves_count; // first pass: collect visible paths and update sequential view data -<<<<<<< HEAD - std::vector<std::tuple<TBuffer*, unsigned int, unsigned int>> paths; -======= std::vector<std::tuple<unsigned char, unsigned int, unsigned int, unsigned int>> paths; ->>>>>>> master for (size_t b = 0; b < m_buffers.size(); ++b) { TBuffer& buffer = const_cast<TBuffer&>(m_buffers[b]); // reset render paths @@ -4485,23 +2346,6 @@ void GCodeViewer::refresh_render_paths(bool keep_sequential_current_first, bool break; } } -<<<<<<< HEAD - offset += static_cast<unsigned int>(path.first.i_id); - - // gets the index from the index buffer on gpu - unsigned int index = 0; - glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, buffer.indices[path.first.b_id].id)); - glsafe(::glGetBufferSubData(GL_ELEMENT_ARRAY_BUFFER, static_cast<GLintptr>(offset * sizeof(unsigned int)), static_cast<GLsizeiptr>(sizeof(unsigned int)), static_cast<void*>(&index))); - glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0)); - - // gets the position from the vertices buffer on gpu - glsafe(::glBindBuffer(GL_ARRAY_BUFFER, buffer.vertices.id)); - glsafe(::glGetBufferSubData(GL_ARRAY_BUFFER, static_cast<GLintptr>(index * buffer.vertices.vertex_size_bytes()), static_cast<GLsizeiptr>(3 * sizeof(float)), static_cast<void*>(sequential_view->current_position.data()))); - glsafe(::glBindBuffer(GL_ARRAY_BUFFER, 0)); - found = true; - break; -======= ->>>>>>> master } } @@ -4510,19 +2354,12 @@ void GCodeViewer::refresh_render_paths(bool keep_sequential_current_first, bool } // second pass: filter paths by sequential data and collect them by color -<<<<<<< HEAD - RenderPath *render_path = nullptr; - for (const auto& [buffer, ibuffer_id, path_id] : paths) { - const Path& path = buffer->paths[path_id]; - if (m_sequential_view.current.last <= path.first.s_id || path.last.s_id <= m_sequential_view.current.first) -======= RenderPath* render_path = nullptr; for (const auto& [tbuffer_id, ibuffer_id, path_id, sub_path_id] : paths) { TBuffer& buffer = const_cast<TBuffer&>(m_buffers[tbuffer_id]); const Path& path = buffer.paths[path_id]; const Path::Sub_Path& sub_path = path.sub_paths[sub_path_id]; if (m_sequential_view.current.last < sub_path.first.s_id || sub_path.last.s_id < m_sequential_view.current.first) ->>>>>>> master continue; Color color; @@ -4717,26 +2554,11 @@ void GCodeViewer::refresh_render_paths(bool keep_sequential_current_first, bool indices[3] = indices[0]; indices[5] = indices[1]; -<<<<<<< HEAD - RenderPath key{ color, static_cast<unsigned int>(ibuffer_id), path_id }; - if (render_path == nullptr || ! RenderPathPropertyEqual()(*render_path, key)) - render_path = const_cast<RenderPath*>(&(*buffer->render_paths.emplace(key).first)); - unsigned int segments_count = std::min(m_sequential_view.current.last, path.last.s_id) - std::max(m_sequential_view.current.first, path.first.s_id) + 1; - unsigned int size_in_indices = 0; - switch (buffer->render_primitive_type) - { - case TBuffer::ERenderPrimitiveType::Point: { size_in_indices = segments_count; break; } - case TBuffer::ERenderPrimitiveType::Line: - case TBuffer::ERenderPrimitiveType::Triangle: { size_in_indices = buffer->indices_per_segment() * (segments_count - 1); break; } - } - render_path->sizes.push_back(size_in_indices); -======= // send indices to gpu glsafe(::glGenBuffers(1, &cap.ibo)); glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, cap.ibo)); glsafe(::glBufferData(GL_ELEMENT_ARRAY_BUFFER, indices.size() * sizeof(IBufferType), indices.data(), GL_STATIC_DRAW)); glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0)); ->>>>>>> master // extract color from render path size_t offset_bytes = offset * sizeof(IBufferType); @@ -4783,11 +2605,6 @@ void GCodeViewer::refresh_render_paths(bool keep_sequential_current_first, bool glsafe(::glBufferData(GL_ELEMENT_ARRAY_BUFFER, 6 * sizeof(IBufferType), indices.data(), GL_STATIC_DRAW)); glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0)); -<<<<<<< HEAD - // set sequential data to their final value - sequential_view->endpoints = top_layer_only ? top_layer_endpoints : global_endpoints; - sequential_view->current.first = !top_layer_only && keep_sequential_current_first ? std::clamp(sequential_view->current.first, sequential_view->endpoints.first, sequential_view->endpoints.last) : sequential_view->endpoints.first; -======= // extract color from render path size_t offset_bytes = offset * sizeof(IBufferType); for (const RenderPath& render_path : buffer.render_paths) { @@ -4806,7 +2623,6 @@ void GCodeViewer::refresh_render_paths(bool keep_sequential_current_first, bool break; } } ->>>>>>> master wxGetApp().plater()->enable_preview_moves_slider(!paths.empty()); @@ -4824,191 +2640,8 @@ void GCodeViewer::refresh_render_paths(bool keep_sequential_current_first, bool statistics->refresh_paths_time = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::high_resolution_clock::now() - start_time).count(); #endif // ENABLE_GCODE_VIEWER_STATISTICS } -#endif // ENABLE_SPLITTED_VERTEX_BUFFER - -#if ENABLE_SPLITTED_VERTEX_BUFFER -void GCodeViewer::render_toolpaths() const -{ -#if ENABLE_FIXED_SCREEN_SIZE_POINT_MARKERS - float point_size = 20.0f; -#else - float point_size = 0.8f; -#endif // ENABLE_FIXED_SCREEN_SIZE_POINT_MARKERS - std::array<float, 4> light_intensity = { 0.25f, 0.70f, 0.75f, 0.75f }; - const Camera& camera = wxGetApp().plater()->get_camera(); - double zoom = camera.get_zoom(); - const std::array<int, 4>& viewport = camera.get_viewport(); - float near_plane_height = camera.get_type() == Camera::Perspective ? static_cast<float>(viewport[3]) / (2.0f * static_cast<float>(2.0 * std::tan(0.5 * Geometry::deg2rad(camera.get_fov())))) : - static_cast<float>(viewport[3]) * 0.0005; - - auto set_uniform_color = [](const std::array<float, 3>& color, GLShaderProgram& shader) { - std::array<float, 4> color4 = { color[0], color[1], color[2], 1.0f }; - shader.set_uniform("uniform_color", color4); - }; - - auto render_as_points = [this, zoom, point_size, near_plane_height, set_uniform_color] - (const TBuffer& buffer, unsigned int ibuffer_id, GLShaderProgram& shader) { -#if ENABLE_FIXED_SCREEN_SIZE_POINT_MARKERS - shader.set_uniform("use_fixed_screen_size", 1); -#else - shader.set_uniform("use_fixed_screen_size", 0); -#endif // ENABLE_FIXED_SCREEN_SIZE_POINT_MARKERS - shader.set_uniform("zoom", zoom); - shader.set_uniform("percent_outline_radius", 0.0f); - shader.set_uniform("percent_center_radius", 0.33f); - shader.set_uniform("point_size", point_size); - shader.set_uniform("near_plane_height", near_plane_height); - - glsafe(::glEnable(GL_VERTEX_PROGRAM_POINT_SIZE)); - glsafe(::glEnable(GL_POINT_SPRITE)); - - for (const RenderPath& path : buffer.render_paths) { - if (path.ibuffer_id == ibuffer_id) { - set_uniform_color(path.color, shader); - glsafe(::glMultiDrawElements(GL_POINTS, (const GLsizei*)path.sizes.data(), GL_UNSIGNED_SHORT, (const void* const*)path.offsets.data(), (GLsizei)path.sizes.size())); -#if ENABLE_GCODE_VIEWER_STATISTICS - ++const_cast<Statistics*>(&m_statistics)->gl_multi_points_calls_count; -#endif // ENABLE_GCODE_VIEWER_STATISTICS - } - } - - glsafe(::glDisable(GL_POINT_SPRITE)); - glsafe(::glDisable(GL_VERTEX_PROGRAM_POINT_SIZE)); - }; - auto render_as_lines = [this, light_intensity, set_uniform_color](const TBuffer& buffer, unsigned int ibuffer_id, GLShaderProgram& shader) { - shader.set_uniform("light_intensity", light_intensity); - for (const RenderPath& path : buffer.render_paths) { - if (path.ibuffer_id == ibuffer_id) { - set_uniform_color(path.color, shader); - glsafe(::glMultiDrawElements(GL_LINES, (const GLsizei*)path.sizes.data(), GL_UNSIGNED_SHORT, (const void* const*)path.offsets.data(), (GLsizei)path.sizes.size())); -#if ENABLE_GCODE_VIEWER_STATISTICS - ++const_cast<Statistics*>(&m_statistics)->gl_multi_lines_calls_count; -#endif // ENABLE_GCODE_VIEWER_STATISTICS - } - } - }; - - auto render_as_triangles = [this, set_uniform_color](const TBuffer& buffer, unsigned int ibuffer_id, GLShaderProgram& shader) { - for (const RenderPath& path : buffer.render_paths) { - if (path.ibuffer_id == ibuffer_id) { - set_uniform_color(path.color, shader); - glsafe(::glMultiDrawElements(GL_TRIANGLES, (const GLsizei*)path.sizes.data(), GL_UNSIGNED_SHORT, (const void* const*)path.offsets.data(), (GLsizei)path.sizes.size())); -#if ENABLE_GCODE_VIEWER_STATISTICS - ++const_cast<Statistics*>(&m_statistics)->gl_multi_triangles_calls_count; -#endif // ENABLE_GCODE_VIEWER_STATISTICS - } - } - }; - - auto line_width = [](double zoom) { - return (zoom < 5.0) ? 1.0 : (1.0 + 5.0 * (zoom - 5.0) / (100.0 - 5.0)); - }; - - glsafe(::glLineWidth(static_cast<GLfloat>(line_width(zoom)))); - - unsigned char begin_id = buffer_id(EMoveType::Retract); - unsigned char end_id = buffer_id(EMoveType::Count); - - for (unsigned char i = begin_id; i < end_id; ++i) { - const TBuffer& buffer = m_buffers[i]; - if (!buffer.visible || !buffer.has_data()) - continue; - - GLShaderProgram* shader = wxGetApp().get_shader(buffer.shader.c_str()); - if (shader != nullptr) { - shader->start_using(); - - for (size_t j = 0; j < buffer.indices.size(); ++j) { - const IBuffer& i_buffer = buffer.indices[j]; - - glsafe(::glBindBuffer(GL_ARRAY_BUFFER, i_buffer.vbo)); - glsafe(::glVertexPointer(buffer.vertices.position_size_floats(), GL_FLOAT, buffer.vertices.vertex_size_bytes(), (const void*)buffer.vertices.position_offset_size())); - glsafe(::glEnableClientState(GL_VERTEX_ARRAY)); - bool has_normals = buffer.vertices.normal_size_floats() > 0; - if (has_normals) { - glsafe(::glNormalPointer(GL_FLOAT, buffer.vertices.vertex_size_bytes(), (const void*)buffer.vertices.normal_offset_size())); - glsafe(::glEnableClientState(GL_NORMAL_ARRAY)); - } - - glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, i_buffer.ibo)); - - switch (buffer.render_primitive_type) - { - case TBuffer::ERenderPrimitiveType::Point: { - render_as_points(buffer, static_cast<unsigned int>(j), *shader); - break; - } - case TBuffer::ERenderPrimitiveType::Line: { - render_as_lines(buffer, static_cast<unsigned int>(j), *shader); - break; - } - case TBuffer::ERenderPrimitiveType::Triangle: { - render_as_triangles(buffer, static_cast<unsigned int>(j), *shader); - break; - } - } - - glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0)); - - if (has_normals) - glsafe(::glDisableClientState(GL_NORMAL_ARRAY)); - - glsafe(::glDisableClientState(GL_VERTEX_ARRAY)); - glsafe(::glBindBuffer(GL_ARRAY_BUFFER, 0)); - } - - shader->stop_using(); - } - } - -#if ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS - auto render_sequential_range_cap = [this, set_uniform_color](const SequentialRangeCap& cap) { - GLShaderProgram* shader = wxGetApp().get_shader(cap.buffer->shader.c_str()); - if (shader != nullptr) { - shader->start_using(); - - glsafe(::glBindBuffer(GL_ARRAY_BUFFER, cap.vbo)); - glsafe(::glVertexPointer(cap.buffer->vertices.position_size_floats(), GL_FLOAT, cap.buffer->vertices.vertex_size_bytes(), (const void*)cap.buffer->vertices.position_offset_size())); - glsafe(::glEnableClientState(GL_VERTEX_ARRAY)); - bool has_normals = cap.buffer->vertices.normal_size_floats() > 0; - if (has_normals) { - glsafe(::glNormalPointer(GL_FLOAT, cap.buffer->vertices.vertex_size_bytes(), (const void*)cap.buffer->vertices.normal_offset_size())); - glsafe(::glEnableClientState(GL_NORMAL_ARRAY)); - } - -<<<<<<< HEAD - set_uniform_color(cap.color, *shader); - - glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, cap.ibo)); - glsafe(::glDrawElements(GL_TRIANGLES, (GLsizei)cap.indices_count(), GL_UNSIGNED_SHORT, nullptr)); - glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0)); - -#if ENABLE_GCODE_VIEWER_STATISTICS - ++const_cast<Statistics*>(&m_statistics)->gl_triangles_calls_count; -#endif // ENABLE_GCODE_VIEWER_STATISTICS - - if (has_normals) - glsafe(::glDisableClientState(GL_NORMAL_ARRAY)); - - glsafe(::glDisableClientState(GL_VERTEX_ARRAY)); - glsafe(::glBindBuffer(GL_ARRAY_BUFFER, 0)); - - shader->stop_using(); - } - }; - - for (unsigned int i = 0; i < 2; ++i) { - if (m_sequential_range_caps[i].is_renderable()) - render_sequential_range_cap(m_sequential_range_caps[i]); - } -#endif // ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS -} -#else -void GCodeViewer::render_toolpaths() const -======= void GCodeViewer::render_toolpaths() ->>>>>>> master { #if ENABLE_FIXED_SCREEN_SIZE_POINT_MARKERS float point_size = 20.0f; @@ -5022,18 +2655,7 @@ void GCodeViewer::render_toolpaths() float near_plane_height = camera.get_type() == Camera::EType::Perspective ? static_cast<float>(viewport[3]) / (2.0f * static_cast<float>(2.0 * std::tan(0.5 * Geometry::deg2rad(camera.get_fov())))) : static_cast<float>(viewport[3]) * 0.0005; -<<<<<<< HEAD - auto set_uniform_color = [](const std::array<float, 3>& color, GLShaderProgram& shader) { - std::array<float, 4> color4 = { color[0], color[1], color[2], 1.0f }; - shader.set_uniform("uniform_color", color4); - }; - - auto render_as_points = [this, zoom, point_size, near_plane_height, set_uniform_color] - (const TBuffer& buffer, unsigned int ibuffer_id, EOptionsColors color_id, GLShaderProgram& shader) { - set_uniform_color(Options_Colors[static_cast<unsigned int>(color_id)], shader); -======= auto shader_init_as_points = [zoom, point_size, near_plane_height](GLShaderProgram& shader) { ->>>>>>> master #if ENABLE_FIXED_SCREEN_SIZE_POINT_MARKERS shader.set_uniform("use_fixed_screen_size", 1); #else @@ -5054,13 +2676,6 @@ void GCodeViewer::render_toolpaths() glsafe(::glEnable(GL_VERTEX_PROGRAM_POINT_SIZE)); glsafe(::glEnable(GL_POINT_SPRITE)); -<<<<<<< HEAD - for (const RenderPath& path : buffer.render_paths) { - if (path.ibuffer_id == ibuffer_id) { - glsafe(::glMultiDrawElements(GL_POINTS, (const GLsizei*)path.sizes.data(), GL_UNSIGNED_INT, (const void* const*)path.offsets.data(), (GLsizei)path.sizes.size())); -#if ENABLE_GCODE_VIEWER_STATISTICS - ++const_cast<Statistics*>(&m_statistics)->gl_multi_points_calls_count; -======= for (auto it = it_path; it != it_end && it_path->ibuffer_id == it->ibuffer_id; ++it) { const RenderPath& path = *it; // Some OpenGL drivers crash on empty glMultiDrawElements, see GH #7415. @@ -5070,7 +2685,6 @@ void GCodeViewer::render_toolpaths() glsafe(::glMultiDrawElements(GL_POINTS, (const GLsizei*)path.sizes.data(), GL_UNSIGNED_SHORT, (const void* const*)path.offsets.data(), (GLsizei)path.sizes.size())); #if ENABLE_GCODE_VIEWER_STATISTICS ++m_statistics.gl_multi_points_calls_count; ->>>>>>> master #endif // ENABLE_GCODE_VIEWER_STATISTICS } @@ -5078,16 +2692,6 @@ void GCodeViewer::render_toolpaths() glsafe(::glDisable(GL_VERTEX_PROGRAM_POINT_SIZE)); }; -<<<<<<< HEAD - auto render_as_lines = [this, light_intensity, set_uniform_color](const TBuffer& buffer, unsigned int ibuffer_id, GLShaderProgram& shader) { - shader.set_uniform("light_intensity", light_intensity); - for (const RenderPath& path : buffer.render_paths) { - if (path.ibuffer_id == ibuffer_id) { - set_uniform_color(path.color, shader); - glsafe(::glMultiDrawElements(GL_LINES, (const GLsizei*)path.sizes.data(), GL_UNSIGNED_INT, (const void* const*)path.offsets.data(), (GLsizei)path.sizes.size())); -#if ENABLE_GCODE_VIEWER_STATISTICS - ++const_cast<Statistics*>(&m_statistics)->gl_multi_lines_calls_count; -======= auto shader_init_as_lines = [light_intensity](GLShaderProgram &shader) { shader.set_uniform("light_intensity", light_intensity); }; @@ -5146,21 +2750,11 @@ void GCodeViewer::render_toolpaths() #if ENABLE_GCODE_VIEWER_STATISTICS ++m_statistics.gl_instanced_models_calls_count; m_statistics.total_instances_gpu_size += static_cast<int64_t>(range.count * buffer.model.instances.instance_size_bytes()); ->>>>>>> master #endif // ENABLE_GCODE_VIEWER_STATISTICS } } }; -<<<<<<< HEAD - auto render_as_triangles = [this, set_uniform_color](const TBuffer& buffer, unsigned int ibuffer_id, GLShaderProgram& shader) { - for (const RenderPath& path : buffer.render_paths) { - if (path.ibuffer_id == ibuffer_id) { - set_uniform_color(path.color, shader); - glsafe(::glMultiDrawElements(GL_TRIANGLES, (const GLsizei*)path.sizes.data(), GL_UNSIGNED_INT, (const void* const*)path.offsets.data(), (GLsizei)path.sizes.size())); -#if ENABLE_GCODE_VIEWER_STATISTICS - ++const_cast<Statistics*>(&m_statistics)->gl_multi_triangles_calls_count; -======= #if ENABLE_GCODE_VIEWER_STATISTICS auto render_as_batched_model = [this](TBuffer& buffer, GLShaderProgram& shader) { #else @@ -5202,7 +2796,6 @@ void GCodeViewer::render_toolpaths() glsafe(::glDrawElements(GL_TRIANGLES, (GLsizei)count, GL_UNSIGNED_SHORT, (const void*)offset_bytes)); #if ENABLE_GCODE_VIEWER_STATISTICS ++m_statistics.gl_batched_models_calls_count; ->>>>>>> master #endif // ENABLE_GCODE_VIEWER_STATISTICS } } @@ -5271,22 +2864,6 @@ void GCodeViewer::render_toolpaths() glsafe(::glEnableClientState(GL_NORMAL_ARRAY)); } -<<<<<<< HEAD - switch (buffer.render_primitive_type) - { - case TBuffer::ERenderPrimitiveType::Point: - { - EOptionsColors color = EOptionsColors(0); - switch (buffer_type(i)) - { - case EMoveType::Tool_change: { color = EOptionsColors::ToolChanges; break; } - case EMoveType::Color_change: { color = EOptionsColors::ColorChanges; break; } - case EMoveType::Pause_Print: { color = EOptionsColors::PausePrints; break; } - case EMoveType::Custom_GCode: { color = EOptionsColors::CustomGCodes; break; } - case EMoveType::Retract: { color = EOptionsColors::Retractions; break; } - case EMoveType::Unretract: { color = EOptionsColors::Unretractions; break; } - default: { assert(false); break; } -======= glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, i_buffer.ibo)); // Render all elements with it_path->ibuffer_id == ibuffer_id, possible with varying colors. @@ -5295,7 +2872,6 @@ void GCodeViewer::render_toolpaths() case TBuffer::ERenderPrimitiveType::Point: { render_as_points(it_path, buffer.render_paths.end(), *shader, uniform_color); break; ->>>>>>> master } case TBuffer::ERenderPrimitiveType::Line: { glsafe(::glLineWidth(static_cast<GLfloat>(line_width(zoom)))); @@ -5367,7 +2943,6 @@ void GCodeViewer::render_toolpaths() render_sequential_range_cap(m_sequential_range_caps[i]); } } -#endif // ENABLE_SPLITTED_VERTEX_BUFFER void GCodeViewer::render_shells() { @@ -5746,14 +3321,8 @@ void GCodeViewer::render_legend(float& legend_height) continue; const bool visible = is_visible(role); append_item(EItemType::Rect, Extrusion_Role_Colors[static_cast<unsigned int>(role)], labels[i], -<<<<<<< HEAD - visible, times[i], percents[i], max_percent, offsets, [this, role, visible]() { - Extrusions* extrusions = const_cast<Extrusions*>(&m_extrusions); - extrusions->role_visibility_flags = visible ? extrusions->role_visibility_flags & ~(1 << role) : extrusions->role_visibility_flags | (1 << role); -======= visible, times[i], percents[i], max_percent, offsets, used_filaments_m[i], used_filaments_g[i], [this, role, visible]() { m_extrusions.role_visibility_flags = visible ? m_extrusions.role_visibility_flags & ~(1 << role) : m_extrusions.role_visibility_flags | (1 << role); ->>>>>>> master // update buffers' render paths refresh_render_paths(false, false); wxGetApp().plater()->update_preview_moves_slider(); @@ -6192,9 +3761,6 @@ void GCodeViewer::render_legend(float& legend_height) default: { assert(false); break; } } } -<<<<<<< HEAD - default : { assert(false); break; } -======= imgui.title(time_title + ":"); @@ -6211,7 +3777,6 @@ void GCodeViewer::render_legend(float& legend_height) imgui.text(first_str + ":"); ImGui::SameLine(max_len); imgui.text(short_time(get_time_dhms(time_mode.layers_times.front()))); ->>>>>>> master } imgui.text(total_str + ":"); @@ -6221,14 +3786,8 @@ void GCodeViewer::render_legend(float& legend_height) auto show_mode_button = [this, &imgui, can_show_mode_button](const wxString& label, PrintEstimatedStatistics::ETimeMode mode) { if (can_show_mode_button(mode)) { if (imgui.button(label)) { -<<<<<<< HEAD - *const_cast<PrintEstimatedTimeStatistics::ETimeMode*>(&m_time_estimate_mode) = mode; - wxGetApp().plater()->get_current_canvas3D()->set_as_dirty(); - wxGetApp().plater()->get_current_canvas3D()->request_extra_frame(); -======= m_time_estimate_mode = mode; imgui.set_requires_extra_frame(); ->>>>>>> master } } }; @@ -6315,16 +3874,10 @@ void GCodeViewer::render_statistics() add_counter(std::string("Multi GL_POINTS:"), m_statistics.gl_multi_points_calls_count); add_counter(std::string("Multi GL_LINES:"), m_statistics.gl_multi_lines_calls_count); add_counter(std::string("Multi GL_TRIANGLES:"), m_statistics.gl_multi_triangles_calls_count); -<<<<<<< HEAD -#if ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS - add_counter(std::string("GL_TRIANGLES:"), m_statistics.gl_triangles_calls_count); -#endif // ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS -======= add_counter(std::string("GL_TRIANGLES:"), m_statistics.gl_triangles_calls_count); ImGui::Separator(); add_counter(std::string("Instanced models:"), m_statistics.gl_instanced_models_calls_count); add_counter(std::string("Batched models:"), m_statistics.gl_batched_models_calls_count); ->>>>>>> master } if (ImGui::CollapsingHeader("CPU memory")) { @@ -6333,10 +3886,7 @@ void GCodeViewer::render_statistics() ImGui::Separator(); add_memory(std::string("Paths:"), m_statistics.paths_size); add_memory(std::string("Render paths:"), m_statistics.render_paths_size); -<<<<<<< HEAD -======= add_memory(std::string("Models instances:"), m_statistics.models_instances_size); ->>>>>>> master } if (ImGui::CollapsingHeader("GPU memory")) { @@ -6378,15 +3928,9 @@ void GCodeViewer::log_memory_used(const std::string& label, int64_t additional) } int64_t layers_size = SLIC3R_STDVEC_MEMSIZE(m_layers.get_zs(), double); layers_size += SLIC3R_STDVEC_MEMSIZE(m_layers.get_endpoints(), Layers::Endpoints); -#if ENABLE_SPLITTED_VERTEX_BUFFER - BOOST_LOG_TRIVIAL(trace) << label - << "(" << format_memsize_MB(additional + paths_size + render_paths_size + layers_size) << ");" - << log_memory_info(); -#else BOOST_LOG_TRIVIAL(trace) << label << "(" << format_memsize_MB(additional + paths_size + render_paths_size + layers_size) << ");" << log_memory_info(); -#endif // ENABLE_SPLITTED_VERTEX_BUFFER } } diff --git a/src/slic3r/GUI/GCodeViewer.hpp b/src/slic3r/GUI/GCodeViewer.hpp index 02aec4f14..a67208f10 100644 --- a/src/slic3r/GUI/GCodeViewer.hpp +++ b/src/slic3r/GUI/GCodeViewer.hpp @@ -21,25 +21,11 @@ namespace GUI { class GCodeViewer { -<<<<<<< HEAD -#if ENABLE_SPLITTED_VERTEX_BUFFER - using IBufferType = unsigned short; -#endif // ENABLE_SPLITTED_VERTEX_BUFFER - using Color = std::array<float, 3>; - using VertexBuffer = std::vector<float>; -#if ENABLE_SPLITTED_VERTEX_BUFFER - using MultiVertexBuffer = std::vector<VertexBuffer>; - using IndexBuffer = std::vector<IBufferType>; -#else - using IndexBuffer = std::vector<unsigned int>; -#endif // ENABLE_SPLITTED_VERTEX_BUFFER -======= using IBufferType = unsigned short; using Color = std::array<float, 4>; using VertexBuffer = std::vector<float>; using MultiVertexBuffer = std::vector<VertexBuffer>; using IndexBuffer = std::vector<IBufferType>; ->>>>>>> master using MultiIndexBuffer = std::vector<IndexBuffer>; using InstanceBuffer = std::vector<float>; using InstanceIdBuffer = std::vector<size_t>; @@ -77,45 +63,22 @@ class GCodeViewer }; EFormat format{ EFormat::Position }; -<<<<<<< HEAD -#if ENABLE_SPLITTED_VERTEX_BUFFER -======= ->>>>>>> master // vbos id std::vector<unsigned int> vbos; // sizes of the buffers, in bytes, used in export to obj std::vector<size_t> sizes; -<<<<<<< HEAD -#else - // vbo id - unsigned int id{ 0 }; -#endif // ENABLE_SPLITTED_VERTEX_BUFFER -======= ->>>>>>> master // count of vertices, updated after data are sent to gpu size_t count{ 0 }; size_t data_size_bytes() const { return count * vertex_size_bytes(); } -<<<<<<< HEAD -#if ENABLE_SPLITTED_VERTEX_BUFFER - // We set 65536 as max count of vertices inside a vertex buffer to allow - // to use unsigned short in place of unsigned int for indices in the index buffer, to save memory - size_t max_size_bytes() const { return 65536 * vertex_size_bytes(); } -#endif // ENABLE_SPLITTED_VERTEX_BUFFER -======= // We set 65536 as max count of vertices inside a vertex buffer to allow // to use unsigned short in place of unsigned int for indices in the index buffer, to save memory size_t max_size_bytes() const { return 65536 * vertex_size_bytes(); } ->>>>>>> master size_t vertex_size_floats() const { return position_size_floats() + normal_size_floats(); } size_t vertex_size_bytes() const { return vertex_size_floats() * sizeof(float); } size_t position_offset_floats() const { return 0; } -<<<<<<< HEAD - size_t position_offset_size() const { return position_offset_floats() * sizeof(float); } - size_t position_size_floats() const { -======= size_t position_offset_bytes() const { return position_offset_floats() * sizeof(float); } size_t position_size_floats() const { return 3; } @@ -128,33 +91,15 @@ class GCodeViewer size_t normal_offset_bytes() const { return normal_offset_floats() * sizeof(float); } size_t normal_size_floats() const { ->>>>>>> master switch (format) { case EFormat::PositionNormal1: { return 1; } case EFormat::PositionNormal3: { return 3; } -<<<<<<< HEAD - case EFormat::PositionNormal1: { return 4; } -======= ->>>>>>> master default: { return 0; } } } size_t normal_size_bytes() const { return normal_size_floats() * sizeof(float); } -<<<<<<< HEAD - size_t normal_offset_floats() const { - switch (format) - { - case EFormat::Position: - case EFormat::PositionNormal1: { return 0; } - case EFormat::PositionNormal3: { return 3; } - default: { return 0; } - } - } - size_t normal_offset_size() const { return normal_offset_floats() * sizeof(float); } - size_t normal_size_floats() const { -======= void reset(); }; @@ -203,7 +148,6 @@ class GCodeViewer size_t data_size_bytes() const { return s_ids.size() * instance_size_bytes(); } size_t instance_size_floats() const { ->>>>>>> master switch (format) { case EFormat::InstancedModel: { return 5; } @@ -219,22 +163,10 @@ class GCodeViewer // ibo buffer containing indices data (for lines/triangles) used to render a specific toolpath type struct IBuffer { -<<<<<<< HEAD -#if ENABLE_SPLITTED_VERTEX_BUFFER - // id of the associated vertex buffer - unsigned int vbo{ 0 }; - // ibo id - unsigned int ibo{ 0 }; -#else - // ibo id - unsigned int id{ 0 }; -#endif // ENABLE_SPLITTED_VERTEX_BUFFER -======= // id of the associated vertex buffer unsigned int vbo{ 0 }; // ibo id unsigned int ibo{ 0 }; ->>>>>>> master // count of indices, updated after data are sent to gpu size_t count{ 0 }; @@ -258,10 +190,6 @@ class GCodeViewer Vec3f position{ Vec3f::Zero() }; }; -<<<<<<< HEAD -#if ENABLE_SPLITTED_VERTEX_BUFFER -======= ->>>>>>> master struct Sub_Path { Endpoint first; @@ -271,20 +199,9 @@ class GCodeViewer return first.s_id <= s_id && s_id <= last.s_id; } }; -<<<<<<< HEAD -#endif // ENABLE_SPLITTED_VERTEX_BUFFER EMoveType type{ EMoveType::Noop }; ExtrusionRole role{ erNone }; -#if !ENABLE_SPLITTED_VERTEX_BUFFER - Endpoint first; - Endpoint last; -#endif // !ENABLE_SPLITTED_VERTEX_BUFFER -======= - - EMoveType type{ EMoveType::Noop }; - ExtrusionRole role{ erNone }; ->>>>>>> master float delta_extruder{ 0.0f }; float height{ 0.0f }; float width{ 0.0f }; @@ -294,18 +211,9 @@ class GCodeViewer float volumetric_rate{ 0.0f }; unsigned char extruder_id{ 0 }; unsigned char cp_color_id{ 0 }; -<<<<<<< HEAD -#if ENABLE_SPLITTED_VERTEX_BUFFER - std::vector<Sub_Path> sub_paths; -#endif // ENABLE_SPLITTED_VERTEX_BUFFER - - bool matches(const GCodeProcessor::MoveVertex& move) const; -#if ENABLE_SPLITTED_VERTEX_BUFFER -======= std::vector<Sub_Path> sub_paths; bool matches(const GCodeProcessorResult::MoveVertex& move) const; ->>>>>>> master size_t vertices_count() const { return sub_paths.empty() ? 0 : sub_paths.back().last.s_id - sub_paths.front().first.s_id + 1; } @@ -323,35 +231,17 @@ class GCodeViewer return -1; } } -<<<<<<< HEAD - void add_sub_path(const GCodeProcessor::MoveVertex& move, unsigned int b_id, size_t i_id, size_t s_id) { - Endpoint endpoint = { b_id, i_id, s_id, move.position }; - sub_paths.push_back({ endpoint , endpoint }); - } -#else - size_t vertices_count() const { return last.s_id - first.s_id + 1; } - bool contains(size_t id) const { return first.s_id <= id && id <= last.s_id; } -#endif // ENABLE_SPLITTED_VERTEX_BUFFER -======= void add_sub_path(const GCodeProcessorResult::MoveVertex& move, unsigned int b_id, size_t i_id, size_t s_id) { Endpoint endpoint = { b_id, i_id, s_id, move.position }; sub_paths.push_back({ endpoint , endpoint }); } ->>>>>>> master }; // Used to batch the indices needed to render the paths struct RenderPath { -<<<<<<< HEAD -#if ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS - // Index of the parent tbuffer - unsigned char tbuffer_id; -#endif // ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS -======= // Index of the parent tbuffer unsigned char tbuffer_id; ->>>>>>> master // Render path property Color color; // Index of the buffer in TBuffer::indices @@ -361,10 +251,6 @@ class GCodeViewer unsigned int path_id; std::vector<unsigned int> sizes; std::vector<size_t> offsets; // use size_t because we need an unsigned integer whose size matches pointer's size (used in the call glMultiDrawElements()) -<<<<<<< HEAD -#if ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS -======= ->>>>>>> master bool contains(size_t offset) const { for (size_t i = 0; i < offsets.size(); ++i) { if (offsets[i] <= offset && offset <= offsets[i] + static_cast<size_t>(sizes[i] * sizeof(IBufferType))) @@ -372,27 +258,11 @@ class GCodeViewer } return false; } -#endif // ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS }; -// // for unordered_set implementation of render_paths -// struct RenderPathPropertyHash { -// size_t operator() (const RenderPath &p) const { -// // Convert the RGB value to an integer hash. -//// return (size_t(int(p.color[0] * 255) + 255 * int(p.color[1] * 255) + (255 * 255) * int(p.color[2] * 255)) * 7919) ^ size_t(p.ibuffer_id); -// return size_t(int(p.color[0] * 255) + 255 * int(p.color[1] * 255) + (255 * 255) * int(p.color[2] * 255)) ^ size_t(p.ibuffer_id); -// } -// }; struct RenderPathPropertyLower { bool operator() (const RenderPath &l, const RenderPath &r) const { -<<<<<<< HEAD -#if ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS if (l.tbuffer_id < r.tbuffer_id) return true; -#endif // ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS -======= - if (l.tbuffer_id < r.tbuffer_id) - return true; ->>>>>>> master for (int i = 0; i < 3; ++i) { if (l.color[i] < r.color[i]) return true; @@ -404,15 +274,7 @@ class GCodeViewer }; struct RenderPathPropertyEqual { bool operator() (const RenderPath &l, const RenderPath &r) const { -<<<<<<< HEAD -#if ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS - return l.tbuffer_id == r.tbuffer_id && l.ibuffer_id == r.ibuffer_id && l.color == r.color; -#else - return l.color == r.color && l.ibuffer_id == r.ibuffer_id; -#endif // ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS -======= return l.tbuffer_id == r.tbuffer_id && l.ibuffer_id == r.ibuffer_id && l.color == r.color; ->>>>>>> master } }; @@ -449,13 +311,7 @@ class GCodeViewer std::string shader; std::vector<Path> paths; -<<<<<<< HEAD - // std::set seems to perform significantly better, at least on Windows. -// std::unordered_set<RenderPath, RenderPathPropertyHash, RenderPathPropertyEqual> render_paths; - std::set<RenderPath, RenderPathPropertyLower> render_paths; -======= std::vector<RenderPath> render_paths; ->>>>>>> master bool visible{ false }; void reset(); @@ -463,48 +319,13 @@ class GCodeViewer // b_id index of buffer contained in this->indices // i_id index of first index contained in this->indices[b_id] // s_id index of first vertex contained in this->vertices -<<<<<<< HEAD - void add_path(const GCodeProcessor::MoveVertex& move, unsigned int b_id, size_t i_id, size_t s_id); - -#if ENABLE_SPLITTED_VERTEX_BUFFER - unsigned int max_vertices_per_segment() const { - switch (render_primitive_type) - { - case ERenderPrimitiveType::Point: { return 1; } - case ERenderPrimitiveType::Line: { return 2; } - case ERenderPrimitiveType::Triangle: { return 8; } - default: { return 0; } - } - } - - size_t max_vertices_per_segment_size_floats() const { return vertices.vertex_size_floats() * static_cast<size_t>(max_vertices_per_segment()); } - size_t max_vertices_per_segment_size_bytes() const { return max_vertices_per_segment_size_floats() * sizeof(float); } -#endif // ENABLE_SPLITTED_VERTEX_BUFFER - unsigned int indices_per_segment() const { -======= void add_path(const GCodeProcessorResult::MoveVertex& move, unsigned int b_id, size_t i_id, size_t s_id); unsigned int max_vertices_per_segment() const { ->>>>>>> master switch (render_primitive_type) { case ERenderPrimitiveType::Point: { return 1; } case ERenderPrimitiveType::Line: { return 2; } -<<<<<<< HEAD -#if ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS - case ERenderPrimitiveType::Triangle: { return 30; } // 3 indices x 10 triangles -#else - case ERenderPrimitiveType::Triangle: { return 42; } // 3 indices x 14 triangles -#endif // ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS - default: { return 0; } - } - } -#if ENABLE_SPLITTED_VERTEX_BUFFER - size_t indices_per_segment_size_bytes() const { return static_cast<size_t>(indices_per_segment() * sizeof(IBufferType)); } -#endif // ENABLE_SPLITTED_VERTEX_BUFFER -#if ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS - unsigned int max_indices_per_segment() const { -======= case ERenderPrimitiveType::Triangle: { return 8; } default: { return 0; } } @@ -513,33 +334,10 @@ class GCodeViewer size_t max_vertices_per_segment_size_floats() const { return vertices.vertex_size_floats() * static_cast<size_t>(max_vertices_per_segment()); } size_t max_vertices_per_segment_size_bytes() const { return max_vertices_per_segment_size_floats() * sizeof(float); } unsigned int indices_per_segment() const { ->>>>>>> master switch (render_primitive_type) { case ERenderPrimitiveType::Point: { return 1; } case ERenderPrimitiveType::Line: { return 2; } -<<<<<<< HEAD - case ERenderPrimitiveType::Triangle: { return 36; } // 3 indices x 12 triangles - default: { return 0; } - } - } - size_t max_indices_per_segment_size_bytes() const { return max_indices_per_segment() * sizeof(IBufferType); } -#endif // ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS - -#if ENABLE_SPLITTED_VERTEX_BUFFER - bool has_data() const { - return !vertices.vbos.empty() && vertices.vbos.front() != 0 && !indices.empty() && indices.front().ibo != 0; - } -#else - unsigned int start_segment_vertex_offset() const { return 0; } - unsigned int end_segment_vertex_offset() const { - switch (render_primitive_type) - { - case ERenderPrimitiveType::Point: { return 0; } - case ERenderPrimitiveType::Line: { return 1; } - case ERenderPrimitiveType::Triangle: { return 36; } // 1st vertex of 13th triangle - default: { return 0; } -======= case ERenderPrimitiveType::Triangle: { return 30; } // 3 indices x 10 triangles default: { return 0; } } @@ -552,15 +350,10 @@ class GCodeViewer case ERenderPrimitiveType::Line: { return 2; } case ERenderPrimitiveType::Triangle: { return 36; } // 3 indices x 12 triangles default: { return 0; } ->>>>>>> master } } size_t max_indices_per_segment_size_bytes() const { return max_indices_per_segment() * sizeof(IBufferType); } -<<<<<<< HEAD - bool has_data() const { return vertices.id != 0 && !indices.empty() && indices.front().id != 0; } -#endif // ENABLE_SPLITTED_VERTEX_BUFFER -======= bool has_data() const { switch (render_primitive_type) { @@ -577,7 +370,6 @@ class GCodeViewer default: { return false; } } } ->>>>>>> master }; // helper to render shells @@ -656,16 +448,8 @@ class GCodeViewer size_t first{ 0 }; size_t last{ 0 }; -<<<<<<< HEAD -#if ENABLE_SPLITTED_VERTEX_BUFFER - bool operator == (const Endpoints& other) const { - return first == other.first && last == other.last; - } -#endif // ENABLE_SPLITTED_VERTEX_BUFFER -======= bool operator == (const Endpoints& other) const { return first == other.first && last == other.last; } bool operator != (const Endpoints& other) const { return !operator==(other); } ->>>>>>> master }; private: @@ -691,21 +475,6 @@ class GCodeViewer double get_z_at(unsigned int id) const { return (id < m_zs.size()) ? m_zs[id] : 0.0; } Endpoints get_endpoints_at(unsigned int id) const { return (id < m_endpoints.size()) ? m_endpoints[id] : Endpoints(); } -<<<<<<< HEAD -#if ENABLE_SPLITTED_VERTEX_BUFFER - bool operator != (const Layers& other) const { - if (m_zs != other.m_zs) - return true; - if (!(m_endpoints == other.m_endpoints)) - return true; - - return false; - } -#endif // ENABLE_SPLITTED_VERTEX_BUFFER - }; - -#if ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS -======= bool operator != (const Layers& other) const { if (m_zs != other.m_zs) return true; @@ -715,7 +484,6 @@ class GCodeViewer } }; ->>>>>>> master // used to render the toolpath caps of the current sequential range // (i.e. when sliding on the horizontal slider) struct SequentialRangeCap @@ -730,7 +498,6 @@ class GCodeViewer void reset(); size_t indices_count() const { return 6; } }; -#endif // ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS #if ENABLE_GCODE_VIEWER_STATISTICS struct Statistics @@ -747,15 +514,9 @@ class GCodeViewer int64_t gl_multi_points_calls_count{ 0 }; int64_t gl_multi_lines_calls_count{ 0 }; int64_t gl_multi_triangles_calls_count{ 0 }; -<<<<<<< HEAD -#if ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS - int64_t gl_triangles_calls_count{ 0 }; -#endif // ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS -======= int64_t gl_triangles_calls_count{ 0 }; int64_t gl_instanced_models_calls_count{ 0 }; int64_t gl_batched_models_calls_count{ 0 }; ->>>>>>> master // memory int64_t results_size{ 0 }; int64_t total_vertices_gpu_size{ 0 }; @@ -796,15 +557,9 @@ class GCodeViewer gl_multi_points_calls_count = 0; gl_multi_lines_calls_count = 0; gl_multi_triangles_calls_count = 0; -<<<<<<< HEAD -#if ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS - gl_triangles_calls_count = 0; -#endif // ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS -======= gl_triangles_calls_count = 0; gl_instanced_models_calls_count = 0; gl_batched_models_calls_count = 0; ->>>>>>> master } void reset_sizes() { @@ -946,40 +701,25 @@ private: std::vector<ExtrusionRole> m_roles; size_t m_extruders_count; std::vector<unsigned char> m_extruder_ids; -<<<<<<< HEAD -======= std::vector<float> m_filament_diameters; std::vector<float> m_filament_densities; ->>>>>>> master Extrusions m_extrusions; SequentialView m_sequential_view; Shells m_shells; EViewType m_view_type{ EViewType::FeatureType }; bool m_legend_enabled{ true }; -<<<<<<< HEAD - PrintEstimatedTimeStatistics m_time_statistics; - PrintEstimatedTimeStatistics::ETimeMode m_time_estimate_mode{ PrintEstimatedTimeStatistics::ETimeMode::Normal }; -======= PrintEstimatedStatistics m_print_statistics; PrintEstimatedStatistics::ETimeMode m_time_estimate_mode{ PrintEstimatedStatistics::ETimeMode::Normal }; ->>>>>>> master #if ENABLE_GCODE_VIEWER_STATISTICS Statistics m_statistics; #endif // ENABLE_GCODE_VIEWER_STATISTICS std::array<float, 2> m_detected_point_sizes = { 0.0f, 0.0f }; -<<<<<<< HEAD - GCodeProcessor::Result::SettingsIds m_settings_ids; -#if ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS - std::array<SequentialRangeCap, 2> m_sequential_range_caps; -#endif // ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS -======= GCodeProcessorResult::SettingsIds m_settings_ids; std::array<SequentialRangeCap, 2> m_sequential_range_caps; std::vector<CustomGCode::Item> m_custom_gcode_per_print_z; bool m_contained_in_bed{ true }; ->>>>>>> master public: GCodeViewer(); @@ -998,13 +738,7 @@ public: void render(); bool has_data() const { return !m_roles.empty(); } -<<<<<<< HEAD -#if ENABLE_SPLITTED_VERTEX_BUFFER - bool can_export_toolpaths() const; -#endif // ENABLE_SPLITTED_VERTEX_BUFFER -======= bool can_export_toolpaths() const; ->>>>>>> master const BoundingBoxf3& get_paths_bounding_box() const { return m_paths_bounding_box; } const BoundingBoxf3& get_max_bounding_box() const { return m_max_bounding_box; } @@ -1042,11 +776,7 @@ public: size_t get_extruders_count() { return m_extruders_count; } private: -<<<<<<< HEAD - void load_toolpaths(const GCodeProcessor::Result& gcode_result); -======= void load_toolpaths(const GCodeProcessorResult& gcode_result); ->>>>>>> master void load_shells(const Print& print, bool initialized); void refresh_render_paths(bool keep_sequential_current_first, bool keep_sequential_current_last) const; void render_toolpaths(); diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp index ebfc8a8e7..b0026735d 100644 --- a/src/slic3r/GUI/GLCanvas3D.cpp +++ b/src/slic3r/GUI/GLCanvas3D.cpp @@ -3773,15 +3773,7 @@ void GLCanvas3D::update_tooltip_for_settings_item_in_main_toolbar() bool GLCanvas3D::has_toolpaths_to_export() const { -<<<<<<< HEAD -#if ENABLE_SPLITTED_VERTEX_BUFFER return m_gcode_viewer.can_export_toolpaths(); -#else - return m_gcode_viewer.has_data(); -#endif // ENABLE_SPLITTED_VERTEX_BUFFER -======= - return m_gcode_viewer.can_export_toolpaths(); ->>>>>>> master } void GLCanvas3D::export_toolpaths_to_obj(const char* filename) const diff --git a/src/slic3r/GUI/GUI.cpp b/src/slic3r/GUI/GUI.cpp index 800874a8f..a0b674e27 100644 --- a/src/slic3r/GUI/GUI.cpp +++ b/src/slic3r/GUI/GUI.cpp @@ -367,127 +367,6 @@ void show_substitutions_info(const ConfigSubstitutions& config_substitutions, co msg.ShowModal(); } -static wxString bold(const wxString& str) -{ - return wxString::Format("<b>%s</b>", str); -}; - -static wxString bold_string(const wxString& str) -{ - return wxString::Format("<b>\"%s\"</b>", str); -}; - -static void add_config_substitutions(const ConfigSubstitutions& conf_substitutions, wxString& changes) -{ - changes += "<table>"; - for (const ConfigSubstitution& conf_substitution : conf_substitutions) { - wxString new_val; - const ConfigOptionDef* def = conf_substitution.opt_def; - if (!def) - continue; - switch (def->type) { - case coEnum: - { - const std::vector<std::string>& labels = def->enum_labels; - const std::vector<std::string>& values = def->enum_values; - int val = conf_substitution.new_value->getInt(); - - bool is_infill = def->opt_key == "top_fill_pattern" || - def->opt_key == "bottom_fill_pattern" || - def->opt_key == "fill_pattern"; - - // Each infill doesn't use all list of infill declared in PrintConfig.hpp. - // So we should "convert" val to the correct one - if (is_infill) { - for (const auto& key_val : *def->enum_keys_map) - if ((int)key_val.second == val) { - auto it = std::find(values.begin(), values.end(), key_val.first); - if (it == values.end()) - break; - auto idx = it - values.begin(); - new_val = wxString("\"") + values[idx] + "\"" + " (" + from_u8(_utf8(labels[idx])) + ")"; - break; - } - if (new_val.IsEmpty()) { - assert(false); - new_val = _L("Undefined"); - } - } - else - new_val = wxString("\"") + values[val] + "\"" + " (" + from_u8(_utf8(labels[val])) + ")"; - break; - } - case coBool: - new_val = conf_substitution.new_value->getBool() ? "true" : "false"; - break; - case coBools: - if (conf_substitution.new_value->nullable()) - for (const char v : static_cast<const ConfigOptionBoolsNullable*>(conf_substitution.new_value.get())->values) - new_val += std::string(v == ConfigOptionBoolsNullable::nil_value() ? "nil" : v ? "true" : "false") + ", "; - else - for (const char v : static_cast<const ConfigOptionBools*>(conf_substitution.new_value.get())->values) - new_val += std::string(v ? "true" : "false") + ", "; - if (! new_val.empty()) - new_val.erase(new_val.begin() + new_val.size() - 2, new_val.end()); - break; - default: - assert(false); - } - - changes += format_wxstr("<tr><td><b>\"%1%\" (%2%)</b></td><td>: ", def->opt_key, _(def->label)) + - format_wxstr(_L("%1% was substituted with %2%"), bold_string(conf_substitution.old_value), bold(new_val)) + - "</td></tr>"; - } - changes += "</table>"; -} - -static wxString substitution_message(const wxString& changes) -{ - return - _L("Most likely the configuration was produced by a newer version of PrusaSlicer or by some PrusaSlicer fork.") + " " + - _L("The following values were substituted:") + "\n" + changes + "\n\n" + - _L("Review the substitutions and adjust them if needed."); -} - -void show_substitutions_info(const PresetsConfigSubstitutions& presets_config_substitutions) -{ - wxString changes; - - auto preset_type_name = [](Preset::Type type) { - switch (type) { - case Preset::TYPE_PRINT: return _L("Print settings"); - case Preset::TYPE_SLA_PRINT: return _L("SLA print settings"); - case Preset::TYPE_FILAMENT: return _L("Filament"); - case Preset::TYPE_SLA_MATERIAL: return _L("SLA material"); - case Preset::TYPE_PRINTER: return _L("Printer"); - case Preset::TYPE_PHYSICAL_PRINTER: return _L("Physical Printer"); - default: assert(false); return wxString(); - } - }; - - for (const PresetConfigSubstitutions& substitution : presets_config_substitutions) { - changes += "\n\n" + format_wxstr("%1% : %2%", preset_type_name(substitution.preset_type), bold_string(substitution.preset_name)); - if (!substitution.preset_file.empty()) - changes += format_wxstr(" (%1%)", substitution.preset_file); - - add_config_substitutions(substitution.substitutions, changes); - } - - InfoDialog msg(nullptr, _L("Configuration bundle was loaded, however some configuration values were not recognized."), substitution_message(changes)); - msg.ShowModal(); -} - -void show_substitutions_info(const ConfigSubstitutions& config_substitutions, const std::string& filename) -{ - wxString changes = "\n"; - add_config_substitutions(config_substitutions, changes); - - InfoDialog msg(nullptr, - format_wxstr(_L("Configuration file \"%1%\" was loaded, however some configuration values were not recognized."), from_u8(filename)), - substitution_message(changes)); - msg.ShowModal(); -} - void create_combochecklist(wxComboCtrl* comboCtrl, const std::string& text, const std::string& items) { if (comboCtrl == nullptr) diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index 20a3397b5..68080cd6b 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -492,12 +492,6 @@ static const FileWildcards file_wildcards_by_type[FT_SIZE] = { /* FT_INI */ { "INI files"sv, { ".ini"sv } }, /* FT_SVG */ { "SVG files"sv, { ".svg"sv } }, -<<<<<<< HEAD - /* FT_SL1 */ "Masked SLA files (*.sl1, *.sl1s)|*.sl1;*.SL1;*.sl1s;*.SL1S", - // Workaround for OSX file picker, for some reason it always saves with the 1st extension. - /* FT_SL1S */ "Masked SLA files (*.sl1s, *.sl1)|*.sl1s;*.SL1S;*.sl1;*.SL1", - }; -======= /* FT_TEX */ { "Texture"sv, { ".png"sv, ".svg"sv } }, /* FT_SL1 */ { "Masked SLA files"sv, { ".sl1"sv, ".sl1s"sv } }, @@ -513,7 +507,6 @@ wxString file_wildcards(FileType file_type, const std::string &custom_extension) std::string title; std::string mask; std::string custom_ext_lower; ->>>>>>> master if (! custom_extension.empty()) { // Generate an extension into the title mask and into the list of extensions. @@ -766,28 +759,14 @@ void GUI_App::post_init() this->mainframe->load_config(this->init_params->extra_config); } -<<<<<<< HEAD -======= // show "Did you know" notification if (app_config->get("show_hints") == "1" && ! is_gcode_viewer()) plater_->get_notification_manager()->push_hint_notification(true); ->>>>>>> master // The extra CallAfter() is needed because of Mac, where this is the only way // to popup a modal dialog on start without screwing combo boxes. // This is ugly but I honestly found no better way to do it. // Neither wxShowEvent nor wxWindowCreateEvent work reliably. -<<<<<<< HEAD - if (this->preset_updater) { - this->check_updates(false); - CallAfter([this] { - this->config_wizard_startup(); - this->preset_updater->slic3r_update_notify(); - this->preset_updater->sync(preset_bundle); - }); - } - -======= if (this->preset_updater) { // G-Code Viewer does not initialize preset_updater. if (! this->check_updates(false)) // Configuration is not compatible and reconfigure was refused by the user. Application is closing. @@ -814,7 +793,6 @@ void GUI_App::post_init() app_config->set("version", SLIC3R_VERSION); app_config->save(); ->>>>>>> master #ifdef _WIN32 // Sets window property to mainframe so other instances can indentify it. OtherInstanceMessageHandler::init_windows_properties(mainframe, m_instance_hash_int); @@ -1325,12 +1303,6 @@ bool GUI_App::on_init_inner() if (! plater_) return; -<<<<<<< HEAD - if (app_config->dirty() && app_config->get("autosave") == "1") - app_config->save(); - -======= ->>>>>>> master this->obj_manipul()->update_if_dirty(); // An ugly solution to GH #5537 in which GUI_App::init_opengl (normally called from events wxEVT_PAINT @@ -1346,12 +1318,9 @@ bool GUI_App::on_init_inner() #endif this->post_init(); } -<<<<<<< HEAD -======= if (! update_gui_after_init && app_config->dirty() && app_config->get("autosave") == "1") app_config->save(); ->>>>>>> master }); m_initialized = true; @@ -2357,9 +2326,6 @@ void GUI_App::add_config_menu(wxMenuBar *menu) // Load the currently selected preset into the GUI, update the preset selection box. load_current_presets(); - - // update config wizard in respect to the new config - update_wizard_from_config(); } catch (std::exception &ex) { GUI::show_error(nullptr, _L("Failed to activate configuration snapshot.") + "\n" + into_u8(ex.what())); } @@ -2730,17 +2696,6 @@ void GUI_App::load_current_presets(bool check_printer_presets_ /*= true*/) } } -void GUI_App::update_wizard_from_config() -{ - if (!m_wizard) - return; - // If ConfigWizard was created before changing of the configuration, - // we have to destroy it to have possibility to create it again in respect to the new config's parameters - m_wizard->Reparent(nullptr); - m_wizard->Destroy(); - m_wizard = nullptr; -} - bool GUI_App::OnExceptionInMainLoop() { generic_exception_handle(); @@ -2920,20 +2875,9 @@ bool GUI_App::run_wizard(ConfigWizard::RunReason reason, ConfigWizard::StartPage { wxCHECK_MSG(mainframe != nullptr, false, "Internal error: Main frame not created / null"); -<<<<<<< HEAD - if (reason == ConfigWizard::RR_USER) - if (PresetUpdater::UpdateResult result = preset_updater->config_update(app_config->orig_version(), PresetUpdater::UpdateParams::FORCED_BEFORE_WIZARD); - result == PresetUpdater::R_ALL_CANCELED) - return false; - - if (! m_wizard) { - wxBusyCursor wait; - m_wizard = new ConfigWizard(mainframe); -======= if (reason == ConfigWizard::RR_USER) { if (preset_updater->config_update(app_config->orig_version(), PresetUpdater::UpdateParams::FORCED_BEFORE_WIZARD) == PresetUpdater::R_ALL_CANCELED) return false; ->>>>>>> master } auto wizard = new ConfigWizard(mainframe); diff --git a/src/slic3r/GUI/GUI_App.hpp b/src/slic3r/GUI/GUI_App.hpp index 0dc2c1864..0dcf65512 100644 --- a/src/slic3r/GUI/GUI_App.hpp +++ b/src/slic3r/GUI/GUI_App.hpp @@ -66,11 +66,6 @@ enum FileType FT_TEX, FT_SL1, -<<<<<<< HEAD - // Workaround for OSX file picker, for some reason it always saves with the 1st extension. - FT_SL1S, -======= ->>>>>>> master FT_SIZE, }; @@ -264,7 +259,6 @@ public: bool check_print_host_queue(); bool checked_tab(Tab* tab); void load_current_presets(bool check_printer_presets = true); - void update_wizard_from_config(); wxString current_language_code() const { return m_wxLocale->GetCanonicalName(); } // Translate the language code to a code, for which Prusa Research maintains translations. Defaults to "en_US". diff --git a/src/slic3r/GUI/GUI_Preview.cpp b/src/slic3r/GUI/GUI_Preview.cpp index 1d2e2e4dc..156444a51 100644 --- a/src/slic3r/GUI/GUI_Preview.cpp +++ b/src/slic3r/GUI/GUI_Preview.cpp @@ -413,8 +413,6 @@ void Preview::msw_rescale() void Preview::sys_color_changed() { -<<<<<<< HEAD -======= #ifdef _WIN32 wxWindowUpdateLocker noUpdates(this); @@ -426,7 +424,6 @@ void Preview::sys_color_changed() wxGetApp().UpdateDarkUI(static_cast<wxCheckListBoxComboPopup*>(m_combochecklist_options->GetPopupControl())); #endif ->>>>>>> master if (m_layers_slider != nullptr) m_layers_slider->sys_color_changed(); } @@ -500,65 +497,18 @@ void Preview::on_combochecklist_features(wxCommandEvent& evt) void Preview::on_combochecklist_options(wxCommandEvent& evt) { -<<<<<<< HEAD - unsigned int curr_flags = m_canvas->get_gcode_options_visibility_flags(); - unsigned int new_flags = Slic3r::GUI::combochecklist_get_flags(m_combochecklist_options); -======= const unsigned int curr_flags = m_canvas->get_gcode_options_visibility_flags(); const unsigned int new_flags = Slic3r::GUI::combochecklist_get_flags(m_combochecklist_options); ->>>>>>> master if (curr_flags == new_flags) return; m_canvas->set_gcode_options_visibility_from_flags(new_flags); -<<<<<<< HEAD - -#if ENABLE_RENDER_PATH_REFRESH_AFTER_OPTIONS_CHANGE - m_canvas->refresh_gcode_preview_render_paths(); -#else - auto xored = [](unsigned int flags1, unsigned int flags2, unsigned int flag) { - auto is_flag_set = [](unsigned int flags, unsigned int flag) { - return (flags & (1 << flag)) != 0; - }; - return !is_flag_set(flags1, flag) != !is_flag_set(flags2, flag); - }; - - bool skip_refresh = xored(curr_flags, new_flags, static_cast<unsigned int>(OptionType::Shells)) || - xored(curr_flags, new_flags, static_cast<unsigned int>(OptionType::ToolMarker)); - - if (!skip_refresh) - refresh_print(); - else - m_canvas->set_as_dirty(); -#endif // ENABLE_RENDER_PATH_REFRESH_AFTER_OPTIONS_CHANGE -} - -#if !ENABLE_PREVIEW_TYPE_CHANGE -void Preview::update_view_type(bool keep_volumes) -{ - const DynamicPrintConfig& config = wxGetApp().preset_bundle->project_config; - - const wxString& choice = !wxGetApp().plater()->model().custom_gcode_per_print_z.gcodes.empty() /*&& - (wxGetApp().extruders_edited_cnt()==1 || !slice_completed) */? - _L("Color Print") : - config.option<ConfigOptionFloats>("wiping_volumes_matrix")->values.size() > 1 ? - _L("Tool") : - _L("Feature type"); - - int type = m_choice_view_type->FindString(choice); - if (m_choice_view_type->GetSelection() != type) { - m_choice_view_type->SetSelection(type); - if (0 <= type && type < static_cast<int>(GCodeViewer::EViewType::Count)) - m_canvas->set_gcode_view_preview_type(static_cast<GCodeViewer::EViewType>(type)); - m_preferred_color_mode = "feature"; -======= if (m_canvas->get_gcode_view_type() == GCodeViewer::EViewType::Feedrate) { const unsigned int diff_flags = curr_flags ^ new_flags; if ((diff_flags & (1 << static_cast<unsigned int>(Preview::OptionType::Travel))) != 0) refresh_print(); else m_canvas->refresh_gcode_preview_render_paths(); ->>>>>>> master } else m_canvas->refresh_gcode_preview_render_paths(); diff --git a/src/slic3r/GUI/Jobs/SLAImportJob.cpp b/src/slic3r/GUI/Jobs/SLAImportJob.cpp index 1450acb49..0d42cec2d 100644 --- a/src/slic3r/GUI/Jobs/SLAImportJob.cpp +++ b/src/slic3r/GUI/Jobs/SLAImportJob.cpp @@ -115,16 +115,6 @@ public: Sel sel = Sel::modelAndProfile; -<<<<<<< HEAD - TriangleMesh mesh; - DynamicPrintConfig profile; - wxString path; - Vec2i win = {2, 2}; - std::string err; - ConfigSubstitutions config_substitutions; - - priv(Plater *plt): plater{plt} {} -======= indexed_triangle_set mesh; DynamicPrintConfig profile; wxString path; @@ -135,7 +125,6 @@ public: ImportDlg import_dlg; priv(Plater *plt) : plater{plt}, import_dlg{plt} {} ->>>>>>> master }; SLAImportJob::SLAImportJob(std::shared_ptr<ProgressIndicator> pri, Plater *plater) @@ -158,15 +147,8 @@ void SLAImportJob::process() try { switch (p->sel) { case Sel::modelAndProfile: -<<<<<<< HEAD - p->config_substitutions = import_sla_archive(path, p->win, p->mesh, p->profile, progr); - break; - case Sel::modelOnly: - p->config_substitutions = import_sla_archive(path, p->win, p->mesh, progr); -======= case Sel::modelOnly: p->config_substitutions = import_sla_archive(path, p->win, p->mesh, p->profile, progr); ->>>>>>> master break; case Sel::profileOnly: p->config_substitutions = import_sla_archive(path, p->profile); @@ -199,15 +181,9 @@ void SLAImportJob::prepare() if (p->import_dlg.ShowModal() == wxID_OK) { auto path = p->import_dlg.get_path(); auto nm = wxFileName(path); -<<<<<<< HEAD - p->path = !nm.Exists(wxFILE_EXISTS_REGULAR) ? "" : path.ToUTF8(); - p->sel = dlg.get_selection(); - p->win = dlg.get_marchsq_windowsize(); -======= p->path = !nm.Exists(wxFILE_EXISTS_REGULAR) ? "" : nm.GetFullPath(); p->sel = p->import_dlg.get_selection(); p->win = p->import_dlg.get_marchsq_windowsize(); ->>>>>>> master p->config_substitutions.clear(); } else { p->path = ""; diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp index d98754272..fe96136e6 100644 --- a/src/slic3r/GUI/MainFrame.cpp +++ b/src/slic3r/GUI/MainFrame.cpp @@ -1206,11 +1206,7 @@ void MainFrame::init_menubar_as_editor() [this](wxCommandEvent&) { if (m_plater) m_plater->add_model(true); }, "import_plater", nullptr, [this](){return m_plater != nullptr; }, this); -<<<<<<< HEAD - append_menu_item(import_menu, wxID_ANY, _L("Import SL1 / SL1S archive") + dots, _L("Load an SL1 / Sl1S archive"), -======= append_menu_item(import_menu, wxID_ANY, _L("Import SL1 / SL1S Archive") + dots, _L("Load an SL1 / Sl1S archive"), ->>>>>>> master [this](wxCommandEvent&) { if (m_plater) m_plater->import_sl1_archive(); }, "import_plater", nullptr, [this](){return m_plater != nullptr && !m_plater->is_any_job_running(); }, this); diff --git a/src/slic3r/GUI/MsgDialog.cpp b/src/slic3r/GUI/MsgDialog.cpp index bd2bbc645..db4972a5d 100644 --- a/src/slic3r/GUI/MsgDialog.cpp +++ b/src/slic3r/GUI/MsgDialog.cpp @@ -60,10 +60,6 @@ MsgDialog::MsgDialog(wxWindow *parent, const wxString &title, const wxString &he apply_style(style); -<<<<<<< HEAD - topsizer->Add(logo, 0, /*wxALL*/wxTOP | wxBOTTOM | wxLEFT, BORDER); - topsizer->Add(rightsizer, 1, wxALL | wxEXPAND, BORDER); -======= SetSizerAndFit(main_sizer); } @@ -106,7 +102,6 @@ void MsgDialog::apply_style(long style) style & wxICON_INFORMATION ? "info" : style & wxICON_QUESTION ? "question" : "PrusaSlicer", this, 64, style & wxICON_ERROR)); } ->>>>>>> master void MsgDialog::finalize() { @@ -350,57 +345,5 @@ wxString get_wraped_wxString(const wxString& in, size_t line_len /*=80*/) return out; } - -// InfoDialog - -InfoDialog::InfoDialog(wxWindow* parent, const wxString &title, const wxString& msg) - : MsgDialog(parent, wxString::Format(_L("%s information"), SLIC3R_APP_NAME), title) - , msg(msg) -{ - this->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW)); - - // Text shown as HTML, so that mouse selection and Ctrl-V to copy will work. - wxHtmlWindow* html = new wxHtmlWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO); - { - wxFont font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); - wxFont monospace = wxGetApp().code_font(); - wxColour text_clr = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT); - wxColour bgr_clr = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW); - auto text_clr_str = wxString::Format(wxT("#%02X%02X%02X"), text_clr.Red(), text_clr.Green(), text_clr.Blue()); - auto bgr_clr_str = wxString::Format(wxT("#%02X%02X%02X"), bgr_clr.Red(), bgr_clr.Green(), bgr_clr.Blue()); - const int font_size = font.GetPointSize() - 1; - int size[] = { font_size, font_size, font_size, font_size, font_size, font_size, font_size }; - html->SetFonts(font.GetFaceName(), monospace.GetFaceName(), size); - html->SetBorders(2); - - // calculate html page size from text - int lines = msg.Freq('\n'); - - if (msg.Contains("<tr>")) { - int pos = 0; - while (pos < (int)msg.Len() && pos != wxNOT_FOUND) { - pos = msg.find("<tr>", pos + 1); - lines+=2; - } - } - int page_height = std::min((font.GetPixelSize().y + 1) * lines, 68 * wxGetApp().em_unit()); - wxSize page_size(68 * wxGetApp().em_unit(), page_height); - - html->SetMinSize(page_size); - - std::string msg_escaped = xml_escape(msg.ToUTF8().data(), true); - boost::replace_all(msg_escaped, "\r\n", "<br>"); - boost::replace_all(msg_escaped, "\n", "<br>"); - html->SetPage("<html><body bgcolor=\"" + bgr_clr_str + "\"><font color=\"" + text_clr_str + "\">" + wxString::FromUTF8(msg_escaped.data()) + "</font></body></html>"); - content_sizer->Add(html, 1, wxEXPAND); - } - - // Set info bitmap - logo->SetBitmap(create_scaled_bitmap("info", this, 84)); - - Fit(); -} - - } } diff --git a/src/slic3r/GUI/MsgDialog.hpp b/src/slic3r/GUI/MsgDialog.hpp index ac88f7ff5..874629343 100644 --- a/src/slic3r/GUI/MsgDialog.hpp +++ b/src/slic3r/GUI/MsgDialog.hpp @@ -74,8 +74,6 @@ private: }; -<<<<<<< HEAD -======= // Generic warning dialog, used for displaying exceptions class WarningDialog : public MsgDialog { @@ -306,16 +304,11 @@ public: }; #endif ->>>>>>> master // Generic info dialog, used for displaying exceptions class InfoDialog : public MsgDialog { public: -<<<<<<< HEAD - InfoDialog(wxWindow *parent, const wxString &title, const wxString &msg); -======= InfoDialog(wxWindow *parent, const wxString &title, const wxString &msg, bool is_marked = false, long style = wxOK| wxICON_INFORMATION); ->>>>>>> master InfoDialog(InfoDialog&&) = delete; InfoDialog(const InfoDialog&) = delete; InfoDialog&operator=(InfoDialog&&) = delete; diff --git a/src/slic3r/GUI/NotificationManager.cpp b/src/slic3r/GUI/NotificationManager.cpp index 0ffcb1f69..6e9bc267f 100644 --- a/src/slic3r/GUI/NotificationManager.cpp +++ b/src/slic3r/GUI/NotificationManager.cpp @@ -5,15 +5,11 @@ #include "ImGuiWrapper.hpp" #include "PrintHostDialogs.hpp" #include "wxExtensions.hpp" -<<<<<<< HEAD -#include "libslic3r/Config.hpp" -======= #include "ObjectDataViewModel.hpp" #include "libslic3r/Config.hpp" #include "../Utils/PrintHost.hpp" #include "libslic3r/Config.hpp" #include "format.hpp" ->>>>>>> master #include <boost/algorithm/string.hpp> #include <boost/log/trivial.hpp> @@ -37,30 +33,8 @@ wxDEFINE_EVENT(EVT_EJECT_DRIVE_NOTIFICAION_CLICKED, EjectDriveNotificationClicke wxDEFINE_EVENT(EVT_EXPORT_GCODE_NOTIFICAION_CLICKED, ExportGcodeNotificationClickedEvent); wxDEFINE_EVENT(EVT_PRESET_UPDATE_AVAILABLE_CLICKED, PresetUpdateAvailableClickedEvent); -<<<<<<< HEAD -const NotificationManager::NotificationData NotificationManager::basic_notifications[] = { - // {NotificationType::SlicingNotPossible, NotificationLevel::RegularNotification, 10, _u8L("Slicing is not possible.")}, - // {NotificationType::ExportToRemovableFinished, NotificationLevel::ImportantNotification, 0, _u8L("Exporting finished."), _u8L("Eject drive.") }, - {NotificationType::Mouse3dDisconnected, NotificationLevel::RegularNotification, 10, _u8L("3D Mouse disconnected.") }, - // {NotificationType::Mouse3dConnected, NotificationLevel::RegularNotification, 5, _u8L("3D Mouse connected.") }, - // {NotificationType::NewPresetsAviable, NotificationLevel::ImportantNotification, 20, _u8L("New Presets are available."), _u8L("See here.") }, - {NotificationType::PresetUpdateAvailable, NotificationLevel::ImportantNotification, 20, _u8L("Configuration update is available."), _u8L("See more."), [](wxEvtHandler* evnthndlr){ - if (evnthndlr != nullptr) wxPostEvent(evnthndlr, PresetUpdateAvailableClickedEvent(EVT_PRESET_UPDATE_AVAILABLE_CLICKED)); return true; }}, - {NotificationType::NewAppAvailable, NotificationLevel::ImportantNotification, 20, _u8L("New version is available."), _u8L("See Releases page."), [](wxEvtHandler* evnthndlr){ - wxLaunchDefaultBrowser("https://github.com/prusa3d/PrusaSlicer/releases"); return true; }}, - {NotificationType::EmptyColorChangeCode, NotificationLevel::RegularNotification, 10, - _u8L("You have just added a G-code for color change, but its value is empty.\n" - "To export the G-code correctly, check the \"Color Change G-code\" in \"Printer Settings > Custom G-code\"") }, - //{NotificationType::NewAppAvailable, NotificationLevel::ImportantNotification, 20, _u8L("New vesion of PrusaSlicer is available.", _u8L("Download page.") }, - //{NotificationType::LoadingFailed, NotificationLevel::RegularNotification, 20, _u8L("Loading of model has Failed") }, - //{NotificationType::DeviceEjected, NotificationLevel::RegularNotification, 10, _u8L("Removable device has been safely ejected")} // if we want changeble text (like here name of device), we need to do it as CustomNotification -}; - -namespace { -======= namespace { /* // not used? ->>>>>>> master ImFont* add_default_font(float pixel_size) { ImGuiIO& io = ImGui::GetIO(); @@ -71,11 +45,7 @@ namespace { ImFont* font = io.Fonts->AddFontDefault(&config); return font; } -<<<<<<< HEAD - -======= */ ->>>>>>> master inline void push_style_color(ImGuiCol idx, const ImVec4& col, bool fading_out, float current_fade_opacity) { if (fading_out) @@ -218,33 +188,6 @@ void NotificationManager::PopNotification::render(GLCanvas3D& canvas, float init } // color change based on fading out -<<<<<<< HEAD - bool fading_pop = false; - if (m_fading_out) { - push_style_color(ImGuiCol_WindowBg, ImGui::GetStyleColorVec4(ImGuiCol_WindowBg), m_fading_out, m_current_fade_opacity); - push_style_color(ImGuiCol_Text, ImGui::GetStyleColorVec4(ImGuiCol_Text), m_fading_out, m_current_fade_opacity); - fading_pop = true; - } - - // background color - if (m_is_gray) { - ImVec4 backcolor(0.7f, 0.7f, 0.7f, 0.5f); - push_style_color(ImGuiCol_WindowBg, backcolor, m_fading_out, m_current_fade_opacity); - } - else if (m_data.level == NotificationLevel::ErrorNotification) { - ImVec4 backcolor = ImGui::GetStyleColorVec4(ImGuiCol_WindowBg); - backcolor.x += 0.3f; - push_style_color(ImGuiCol_WindowBg, backcolor, m_fading_out, m_current_fade_opacity); - } - else if (m_data.level == NotificationLevel::WarningNotification) { - ImVec4 backcolor = ImGui::GetStyleColorVec4(ImGuiCol_WindowBg); - backcolor.x += 0.3f; - backcolor.y += 0.15f; - push_style_color(ImGuiCol_WindowBg, backcolor, m_fading_out, m_current_fade_opacity); - } - - // name of window - probably indentifies window and is shown so last_end add whitespaces according to id -======= if (m_state == EState::FadingOut) { push_style_color(ImGuiCol_WindowBg, ImGui::GetStyleColorVec4(ImGuiCol_WindowBg), true, m_current_fade_opacity); push_style_color(ImGuiCol_Text, ImGui::GetStyleColorVec4(ImGuiCol_Text), true, m_current_fade_opacity); @@ -256,7 +199,6 @@ void NotificationManager::PopNotification::render(GLCanvas3D& canvas, float init // name of window indentifies window - has to be unique string ->>>>>>> master if (m_id == 0) m_id = m_id_provider.allocate_id(); std::string name = "!!Ntfctn" + std::to_string(m_id); @@ -281,131 +223,6 @@ void NotificationManager::PopNotification::render(GLCanvas3D& canvas, float init } bool NotificationManager::PopNotification::push_background_color() { -<<<<<<< HEAD - if (!m_initialized) { - init(); - } - if (m_finished) - return RenderResult::Finished; - if (m_close_pending) { - // request of extra frame will be done in caller function by ret val ClosePending - m_finished = true; - return RenderResult::ClosePending; - } - if (m_hidden) { - m_top_y = initial_y - GAP_WIDTH; - return RenderResult::Static; - } - RenderResult ret_val = m_counting_down ? RenderResult::Countdown : RenderResult::Static; - Size cnv_size = canvas.get_canvas_size(); - ImGuiWrapper& imgui = *wxGetApp().imgui(); - bool shown = true; - ImVec2 mouse_pos = ImGui::GetMousePos(); - float right_gap = SPACE_RIGHT_PANEL + (move_from_overlay ? overlay_width + m_line_height * 5 : 0); - - if (m_line_height != ImGui::CalcTextSize("A").y) - init(); - - set_next_window_size(imgui); - - //top y of window - m_top_y = initial_y + m_window_height; - //top right position - - ImVec2 win_pos(1.0f * (float)cnv_size.get_width() - right_gap, 1.0f * (float)cnv_size.get_height() - m_top_y); - imgui.set_next_window_pos(win_pos.x, win_pos.y, ImGuiCond_Always, 1.0f, 0.0f); - imgui.set_next_window_size(m_window_width, m_window_height, ImGuiCond_Always); - - //find if hovered - if (mouse_pos.x < win_pos.x && mouse_pos.x > win_pos.x - m_window_width && mouse_pos.y > win_pos.y&& mouse_pos.y < win_pos.y + m_window_height) - { - ImGui::SetNextWindowFocus(); - ret_val = RenderResult::Hovered; - //reset fading - m_fading_out = false; - m_current_fade_opacity = 1.f; - m_remaining_time = m_data.duration; - m_countdown_frame = 0; - } - - if (m_counting_down && m_remaining_time < 0) - m_close_pending = true; - - if (m_close_pending) { - // request of extra frame will be done in caller function by ret val ClosePending - m_finished = true; - return RenderResult::ClosePending; - } - - // color change based on fading out - bool fading_pop = false; - if (m_fading_out) { - if (!m_paused) - m_current_fade_opacity -= 1.f / ((m_fading_time + 1.f) * 60.f); - push_style_color(ImGuiCol_WindowBg, ImGui::GetStyleColorVec4(ImGuiCol_WindowBg), m_fading_out, m_current_fade_opacity); - push_style_color(ImGuiCol_Text, ImGui::GetStyleColorVec4(ImGuiCol_Text), m_fading_out, m_current_fade_opacity); - fading_pop = true; - } - // background color - if (m_is_gray) { - ImVec4 backcolor(0.7f, 0.7f, 0.7f, 0.5f); - push_style_color(ImGuiCol_WindowBg, backcolor, m_fading_out, m_current_fade_opacity); - } else if (m_data.level == NotificationLevel::ErrorNotification) { - ImVec4 backcolor = ImGui::GetStyleColorVec4(ImGuiCol_WindowBg); - backcolor.x += 0.3f; - push_style_color(ImGuiCol_WindowBg, backcolor, m_fading_out, m_current_fade_opacity); - } else if (m_data.level == NotificationLevel::WarningNotification) { - ImVec4 backcolor = ImGui::GetStyleColorVec4(ImGuiCol_WindowBg); - backcolor.x += 0.3f; - backcolor.y += 0.15f; - push_style_color(ImGuiCol_WindowBg, backcolor, m_fading_out, m_current_fade_opacity); - } - - //name of window - probably indentifies window and is shown so last_end add whitespaces according to id - if (! m_id) - m_id = m_id_provider.allocate_id(); - std::string name; - { - // Create a unique ImGUI window name. The name may be recycled using a name of an already released notification. - char buf[32]; - sprintf(buf, "!!Ntfctn%d", m_id); - name = buf; - } - if (imgui.begin(name, &shown, ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoScrollbar )) { - if (shown) { - - ImVec2 win_size = ImGui::GetWindowSize(); - - - //FIXME: dont forget to us this for texts - //GUI::format(_utf8(L())); - - /* - //countdown numbers - ImGui::SetCursorPosX(15); - ImGui::SetCursorPosY(15); - imgui.text(std::to_string(m_remaining_time).c_str()); - */ - if(m_counting_down) - render_countdown(imgui, win_size.x, win_size.y, win_pos.x, win_pos.y); - render_left_sign(imgui); - render_text(imgui, win_size.x, win_size.y, win_pos.x, win_pos.y); - render_close_button(imgui, win_size.x, win_size.y, win_pos.x, win_pos.y); - m_minimize_b_visible = false; - if (m_multiline && m_lines_count > 3) - render_minimize_button(imgui, win_pos.x, win_pos.y); - } else { - // the user clicked on the [X] button ( ImGuiWindowFlags_NoTitleBar means theres no [X] button) - m_close_pending = true; - canvas.set_as_dirty(); - } - } - imgui.end(); - - if (fading_pop) { - ImGui::PopStyleColor(); - ImGui::PopStyleColor(); -======= if (m_is_gray) { ImVec4 backcolor(0.7f, 0.7f, 0.7f, 0.5f); push_style_color(ImGuiCol_WindowBg, backcolor, m_state == EState::FadingOut, m_current_fade_opacity); @@ -423,7 +240,6 @@ bool NotificationManager::PopNotification::push_background_color() backcolor.y += 0.15f; push_style_color(ImGuiCol_WindowBg, backcolor, m_state == EState::FadingOut, m_current_fade_opacity); return true; ->>>>>>> master } return false; } @@ -448,18 +264,12 @@ void NotificationManager::PopNotification::count_spaces() void NotificationManager::PopNotification::count_lines() { -<<<<<<< HEAD - std::string text = m_text1; - int last_end = 0; - m_lines_count = 0; -======= std::string text = m_text1; size_t last_end = 0; m_lines_count = 0; if (text.empty()) return; ->>>>>>> master m_endlines.clear(); while (last_end < text.length() - 1) @@ -474,15 +284,9 @@ void NotificationManager::PopNotification::count_lines() // find next suitable endline if (ImGui::CalcTextSize(text.substr(last_end).c_str()).x >= m_window_width - m_window_width_offset) { // more than one line till end -<<<<<<< HEAD - int next_space = text.find_first_of(' ', last_end); - if (next_space > 0 && next_space < text.length()) { - int next_space_candidate = text.find_first_of(' ', next_space + 1); -======= size_t next_space = text.find_first_of(' ', last_end); if (next_space > 0 && next_space < text.length()) { size_t next_space_candidate = text.find_first_of(' ', next_space + 1); ->>>>>>> master while (next_space_candidate > 0 && ImGui::CalcTextSize(text.substr(last_end, next_space_candidate - last_end).c_str()).x < m_window_width - m_window_width_offset) { next_space = next_space_candidate; next_space_candidate = text.find_first_of(' ', next_space + 1); @@ -491,13 +295,6 @@ void NotificationManager::PopNotification::count_lines() next_space = text.length(); } // when one word longer than line. -<<<<<<< HEAD - if (ImGui::CalcTextSize(text.substr(last_end, next_space - last_end).c_str()).x > m_window_width - m_window_width_offset) { - float width_of_a = ImGui::CalcTextSize("a").x; - int letter_count = (int)((m_window_width - m_window_width_offset) / width_of_a); - while (last_end + letter_count < text.size() && ImGui::CalcTextSize(text.substr(last_end, letter_count).c_str()).x < m_window_width - m_window_width_offset) { - letter_count++; -======= if (ImGui::CalcTextSize(text.substr(last_end, next_space - last_end).c_str()).x > m_window_width - m_window_width_offset || ImGui::CalcTextSize(text.substr(last_end, next_space - last_end).c_str()).x < (m_window_width - m_window_width_offset) / 4 * 3 ) { @@ -505,7 +302,6 @@ void NotificationManager::PopNotification::count_lines() int letter_count = (int)((m_window_width - m_window_width_offset) / width_of_a); while (last_end + letter_count < text.size() && ImGui::CalcTextSize(text.substr(last_end, letter_count).c_str()).x < m_window_width - m_window_width_offset) { letter_count += get_utf8_sequence_length(text, last_end + letter_count); ->>>>>>> master } m_endlines.push_back(last_end + letter_count); last_end += letter_count; @@ -530,8 +326,6 @@ void NotificationManager::PopNotification::count_lines() m_lines_count++; } } -<<<<<<< HEAD -======= // m_text_2 (text after hypertext) is not used for regular notifications right now. // its caluculation is in HintNotification::count_lines() @@ -546,7 +340,6 @@ void NotificationManager::PopNotification::init() count_spaces(); count_lines(); ->>>>>>> master if (m_lines_count == 3) m_multiline = true; m_notification_start = GLCanvas3D::timestamp_now(); @@ -563,104 +356,6 @@ void NotificationManager::PopNotification::set_next_window_size(ImGuiWrapper& im void NotificationManager::PopNotification::render_text(ImGuiWrapper& imgui, const float win_size_x, const float win_size_y, const float win_pos_x, const float win_pos_y) { -<<<<<<< HEAD - ImVec2 win_size(win_size_x, win_size_y); - ImVec2 win_pos(win_pos_x, win_pos_y); - float x_offset = m_left_indentation; - std::string fulltext = m_text1 + m_hypertext; //+ m_text2; - ImVec2 text_size = ImGui::CalcTextSize(fulltext.c_str()); - // text posistions are calculated by lines count - // large texts has "more" button or are displayed whole - // smaller texts are divided as one liners and two liners - if (m_lines_count > 2) { - if (m_multiline) { - - int last_end = 0; - float starting_y = m_line_height/2;//10; - float shift_y = m_line_height;// -m_line_height / 20; - std::string line; - for (size_t i = 0; i < m_lines_count; i++) { - line.clear(); - ImGui::SetCursorPosX(x_offset); - ImGui::SetCursorPosY(starting_y + i * shift_y); - if (m_endlines.size() > i && m_text1.size() >= m_endlines[i]) { - line = m_text1.substr(last_end, m_endlines[i] - last_end); - last_end = m_endlines[i]; - if (m_text1.size() > m_endlines[i]) - last_end += (m_text1[m_endlines[i]] == '\n' || m_text1[m_endlines[i]] == ' ' ? 1 : 0); - imgui.text(line.c_str()); - } - } - //hyperlink text - if (!m_hypertext.empty()) { - render_hypertext(imgui, x_offset + ImGui::CalcTextSize((line + (line.empty() ? "" : " ")).c_str()).x, starting_y + (m_lines_count - 1) * shift_y, m_hypertext); - } - - - } else { - // line1 - if (m_text1.size() >= m_endlines[0]) { - ImGui::SetCursorPosX(x_offset); - ImGui::SetCursorPosY(win_size.y / 2 - win_size.y / 6 - m_line_height / 2); - imgui.text(m_text1.substr(0, m_endlines[0]).c_str()); - } - // line2 - std::string line; - ImGui::SetCursorPosX(x_offset); - ImGui::SetCursorPosY(win_size.y / 2 + win_size.y / 6 - m_line_height / 2); - if (m_text1.size() >= m_endlines[1]) { - line = m_text1.substr(m_endlines[0] + (m_text1[m_endlines[0]] == '\n' || m_text1[m_endlines[0]] == ' ' ? 1 : 0), m_endlines[1] - m_endlines[0] - (m_text1[m_endlines[0]] == '\n' || m_text1[m_endlines[0]] == ' ' ? 1 : 0)); - if (ImGui::CalcTextSize(line.c_str()).x > m_window_width - m_window_width_offset - ImGui::CalcTextSize((".." + _u8L("More")).c_str()).x) { - line = line.substr(0, line.length() - 6); - line += ".."; - } else - line += " "; - imgui.text(line.c_str()); - } - // "More" hypertext - render_hypertext(imgui, x_offset + ImGui::CalcTextSize(line.c_str()).x, win_size.y / 2 + win_size.y / 6 - m_line_height / 2, _u8L("More"), true); - } - } else { - //text 1 - float cursor_y = win_size.y / 2 - text_size.y / 2; - float cursor_x = x_offset; - if(m_lines_count > 1) { - // line1 - if (m_text1.length() >= m_endlines[0]) { // could be equal than substr takes whole string - ImGui::SetCursorPosX(x_offset); - ImGui::SetCursorPosY(win_size.y / 2 - win_size.y / 6 - m_line_height / 2); - imgui.text(m_text1.substr(0, m_endlines[0]).c_str()); - } - // line2 - ImGui::SetCursorPosX(x_offset); - cursor_y = win_size.y / 2 + win_size.y / 6 - m_line_height / 2; - ImGui::SetCursorPosY(cursor_y); - if (m_text1.length() > m_endlines[0]) { // must be greater otherwise theres nothing to show and m_text1[m_endlines[0]] is beyond last letter - std::string line = m_text1.substr(m_endlines[0] + (m_text1[m_endlines[0]] == '\n' || m_text1[m_endlines[0]] == ' ' ? 1 : 0)); - imgui.text(line.c_str()); - cursor_x = x_offset + ImGui::CalcTextSize(line.c_str()).x; - } - } else { - ImGui::SetCursorPosX(x_offset); - ImGui::SetCursorPosY(cursor_y); - imgui.text(m_text1.c_str()); - cursor_x = x_offset + ImGui::CalcTextSize(m_text1.c_str()).x; - } - //hyperlink text - if (!m_hypertext.empty()) { - render_hypertext(imgui, cursor_x + 4, cursor_y, m_hypertext); - } - - //notification text 2 - //text 2 is suposed to be after the hyperlink - currently it is not used - /* - if (!m_text2.empty()) - { - ImVec2 part_size = ImGui::CalcTextSize(m_hypertext.c_str()); - ImGui::SetCursorPosX(win_size.x / 2 + text_size.x / 2 - part_size.x + 8 - x_offset); - ImGui::SetCursorPosY(cursor_y); - imgui.text(m_text2.c_str()); -======= float x_offset = m_left_indentation; int last_end = 0; float starting_y = (m_lines_count == 2 ? win_size_y / 2 - m_line_height : (m_lines_count == 1 ? win_size_y / 2 - m_line_height / 2 : m_line_height / 2)); @@ -689,7 +384,6 @@ void NotificationManager::PopNotification::render_text(ImGuiWrapper& imgui, cons if (m_text1.size() > m_endlines[i]) last_end += (m_text1[m_endlines[i]] == '\n' || m_text1[m_endlines[i]] == ' ' ? 1 : 0); imgui.text(line.c_str()); ->>>>>>> master } } //hyperlink text @@ -732,11 +426,7 @@ void NotificationManager::PopNotification::render_hypertext(ImGuiWrapper& imgui, orange_color.y += 0.2f; //text -<<<<<<< HEAD - push_style_color(ImGuiCol_Text, orange_color, m_fading_out, m_current_fade_opacity); -======= push_style_color(ImGuiCol_Text, orange_color, m_state == EState::FadingOut, m_current_fade_opacity); ->>>>>>> master ImGui::SetCursorPosX(text_x); ImGui::SetCursorPosY(text_y); imgui.text(text.c_str()); @@ -757,13 +447,8 @@ void NotificationManager::PopNotification::render_close_button(ImGuiWrapper& img ImVec2 win_pos(win_pos_x, win_pos_y); ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(.0f, .0f, .0f, .0f)); ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(.0f, .0f, .0f, .0f)); -<<<<<<< HEAD - push_style_color(ImGuiCol_Text, ImVec4(1.f, 1.f, 1.f, 1.f), m_fading_out, m_current_fade_opacity); - push_style_color(ImGuiCol_TextSelectedBg, ImVec4(0, .75f, .75f, 1.f), m_fading_out, m_current_fade_opacity); -======= push_style_color(ImGuiCol_Text, ImVec4(1.f, 1.f, 1.f, 1.f), m_state == EState::FadingOut, m_current_fade_opacity); push_style_color(ImGuiCol_TextSelectedBg, ImVec4(0, .75f, .75f, 1.f), m_state == EState::FadingOut, m_current_fade_opacity); ->>>>>>> master ImGui::PushStyleColor(ImGuiCol_ButtonActive, ImVec4(.0f, .0f, .0f, .0f)); @@ -815,15 +500,9 @@ void NotificationManager::PopNotification::render_minimize_button(ImGuiWrapper& { ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(.0f, .0f, .0f, .0f)); ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(.0f, .0f, .0f, .0f)); -<<<<<<< HEAD - push_style_color(ImGuiCol_ButtonActive, ImGui::GetStyleColorVec4(ImGuiCol_WindowBg), m_fading_out, m_current_fade_opacity); - push_style_color(ImGuiCol_Text, ImVec4(1.f, 1.f, 1.f, 1.f), m_fading_out, m_current_fade_opacity); - push_style_color(ImGuiCol_TextSelectedBg, ImVec4(0, .75f, .75f, 1.f), m_fading_out, m_current_fade_opacity); -======= push_style_color(ImGuiCol_ButtonActive, ImGui::GetStyleColorVec4(ImGuiCol_WindowBg), m_state == EState::FadingOut, m_current_fade_opacity); push_style_color(ImGuiCol_Text, ImVec4(1.f, 1.f, 1.f, 1.f), m_state == EState::FadingOut, m_current_fade_opacity); push_style_color(ImGuiCol_TextSelectedBg, ImVec4(0, .75f, .75f, 1.f), m_state == EState::FadingOut, m_current_fade_opacity); ->>>>>>> master //button - if part if treggered @@ -971,10 +650,7 @@ void NotificationManager::ExportFinishedNotification::render_text(ImGuiWrapper& float starting_y = m_line_height / 2;//10; float shift_y = m_line_height;// -m_line_height / 20; for (size_t i = 0; i < m_lines_count; i++) { -<<<<<<< HEAD -======= assert(m_text1.size() >= m_endlines[i]); ->>>>>>> master if (m_text1.size() >= m_endlines[i]) { std::string line = m_text1.substr(last_end, m_endlines[i] - last_end); last_end = m_endlines[i]; @@ -984,11 +660,7 @@ void NotificationManager::ExportFinishedNotification::render_text(ImGuiWrapper& ImGui::SetCursorPosY(starting_y + i * shift_y); imgui.text(line.c_str()); //hyperlink text -<<<<<<< HEAD - if ( i == 0 ) { -======= if ( i == 0 && !m_eject_pending) { ->>>>>>> master render_hypertext(imgui, x_offset + ImGui::CalcTextSize(line.c_str()).x + ImGui::CalcTextSize(" ").x, starting_y, _u8L("Open Folder.")); } } @@ -1009,13 +681,8 @@ void NotificationManager::ExportFinishedNotification::render_eject_button(ImGuiW ImVec2 win_pos(win_pos_x, win_pos_y); ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(.0f, .0f, .0f, .0f)); ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(.0f, .0f, .0f, .0f)); -<<<<<<< HEAD - push_style_color(ImGuiCol_Text, ImVec4(1.f, 1.f, 1.f, 1.f), m_fading_out, m_current_fade_opacity); - push_style_color(ImGuiCol_TextSelectedBg, ImVec4(0, .75f, .75f, 1.f), m_fading_out, m_current_fade_opacity); -======= push_style_color(ImGuiCol_Text, ImVec4(1.f, 1.f, 1.f, 1.f), m_state == EState::FadingOut, m_current_fade_opacity); push_style_color(ImGuiCol_TextSelectedBg, ImVec4(0, .75f, .75f, 1.f), m_state == EState::FadingOut, m_current_fade_opacity); ->>>>>>> master ImGui::PushStyleColor(ImGuiCol_ButtonActive, ImVec4(.0f, .0f, .0f, .0f)); std::string button_text; @@ -1961,13 +1628,6 @@ void NotificationManager::set_upload_job_notification_percentage(int id, const s } void NotificationManager::upload_job_notification_show_canceled(int id, const std::string& filename, const std::string& host) { -<<<<<<< HEAD - auto it = std::find_if(std::begin(basic_notifications), std::end(basic_notifications), - boost::bind(&NotificationData::type, boost::placeholders::_1) == type); - assert(it != std::end(basic_notifications)); - if (it != std::end(basic_notifications)) - push_notification_data(*it, timestamp); -======= for (std::unique_ptr<PopNotification>& notification : m_pop_notifications) { if (notification->get_type() == NotificationType::PrintHostUpload) { PrintHostUploadNotification* phun = dynamic_cast<PrintHostUploadNotification*>(notification.get()); @@ -1978,7 +1638,6 @@ void NotificationManager::upload_job_notification_show_canceled(int id, const st } } } ->>>>>>> master } void NotificationManager::upload_job_notification_show_error(int id, const std::string& filename, const std::string& host) { diff --git a/src/slic3r/GUI/NotificationManager.hpp b/src/slic3r/GUI/NotificationManager.hpp index 9ec1c71ae..9265cb55e 100644 --- a/src/slic3r/GUI/NotificationManager.hpp +++ b/src/slic3r/GUI/NotificationManager.hpp @@ -600,17 +600,6 @@ private: bool update_state(bool paused, const int64_t delta) override; // Own protected: -<<<<<<< HEAD - void init(); - void render_text(ImGuiWrapper& imgui, - const float win_size_x, const float win_size_y, - const float win_pos_x, const float win_pos_y) override; - void render_bar(ImGuiWrapper& imgui, - const float win_size_x, const float win_size_y, - const float win_pos_x, const float win_pos_y); - bool m_progress_complete{ false }; - float m_percentage; -======= int m_range { 100 }; CancelFn m_cancel_callback { nullptr }; ProgressIndicatorState m_progress_state { ProgressIndicatorState::PIS_HIDDEN }; @@ -622,7 +611,6 @@ private: const float win_size_x, const float win_size_y, const float win_pos_x, const float win_pos_y) override; void on_cancel_button() { if (m_cancel_callback) m_cancel_callback(); } ->>>>>>> master }; class ExportFinishedNotification : public PopNotification @@ -649,20 +637,13 @@ private: void render_close_button(ImGuiWrapper& imgui, const float win_size_x, const float win_size_y, const float win_pos_x, const float win_pos_y) override; -<<<<<<< HEAD - void render_eject_button(ImGuiWrapper& imgui, -======= void render_eject_button(ImGuiWrapper& imgui, ->>>>>>> master const float win_size_x, const float win_size_y, const float win_pos_x, const float win_pos_y); void render_minimize_button(ImGuiWrapper& imgui, const float win_pos_x, const float win_pos_y) override { m_minimize_b_visible = false; } bool on_text_click() override; -<<<<<<< HEAD -======= void on_eject_click(); ->>>>>>> master // local time of last hover for showing tooltip long m_hover_time { 0 }; bool m_eject_pending { false }; @@ -766,9 +747,6 @@ private: NotificationType::SimplifySuggestion }; //prepared (basic) notifications -<<<<<<< HEAD - static const NotificationData basic_notifications[]; -======= // non-static so its not loaded too early. If static, the translations wont load correctly. const std::vector<NotificationData> basic_notifications = { {NotificationType::Mouse3dDisconnected, NotificationLevel::RegularNotificationLevel, 10, _u8L("3D Mouse disconnected.") }, @@ -800,7 +778,6 @@ private: //{NotificationType::DeviceEjected, NotificationLevel::RegularNotificationLevel, 10, _u8L("Removable device has been safely ejected")} // if we want changeble text (like here name of device), we need to do it as CustomNotification }; ->>>>>>> master }; }//namespace GUI diff --git a/src/slic3r/GUI/PhysicalPrinterDialog.cpp b/src/slic3r/GUI/PhysicalPrinterDialog.cpp index d8b6b3656..b2983f97f 100644 --- a/src/slic3r/GUI/PhysicalPrinterDialog.cpp +++ b/src/slic3r/GUI/PhysicalPrinterDialog.cpp @@ -528,18 +528,6 @@ void PhysicalPrinterDialog::update_host_type(bool printer_change) std::string preset_name = prstft->get_preset_name(); if (Preset* preset = wxGetApp().preset_bundle->printers.find_preset(preset_name)) { std::string model_id = preset->config.opt_string("printer_model"); -<<<<<<< HEAD - if (preset->vendor && preset->vendor->name == "Prusa Research") { - const std::vector<VendorProfile::PrinterModel>& models = preset->vendor->models; - auto it = std::find_if(models.begin(), models.end(), - [model_id](const VendorProfile::PrinterModel& model) { return model.id == model_id; }); - if (it != models.end() && it->family == "MK3") - continue; - } else if (!preset->vendor && model_id.rfind("MK3", 0) == 0) { - continue; - } - -======= auto model_supports_prusalink = [](const std::string &model) { return model.size() >= 3 && ((boost::starts_with(model, "MK") && model[2] > '2' && model[2] <= '9') || @@ -555,7 +543,6 @@ void PhysicalPrinterDialog::update_host_type(bool printer_change) } } else if (model_supports_prusalink(model_id)) continue; ->>>>>>> master } all_presets_are_from_mk3_family = false; break; diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 5570123f3..26aef38ff 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -3678,12 +3678,7 @@ void Plater::priv::reload_from_disk() try { new_model = Model::read_from_file(path, nullptr, nullptr, Model::LoadAttribute::AddDefaultInstances); -<<<<<<< HEAD - for (ModelObject* model_object : new_model.objects) - { -======= for (ModelObject* model_object : new_model.objects) { ->>>>>>> master model_object->center_around_origin(); model_object->ensure_on_bed(); } @@ -5400,10 +5395,6 @@ bool Plater::load_files(const wxArrayString& filenames) assert(false); break; } - case LoadType::Unknown : { - assert(false); - break; - } } return true; @@ -5716,17 +5707,10 @@ void Plater::export_gcode(bool prefer_removable) wxFileDialog dlg(this, (printer_technology() == ptFFF) ? _L("Save G-code file as:") : _L("Save SL1 / SL1S file as:"), start_dir, from_path(default_output_file.filename()), -<<<<<<< HEAD - GUI::file_wildcards((printer_technology() == ptFFF) ? FT_GCODE : boost::iequals(ext, ".sl1s") ? FT_SL1S : FT_SL1, ext), - wxFD_SAVE | wxFD_OVERWRITE_PROMPT - ); - if (dlg.ShowModal() == wxID_OK) -======= GUI::file_wildcards((printer_technology() == ptFFF) ? FT_GCODE : FT_SL1, ext), wxFD_SAVE | wxFD_OVERWRITE_PROMPT ); if (dlg.ShowModal() == wxID_OK) { ->>>>>>> master output_path = into_path(dlg.GetPath()); while (has_illegal_filename_characters(output_path.filename().string())) { show_error(this, _L("The provided file name is not valid.") + "\n" + @@ -6365,18 +6349,6 @@ void Plater::force_print_bed_update() void Plater::on_activate() { -<<<<<<< HEAD -#if defined(__linux__) || defined(_WIN32) - // Activating the main frame, and no window has keyboard focus. - // Set the keyboard focus to the visible Canvas3D. - if (this->p->view3D->IsShown() && wxWindow::FindFocus() != this->p->view3D->get_wxglcanvas()) - CallAfter([this]() { this->p->view3D->get_wxglcanvas()->SetFocus(); }); - else if (this->p->preview->IsShown() && wxWindow::FindFocus() != this->p->view3D->get_wxglcanvas()) - CallAfter([this]() { this->p->preview->get_wxglcanvas()->SetFocus(); }); -#endif - -======= ->>>>>>> master this->p->show_delayed_error_message(); } diff --git a/src/slic3r/GUI/RemovableDriveManager.cpp b/src/slic3r/GUI/RemovableDriveManager.cpp index 43d08c1d0..5fb8b0132 100644 --- a/src/slic3r/GUI/RemovableDriveManager.cpp +++ b/src/slic3r/GUI/RemovableDriveManager.cpp @@ -235,11 +235,7 @@ std::vector<DriveData> RemovableDriveManager::search_for_removable_drives() cons #else -<<<<<<< HEAD - if (platform_flavor() == PlatformFlavor::LinuxOnChromium) { -======= if (platform_flavor() == PlatformFlavor::LinuxOnChromium) { ->>>>>>> master // ChromeOS specific: search /mnt/chromeos/removable/* folder search_for_drives_internal::search_path("/mnt/chromeos/removable/*", "/mnt/chromeos/removable", current_drives); } else { @@ -247,11 +243,7 @@ std::vector<DriveData> RemovableDriveManager::search_for_removable_drives() cons search_for_drives_internal::search_path("/media/*", "/media", current_drives); //search_path("/Volumes/*", "/Volumes"); -<<<<<<< HEAD - std::string path(std::getenv("USER")); -======= std::string path = wxGetUserId().ToUTF8().data(); ->>>>>>> master std::string pp(path); //search /media/USERNAME/* folder @@ -460,11 +452,7 @@ RemovableDriveManager::RemovableDrivesStatus RemovableDriveManager::status() RemovableDriveManager::RemovableDrivesStatus out; { -<<<<<<< HEAD - tbb::mutex::scoped_lock lock(m_drives_mutex); -======= std::scoped_lock<std::mutex> lock(m_drives_mutex); ->>>>>>> master out.has_eject = // Cannot control eject on Chromium. platform_flavor() != PlatformFlavor::LinuxOnChromium && diff --git a/src/slic3r/GUI/UnsavedChangesDialog.cpp b/src/slic3r/GUI/UnsavedChangesDialog.cpp index 14382e31e..002287ded 100644 --- a/src/slic3r/GUI/UnsavedChangesDialog.cpp +++ b/src/slic3r/GUI/UnsavedChangesDialog.cpp @@ -1199,26 +1199,6 @@ static wxString get_string_value(std::string opt_key, const DynamicPrintConfig& return out; } -<<<<<<< HEAD -wxString UnsavedChangesDialog::get_short_string(wxString full_string) -{ - int max_len = 30; - if (full_string.IsEmpty() || full_string.StartsWith("#") || - (full_string.Find("\n") == wxNOT_FOUND && full_string.Length() < size_t(max_len))) - return full_string; - - m_has_long_strings = true; - - int n_pos = full_string.Find("\n"); - if (n_pos != wxNOT_FOUND && n_pos < max_len) - max_len = n_pos; - - full_string.Truncate(max_len); - return full_string + dots; -} - -======= ->>>>>>> master void UnsavedChangesDialog::update(Preset::Type type, PresetCollection* dependent_presets, const std::string& new_selected_preset, const wxString& header) { PresetCollection* presets = dependent_presets; diff --git a/src/slic3r/GUI/UpdateDialogs.cpp b/src/slic3r/GUI/UpdateDialogs.cpp index b78b31249..f80975ce5 100644 --- a/src/slic3r/GUI/UpdateDialogs.cpp +++ b/src/slic3r/GUI/UpdateDialogs.cpp @@ -93,13 +93,8 @@ bool MsgUpdateSlic3r::disable_version_check() const MsgUpdateConfig::MsgUpdateConfig(const std::vector<Update> &updates, bool force_before_wizard/* = false*/) : MsgDialog(nullptr, force_before_wizard ? _L("Opening Configuration Wizard") : _L("Configuration update"), force_before_wizard ? _L("PrusaSlicer is not using the newest configuration available.\n" -<<<<<<< HEAD - "Configuration Wizard may not offer the latest printers, filaments and SLA materials to be installed. ") : - _L("Configuration update is available"), wxID_NONE) -======= "Configuration Wizard may not offer the latest printers, filaments and SLA materials to be installed.") : _L("Configuration update is available"), wxICON_ERROR) ->>>>>>> master { auto *text = new wxStaticText(this, wxID_ANY, _(L( "Would you like to install it?\n\n" @@ -144,27 +139,12 @@ MsgUpdateConfig::MsgUpdateConfig(const std::vector<Update> &updates, bool force_ content_sizer->Add(versions); content_sizer->AddSpacer(2*VERT_SPACING); -<<<<<<< HEAD - auto* btn_ok = new wxButton(this, wxID_OK, force_before_wizard ? _L("Install") : "OK"); - btn_sizer->Add(btn_ok); - btn_sizer->AddSpacer(HORIZ_SPACING); - if (force_before_wizard) { - auto* btn_no_install = new wxButton(this, wxID_ANY, _L("Don't install")); - btn_no_install->Bind(wxEVT_BUTTON, [this](wxEvent&) { this->EndModal(wxID_CLOSE); }); - btn_sizer->Add(btn_no_install); - btn_sizer->AddSpacer(HORIZ_SPACING); - } - auto* btn_cancel = new wxButton(this, wxID_CANCEL); - btn_sizer->Add(btn_cancel); - btn_ok->SetFocus(); -======= add_button(wxID_OK, true, force_before_wizard ? _L("Install") : "OK"); if (force_before_wizard) { auto* btn = add_button(wxID_CLOSE, false, _L("Don't install")); btn->Bind(wxEVT_BUTTON, [this](const wxCommandEvent&) { this->EndModal(wxID_CLOSE); }); } add_button(wxID_CANCEL); ->>>>>>> master finalize(); } diff --git a/src/slic3r/Utils/OctoPrint.cpp b/src/slic3r/Utils/OctoPrint.cpp index 3c9e9f0c1..250b16b4a 100644 --- a/src/slic3r/Utils/OctoPrint.cpp +++ b/src/slic3r/Utils/OctoPrint.cpp @@ -323,15 +323,9 @@ void SL1Host::set_auth(Http &http) const // PrusaLink PrusaLink::PrusaLink(DynamicPrintConfig* config) : OctoPrint(config), -<<<<<<< HEAD - authorization_type(dynamic_cast<const ConfigOptionEnum<AuthorizationType>*>(config->option("printhost_authorization_type"))->value), - username(config->opt_string("printhost_user")), - password(config->opt_string("printhost_password")) -======= m_authorization_type(dynamic_cast<const ConfigOptionEnum<AuthorizationType>*>(config->option("printhost_authorization_type"))->value), m_username(config->opt_string("printhost_user")), m_password(config->opt_string("printhost_password")) ->>>>>>> master { } @@ -356,20 +350,12 @@ bool PrusaLink::validate_version_text(const boost::optional<std::string>& versio void PrusaLink::set_auth(Http& http) const { -<<<<<<< HEAD - switch (authorization_type) { -======= switch (m_authorization_type) { ->>>>>>> master case atKeyPassword: http.header("X-Api-Key", get_apikey()); break; case atUserPassword: -<<<<<<< HEAD - http.auth_digest(username, password); -======= http.auth_digest(m_username, m_password); ->>>>>>> master break; } diff --git a/src/slic3r/Utils/OctoPrint.hpp b/src/slic3r/Utils/OctoPrint.hpp index c30b49b26..262efe9ff 100644 --- a/src/slic3r/Utils/OctoPrint.hpp +++ b/src/slic3r/Utils/OctoPrint.hpp @@ -96,31 +96,6 @@ private: std::string m_password; }; -class PrusaLink : public OctoPrint -{ -public: - PrusaLink(DynamicPrintConfig* config); - ~PrusaLink() override = default; - - const char* get_name() const override; - - wxString get_test_ok_msg() const override; - wxString get_test_failed_msg(wxString& msg) const override; - bool can_start_print() const override { return true; } - -protected: - bool validate_version_text(const boost::optional<std::string>& version_text) const override; - -private: - void set_auth(Http& http) const override; - - // Host authorization type. - AuthorizationType authorization_type; - // username and password for HTTP Digest Authentization (RFC RFC2617) - std::string username; - std::string password; -}; - } #endif diff --git a/src/slic3r/Utils/PresetUpdater.cpp b/src/slic3r/Utils/PresetUpdater.cpp index c985ba61c..2b458df53 100644 --- a/src/slic3r/Utils/PresetUpdater.cpp +++ b/src/slic3r/Utils/PresetUpdater.cpp @@ -772,10 +772,6 @@ void PresetUpdater::slic3r_update_notify() } } -<<<<<<< HEAD -static void reload_configs_update_gui() -{ -======= static bool reload_configs_update_gui() { wxString header = _L("Configuration Updates causes a lost of preset modification.\n" @@ -783,7 +779,6 @@ static bool reload_configs_update_gui() if (!GUI::wxGetApp().check_and_save_current_preset_changes(_L("Updating"), header, false )) return false; ->>>>>>> master // Reload global configuration auto* app_config = GUI::wxGetApp().app_config; // System profiles should not trigger any substitutions, user profiles may trigger substitutions, but these substitutions @@ -792,12 +787,8 @@ static bool reload_configs_update_gui() GUI::wxGetApp().preset_bundle->load_presets(*app_config, ForwardCompatibilitySubstitutionRule::EnableSilentDisableSystem); GUI::wxGetApp().load_current_presets(); GUI::wxGetApp().plater()->set_bed_shape(); -<<<<<<< HEAD - GUI::wxGetApp().update_wizard_from_config(); -======= return true; ->>>>>>> master } PresetUpdater::UpdateResult PresetUpdater::config_update(const Semver& old_slic3r_version, UpdateParams params) const @@ -870,15 +861,9 @@ PresetUpdater::UpdateResult PresetUpdater::config_update(const Semver& old_slic3 const auto res = dlg.ShowModal(); if (res == wxID_OK) { BOOST_LOG_TRIVIAL(info) << "User wants to update..."; -<<<<<<< HEAD - if (! p->perform_updates(std::move(updates))) - return R_INCOMPAT_EXIT; - reload_configs_update_gui(); -======= if (! p->perform_updates(std::move(updates)) || ! reload_configs_update_gui()) return R_INCOMPAT_EXIT; ->>>>>>> master return R_UPDATE_INSTALLED; } else { @@ -906,15 +891,9 @@ PresetUpdater::UpdateResult PresetUpdater::config_update(const Semver& old_slic3 const auto res = dlg.ShowModal(); if (res == wxID_OK) { BOOST_LOG_TRIVIAL(debug) << "User agreed to perform the update"; -<<<<<<< HEAD - if (! p->perform_updates(std::move(updates))) - return R_ALL_CANCELED; - reload_configs_update_gui(); -======= if (! p->perform_updates(std::move(updates)) || ! reload_configs_update_gui()) return R_ALL_CANCELED; ->>>>>>> master return R_UPDATE_INSTALLED; } else { @@ -965,27 +944,19 @@ void PresetUpdater::on_update_notification_confirm() const auto res = dlg.ShowModal(); if (res == wxID_OK) { BOOST_LOG_TRIVIAL(debug) << "User agreed to perform the update"; -<<<<<<< HEAD - if (p->perform_updates(std::move(p->waiting_updates))) { - reload_configs_update_gui(); -======= if (p->perform_updates(std::move(p->waiting_updates)) && reload_configs_update_gui()) { ->>>>>>> master p->has_waiting_updates = false; } } else { BOOST_LOG_TRIVIAL(info) << "User refused the update"; } -<<<<<<< HEAD -======= } bool PresetUpdater::version_check_enabled() const { return p->enabled_version_check; ->>>>>>> master } } diff --git a/src/slic3r/Utils/PrintHost.cpp b/src/slic3r/Utils/PrintHost.cpp index 8963d32a7..86f6101b6 100644 --- a/src/slic3r/Utils/PrintHost.cpp +++ b/src/slic3r/Utils/PrintHost.cpp @@ -52,10 +52,7 @@ PrintHost* PrintHost::get_print_host(DynamicPrintConfig *config) case htAstroBox: return new AstroBox(config); case htRepetier: return new Repetier(config); case htPrusaLink: return new PrusaLink(config); -<<<<<<< HEAD -======= case htMKS: return new MKS(config); ->>>>>>> master default: return nullptr; } } else { diff --git a/version.inc b/version.inc index 91543f099..b976d7d67 100644 --- a/version.inc +++ b/version.inc @@ -3,14 +3,7 @@ set(SLIC3R_APP_NAME "PrusaSlicer") set(SLIC3R_APP_KEY "PrusaSlicer") -<<<<<<< HEAD -set(SLIC3R_VERSION "2.3.3") -set(SLIC3R_BUILD_ID "PrusaSlicer-${SLIC3R_VERSION}+UNKNOWN") -set(SLIC3R_RC_VERSION "2,3,3,0") -set(SLIC3R_RC_VERSION_DOTS "2.3.3.0") -======= set(SLIC3R_VERSION "2.4.1-beta1") set(SLIC3R_BUILD_ID "PrusaSlicer-${SLIC3R_VERSION}+UNKNOWN") set(SLIC3R_RC_VERSION "2,4,1,0") set(SLIC3R_RC_VERSION_DOTS "2.4.1.0") ->>>>>>> master diff --git a/xs/xsp/Flow.xsp b/xs/xsp/Flow.xsp index 7c16da831..3056b4001 100644 --- a/xs/xsp/Flow.xsp +++ b/xs/xsp/Flow.xsp @@ -31,11 +31,7 @@ _new_from_width(CLASS, role, width, nozzle_diameter, height) CODE: ConfigOptionFloatOrPercent optwidth; optwidth.deserialize(width, ForwardCompatibilitySubstitutionRule::Disable); -<<<<<<< HEAD - RETVAL = new Flow(Flow::new_from_config_width(role, optwidth, nozzle_diameter, height, bridge_flow_ratio)); -======= RETVAL = new Flow(Flow::new_from_config_width(role, optwidth, nozzle_diameter, height)); ->>>>>>> master OUTPUT: RETVAL |
