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
index 092fad919..7523c895e 100644
Binary files a/resources/localization/cs/PrusaSlicer.mo and b/resources/localization/cs/PrusaSlicer.mo differ
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
index 411f1f8bc..796dbe27b 100644
Binary files a/resources/localization/de/PrusaSlicer.mo and b/resources/localization/de/PrusaSlicer.mo differ
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
index 10978da8d..d641d462d 100644
Binary files a/resources/localization/en/PrusaSlicer.mo and b/resources/localization/en/PrusaSlicer.mo differ
diff --git a/resources/localization/es/PrusaSlicer.mo b/resources/localization/es/PrusaSlicer.mo
index 97a93ea2c..354de3a95 100644
Binary files a/resources/localization/es/PrusaSlicer.mo and b/resources/localization/es/PrusaSlicer.mo differ
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
index e53f7e089..d2d280e03 100644
Binary files a/resources/localization/fr/PrusaSlicer.mo and b/resources/localization/fr/PrusaSlicer.mo differ
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
index 504931b0a..60bd8dc12 100644
Binary files a/resources/localization/it/PrusaSlicer.mo and b/resources/localization/it/PrusaSlicer.mo differ
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
index 07c81b77e..75f030ce3 100644
Binary files a/resources/localization/ko/PrusaSlicer.mo and b/resources/localization/ko/PrusaSlicer.mo differ
diff --git a/resources/localization/nl/PrusaSlicer.mo b/resources/localization/nl/PrusaSlicer.mo
index 3b32ea02f..87ce3f492 100644
Binary files a/resources/localization/nl/PrusaSlicer.mo and b/resources/localization/nl/PrusaSlicer.mo differ
diff --git a/resources/localization/pl/PrusaSlicer.mo b/resources/localization/pl/PrusaSlicer.mo
index 4673f175f..4fc344334 100644
Binary files a/resources/localization/pl/PrusaSlicer.mo and b/resources/localization/pl/PrusaSlicer.mo differ
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
deleted file mode 100644
index 649d4de13..000000000
Binary files a/resources/localization/pt_br/PrusaSlicer.mo and /dev/null differ
diff --git a/resources/localization/ru/PrusaSlicer.mo b/resources/localization/ru/PrusaSlicer.mo
index cf1d86dd1..f8deb07b7 100644
Binary files a/resources/localization/ru/PrusaSlicer.mo and b/resources/localization/ru/PrusaSlicer.mo differ
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."
+"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."
-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."
+"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."
-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."
+"If enabled, the button for the collapse sidebar will be appeared in top "
+"right corner of the 3D Scene"
 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."
-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."
+"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."
-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 "Параметры экструдера в одноэкструдерном мультиматериальном (ММ) принтере"
-
-<<<<<<< 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?"
 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)"
-=======
+#: src/slic3r/GUI/Tab.cpp:2769
+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 ""
 "Это одноэкструдерный мультиматериальный принтер, диаметры всех экструдеров "
 "будут установлены на новое значение. Вы хотите продолжить?"
 
@@ -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%\"?"
+"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."
-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."
+"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
-=======
 "указывает, что настройки были изменены и не совпадают с настройками в "
 "последнем сохранённом профиле\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."
+"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."
-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."
+"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."
-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]."
+"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 ""
-<<<<<<< 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."
-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, "
-"чтобы отключить управление ускорением для мостов."
+"Ускорение, которое принтер будет использовать для печати мостов. Установить "
+"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 "Угол (направление) печати мостов"
-
-#: 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."
+"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°."
+"Принудительная печать мостов в одном, заданном направлении. Если задано 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 "Скорость вентилятора при печати мостов"
-
-#: 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 "Расстояние между центральной точкой охлаждающей трубки и кончиком экструдера."
+msgstr ""
+"Расстояние между центральной точкой охлаждающей трубки и кончиком экструдера."
 
-<<<<<<< HEAD
-#: src/libslic3r/PrintConfig.cpp:383
-msgid "Cooling tube length"
-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, чтобы предотвратить сброс ускорения вообще."
+"Это ускорение, на которое переключится принтер после использования "
+"определённых настроек ускорения, например установленных для печати периметра/"
+"заполнения. Установите 0, чтобы предотвратить сброс ускорения вообще."
 
-<<<<<<< HEAD
-#: src/libslic3r/PrintConfig.cpp:401
-msgid "Default filament profile"
-msgstr "Профиль прутка по умолчанию"
-
-#: 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."
+"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
-=======
 "Команды в 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. Если вы считаете, что вам требуется "
-"большее значение, проверьте диаметр прутка и шаги экструдера в вашей прошивке."
+"Коэффициент количества подаваемого пластика по сравнению с основным "
+"значением. В других слайсерах называется Текучесть (Flow). Вам может "
+"понадобиться настроить этот параметр, чтобы получить красивую поверхность и "
+"правильную ширину одиночной стенки. Обычные значения составляют от 0.9 до "
+"1.1. Если вы считаете, что вам требуется большее значение, проверьте диаметр "
+"прутка и шаги экструдера в вашей прошивке."
 
-<<<<<<< HEAD
-#: src/libslic3r/PrintConfig.cpp:615
-msgid "Default extrusion width"
-msgstr "Ширина экструзии по умолчанию"
-
-#: 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."
+"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
-=======
 "После смены инструмента, точное положение вновь загруженного прутка внутри "
 "него может быть неизвестно, и давление прутка, вероятно, ещё не стабильно. "
 "Перед тем, как очистить печатающую головку в заполнение или в «жертвенную» "
@@ -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, чтобы отключить управление ускорением для первого слоя."
+"Ускорение, которое принтер будет использовать для печати первого слоя. "
+"Установить 0, чтобы отключить управление ускорением для первого слоя."
 
-<<<<<<< HEAD
-#: src/libslic3r/PrintConfig.cpp:947
-msgid "First layer bed temperature"
-msgstr "Температура стола на первом слое"
-
-#: 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."
+"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."
-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."
+"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 ""
-<<<<<<< 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."
-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, чтобы "
-"отключить управление ускорением для заполнения."
+"Ускорение, которое принтер будет использовать для заполнения. Установить 0, "
+"чтобы отключить управление ускорением для заполнения."
 
-<<<<<<< HEAD
-#: src/libslic3r/PrintConfig.cpp:1085
-msgid "Combine infill every"
-msgstr "Объединять заполнение каждые"
-
-#: 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 ""
-"Объединять заполнение каждые"
+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 "Номер экструдера, которым печатается заполнение."
-
-#: 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-х секунд."
+"Этот экспериментальный параметр используется для ограничения скорости "
+"изменения экструзии. Значение 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 "мм³/с²"
-
-#: 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 не будет снижать "
-"скорость ниже этой."
+"Нижний предел того, как медленно слой может быть напечатан. Slic3 не будет "
+"снижать скорость ниже этой."
 
-<<<<<<< HEAD
-#: src/libslic3r/PrintConfig.cpp:1514
-msgid "Minimal filament extrusion length"
-msgstr "Минимальная длина экструзии"
-
-#: 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-кода."
+"Здесь вы можете оставить свои замечания для текущего профиля. Этот текст "
+"будет добавлен к комментариям в заголовок 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 "Тип хоста"
-
-#: 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], "
-"[input_filename_base]."
+"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]."
+"Вы можете использовать все параметры в качестве переменных внутри этого "
+"шаблона. Они будят добавлены к имени файла. Например: [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, то расстояние, которое проходит пруток при перемещении из "
-"положения парковки во время загрузки, точно такое же, как и при выгрузке. При "
-"положительном значении, она загружается дальше; при отрицательном, ход загрузки "
-"короче (по сравнению с выгрузкой)."
+"Если установлено 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 "Периметры"
-
-#: 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."
+"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."
-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."
+"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 для автонастройки."
+"Скорость печати сплошных областей (верха/низа/внутренних горизонтальных "
+"оболочек). Если задано в процентах, параметр вычисляется относительно "
+"скорости заполнения указанной выше. Установите 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."
-msgstr ""
-"Данная настройка применяется при печати спиральных и пустотелых, а также "
-"тонкостенных моделей. Модель печатается в одну стенку без верней поверхности, "
-"заполнения и поддержки. При этом сопло движется вдоль периметра непрерывно "
-"постепенно поднимаясь, так получаются ровные красивые вазы без видимых швов. Вы "
-"можете задать любое количество нижних сплошных слоёв, а также печать юбки/каймы. "
-"При включении этого параметра невозможно напечатать горизонтальную плоскость - "
-"горизонтальные слои без поддержки будут провисать."
-
-#: src/libslic3r/PrintConfig.cpp:2003
-msgid "Temperature variation"
-msgstr "Колебания температуры"
-
-#: 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."
+"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."
-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 для формирования "
-"поддержки в автоматическом режиме."
+"Задаётся угол нависания, при превышении которого будут использоваться "
+"поддержки (угол задаётся относительно вертикальной оси). Установите 0 для "
+"формирования поддержки в автоматическом режиме."
 
-<<<<<<< HEAD
-#: src/libslic3r/PrintConfig.cpp:2283
-msgid "With sheath around the support"
-msgstr "Оболочка вокруг поддержки"
-
-#: 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 для "
-"автонастройки."
+"Скорость печати верхних сплошных слоёв. Вы можете снизить скорость, чтобы "
+"получить более качественную поверхность. Если задано в процентах, параметр "
+"вычисляется относительно скорости сплошного заполнения указанной выше. "
+"Установите 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 "Верхних сплошных слоёв"
-
-#: 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."
+"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
-=======
 "Эта экспериментальная опция использует выходные значения экструдера в "
 "кубических миллиметрах вместо линейных миллиметров. Если в вашей прошивке "
 "ещё не задан диаметр прутка, вы можете прописать в свой стартовый 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 "Максимальное расстояние между опорами на разряженных участках заполнения."
+msgstr ""
+"Максимальное расстояние между опорами на разряженных участках заполнения."
 
-<<<<<<< HEAD
-#: src/libslic3r/PrintConfig.cpp:2503
-msgid "XY Size Compensation"
-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"
+"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"
-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
index 1af023872..af7848eb3 100644
Binary files a/resources/localization/tr/PrusaSlicer.mo and b/resources/localization/tr/PrusaSlicer.mo differ
diff --git a/resources/localization/uk/PrusaSlicer.mo b/resources/localization/uk/PrusaSlicer.mo
index 4dd82bbc4..d12fe4188 100644
Binary files a/resources/localization/uk/PrusaSlicer.mo and b/resources/localization/uk/PrusaSlicer.mo differ
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
deleted file mode 100644
index d4d20d55d..000000000
Binary files a/resources/localization/zh_cn/PrusaSlicer.mo and /dev/null differ
diff --git a/resources/localization/zh_tw/PrusaSlicer.mo b/resources/localization/zh_tw/PrusaSlicer.mo
deleted file mode 100644
index c97213f7f..000000000
Binary files a/resources/localization/zh_tw/PrusaSlicer.mo and /dev/null differ
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,8 +1020,6 @@ 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;
@@ -1256,144 +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 });
     }
 
-    // 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;
-
-    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 });
-    }
-
-<<<<<<< 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,69 +1252,6 @@ 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]),
-                    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]);
-            };
-#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);
@@ -1781,41 +1287,15 @@ void GCodeViewer::load_toolpaths(const GCodeProcessorResult& gcode_result)
             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,17 +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();
+#endif // ENABLE_SPIRAL_VASE_LAYERS
 
     // set layers z range
     if (!m_layers.empty())
@@ -3030,7 +2058,7 @@ void GCodeViewer::load_toolpaths(const GCodeProcessorResult& gcode_result)
     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];
+            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;
         }
@@ -3043,667 +2071,6 @@ void GCodeViewer::load_toolpaths(const GCodeProcessorResult& gcode_result)
     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;
-        }
-    }
-
-    // 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.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;
-        }
-    }
-
-    // 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
-
-    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